From 06548959f857ca6a9eabaa695ab84dfa0ff73849 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期日, 10 八月 2025 14:03:11 +0800
Subject: [PATCH] 1. 添加侧面检的执行和报警参数 2. 修复配方界面分组按钮的显示异常问题
---
EdgeInspector_App/View/ViewMain_HWSetting.cpp | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/EdgeInspector_App/View/ViewMain_HWSetting.cpp b/EdgeInspector_App/View/ViewMain_HWSetting.cpp
index cff989c..f289452 100644
--- a/EdgeInspector_App/View/ViewMain_HWSetting.cpp
+++ b/EdgeInspector_App/View/ViewMain_HWSetting.cpp
@@ -1,4 +1,4 @@
-// ViewHWSetting.cpp : 备泅 颇老涝聪促.
+锘�// ViewHWSetting.cpp : 澶囨硡 棰囪�佹稘鑱績.
//
#include "stdafx.h"
@@ -8,7 +8,7 @@
#include "Global_Define.h"
#include "NewCellTypes\GridCellCombo.h"
-// CViewHWSetting 措拳 惑磊涝聪促.
+// CViewHWSetting 鎺嫵 鎯戠娑濊仾淇�.
extern BOOL g_bUse_SaveAllDMP;
const int LIGHT_COLUMN_COUNT = 4;
const TCHAR* LIGHT_COLUMN_ITEM[LIGHT_COLUMN_COUNT] = {_T("ID"),_T("Type"),_T("Port&IP"),_T("Maker")};
@@ -144,7 +144,7 @@
return TRUE;
}
-// CViewHWSetting 皋矫瘤 贸府扁涝聪促.
+// CViewHWSetting 鐨嬬煫鐦� 璐稿簻鎵佹稘鑱績.
void CViewMain_HWSetting::Init_LightGrid()
@@ -173,7 +173,7 @@
lf.lfItalic = 0;
lf.lfHeight = 14;
lf.lfWeight = FW_BOLD;
- _tcscpy(lf.lfFaceName, _T("Arial"));
+ _tcscpy_s(lf.lfFaceName, LF_FACESIZE, _T("Arial"));
m_LightGrid.GetDefaultCell(TRUE, FALSE)->SetFont(&lf);
m_LightGrid.GetDefaultCell(FALSE, TRUE)->SetFont(&lf);
@@ -230,7 +230,7 @@
lf.lfItalic = 0;
lf.lfHeight = 14;
lf.lfWeight = FW_BOLD;
- _tcscpy(lf.lfFaceName, _T("Arial"));
+ _tcscpy_s(lf.lfFaceName, LF_FACESIZE, _T("Arial"));
m_CameraGrid.GetDefaultCell(TRUE, FALSE)->SetFont(&lf);
m_CameraGrid.GetDefaultCell(FALSE, TRUE)->SetFont(&lf);
@@ -375,7 +375,12 @@
CString str;
const TCHAR* SET_CAMERA_DIR[] = {_T("Top"),_T("Bottom")};
const TCHAR* SET_INS_DIR[] = {_T("Long"),_T("Short")};
- const TCHAR* SET_INS_DIMENSION[] = {_T("A Top"),_T("B Top"),_T("C Top"),_T("D Top"),_T("A Bot"),_T("B Bot"),_T("C Bot"),_T("D Bot")};
+ const TCHAR* SET_INS_DIMENSION[] = {
+ _T("A Top"), _T("B Top"), _T("C Top"), _T("D Top"),
+ _T("A Bot"), _T("B Bot"), _T("C Bot"), _T("D Bot"),
+ _T("A RIP"), _T("B RIP"), _T("C RIP"), _T("D RIP")
+ };
+
CStringArray arrDir,arrInsDir,arrDimension;
CGridCellCombo *pCell;
@@ -384,7 +389,7 @@
arrDir.Add(SET_CAMERA_DIR[i]);
arrInsDir.Add(SET_INS_DIR[i]);
}
- for(i=0;i<8;i++)
+ for(i=0;i<12;i++)
{
arrDimension.Add(SET_INS_DIMENSION[i]);
}
@@ -447,13 +452,17 @@
switch(pCamera->m_eDimension)
{
case DIMENSION_A: str.Format(_T("%s"),SET_INS_DIMENSION[0]); break;
- case DIMENSION_B: str.Format(_T("%s"),SET_INS_DIMENSION[1]); break;
- case DIMENSION_C: str.Format(_T("%s"),SET_INS_DIMENSION[2]); break;
- case DIMENSION_D: str.Format(_T("%s"),SET_INS_DIMENSION[3]); break;
- case DIMENSION_A_DN: str.Format(_T("%s"),SET_INS_DIMENSION[4]); break;
- case DIMENSION_B_DN: str.Format(_T("%s"),SET_INS_DIMENSION[5]); break;
- case DIMENSION_C_DN: str.Format(_T("%s"),SET_INS_DIMENSION[6]); break;
- case DIMENSION_D_DN: str.Format(_T("%s"),SET_INS_DIMENSION[7]); break;
+ case DIMENSION_B: str.Format(_T("%s"),SET_INS_DIMENSION[1]); break;
+ case DIMENSION_C: str.Format(_T("%s"),SET_INS_DIMENSION[2]); break;
+ case DIMENSION_D: str.Format(_T("%s"),SET_INS_DIMENSION[3]); break;
+ case DIMENSION_A_DN: str.Format(_T("%s"),SET_INS_DIMENSION[4]); break;
+ case DIMENSION_B_DN: str.Format(_T("%s"),SET_INS_DIMENSION[5]); break;
+ case DIMENSION_C_DN: str.Format(_T("%s"),SET_INS_DIMENSION[6]); break;
+ case DIMENSION_D_DN: str.Format(_T("%s"),SET_INS_DIMENSION[7]); break;
+ case DIMENSION_A_RIP: str.Format(_T("%s"), SET_INS_DIMENSION[8]); break;
+ case DIMENSION_B_RIP: str.Format(_T("%s"), SET_INS_DIMENSION[9]); break;
+ case DIMENSION_C_RIP: str.Format(_T("%s"), SET_INS_DIMENSION[10]); break;
+ case DIMENSION_D_RIP: str.Format(_T("%s"), SET_INS_DIMENSION[11]); break;
default: str.Format(_T("%s"),_T("No")); break;
}
m_CameraGrid.SetItemText(iRow,iCol,str);
--
Gitblit v1.9.3