From aa2c9d14b1b4058639d938ef7f943c7c7fc7c210 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 14 八月 2025 14:57:08 +0800
Subject: [PATCH] 1. 离线全部执行和在线执行时可以选择启用或禁用侧面检功能
---
EdgeInspector_App/Recipe/HardwareSettings.h | 3 +
EdgeInspector_App/View/ViewMain_HWSetting.cpp | 4
EdgeInspector_App/InterfaceManager.cpp | 14 +++-
EdgeInspector_App/EdgeInspector_App.rc | 0
EdgeInspector_App/MainFrm.cpp | 90 +++++++++++++++++------------
EdgeInspector_App/Recipe/HardwareSettings.cpp | 32 ++++++++++
EdgeInspector_App/resource.h | 5 -
7 files changed, 102 insertions(+), 46 deletions(-)
diff --git a/EdgeInspector_App/EdgeInspector_App.rc b/EdgeInspector_App/EdgeInspector_App.rc
index 90c0f1d..319bb16 100644
--- a/EdgeInspector_App/EdgeInspector_App.rc
+++ b/EdgeInspector_App/EdgeInspector_App.rc
Binary files differ
diff --git a/EdgeInspector_App/InterfaceManager.cpp b/EdgeInspector_App/InterfaceManager.cpp
index a6e32cf..34ff381 100644
--- a/EdgeInspector_App/InterfaceManager.cpp
+++ b/EdgeInspector_App/InterfaceManager.cpp
@@ -872,8 +872,11 @@
AfxBeginThread(ScanStartCam_1, this);
AfxBeginThread(ScanStartCam_2, this);
AfxBeginThread(ScanStartCam_3, this);
- AfxBeginThread(ScanStartCam_4, this);
- AfxBeginThread(ScanStartCam_5, this);
+
+ if (m_HardwareRecipe.m_bUseRipInspection) {
+ AfxBeginThread(ScanStartCam_4, this);
+ AfxBeginThread(ScanStartCam_5, this);
+ }
AfxBeginThread(CheckScanStart,this);
}
@@ -890,8 +893,11 @@
AfxBeginThread(ScanStartCam_1, this);
AfxBeginThread(ScanStartCam_2, this);
AfxBeginThread(ScanStartCam_3, this);
- AfxBeginThread(ScanStartCam_4, this);
- AfxBeginThread(ScanStartCam_5, this);
+
+ if (m_HardwareRecipe.m_bUseRipInspection) {
+ AfxBeginThread(ScanStartCam_4, this);
+ AfxBeginThread(ScanStartCam_5, this);
+ }
AfxBeginThread(CheckScanStart,this);
diff --git a/EdgeInspector_App/MainFrm.cpp b/EdgeInspector_App/MainFrm.cpp
index 1759aa9..ce4c954 100644
--- a/EdgeInspector_App/MainFrm.cpp
+++ b/EdgeInspector_App/MainFrm.cpp
@@ -470,45 +470,61 @@
break;
case PROC_MODE_SIMULATION_ALL:
{
- g_pLog->DisplayMessage(_T("Simulation Full "));
- pMain->m_GlassData.SetScanStartCount(MAX_DIMENSION_COUNT);
- pMain->SendGlassRecipe();
- for(iCam=0;iCam<MAX_CAMERA_COUNT;iCam++)
- {
- pMain->ScanStartGrabManual(iCam,0);
- pMain->ScanStartGrabManual(iCam,1);
+ //g_pLog->DisplayMessage(_T("Simulation Full "));
+ //pMain->m_GlassData.SetScanStartCount(MAX_DIMENSION_COUNT);
+ //pMain->SendGlassRecipe();
+ //for(iCam=0;iCam<MAX_CAMERA_COUNT;iCam++)
+ //{
+ // pMain->ScanStartGrabManual(iCam,0);
+ // pMain->ScanStartGrabManual(iCam,1);
+ //}
+
+ //if(pMain->m_pThread_CheckSequence != NULL)
+ //{
+ // double dOneScanTime = pMain->m_GlassRecipe.m_RecieParm.m_dOneScanTime_sec;
+ //
+ // pMain->m_pThread_CheckSequence->AddCheckSeqMSG(CHECKSEQ_GLASS_INSPECTION_OVERTIME,(int)(dOneScanTime* 1000.),pMain->m_HardwareRecipe.GetScanCount()-1);
+
+ // g_pLog->DisplayMessage(_T("Simulation Time Out Set : %.1f"),dOneScanTime);
+ //}
+
+ //for(iCam=0;iCam<MAX_CAMERA_COUNT;iCam++)
+ //{
+ // pMain->ScanStartManual(iCam,0);
+ //}
+
+ //DWORD sTime = GetTickCount();
+ //while(TRUE)
+ //{
+ // if(pMain->m_GlassData.GetScanEnd(0) == TRUE)
+ // break;
+
+ // if(GetTickCount() - sTime >= 5000)
+ // break;
+ //
+ // Sleep(10);
+ //}
+
+ //for(iCam=0;iCam<MAX_CAMERA_COUNT;iCam++)
+ //{
+ // pMain->ScanStartManual(iCam,1);
+ //}
+
+ if (pMain->m_HardwareRecipe.m_bUseRipInspection) {
+ std::vector<DimensionDir> vecDirs = {
+ DIMENSION_A, DIMENSION_C, DIMENSION_A_DN, DIMENSION_C_DN,
+ DIMENSION_B, DIMENSION_D, DIMENSION_B_DN, DIMENSION_D_DN,
+ DIMENSION_A_RIP, DIMENSION_B_RIP, DIMENSION_C_RIP, DIMENSION_D_RIP
+ };
+ pMain->Simulate2PhaseScanByDirs(vecDirs, 1000);
}
-
- if(pMain->m_pThread_CheckSequence != NULL)
- {
- double dOneScanTime = pMain->m_GlassRecipe.m_RecieParm.m_dOneScanTime_sec;
-
- pMain->m_pThread_CheckSequence->AddCheckSeqMSG(CHECKSEQ_GLASS_INSPECTION_OVERTIME,(int)(dOneScanTime* 1000.),pMain->m_HardwareRecipe.GetScanCount()-1);
-
- g_pLog->DisplayMessage(_T("Simulation Time Out Set : %.1f"),dOneScanTime);
+ else {
+ std::vector<DimensionDir> vecDirs = {
+ DIMENSION_A, DIMENSION_C, DIMENSION_A_DN, DIMENSION_C_DN,
+ DIMENSION_B, DIMENSION_D, DIMENSION_B_DN, DIMENSION_D_DN
+ };
+ pMain->Simulate2PhaseScanByDirs(vecDirs, 1000);
}
-
- for(iCam=0;iCam<MAX_CAMERA_COUNT;iCam++)
- {
- pMain->ScanStartManual(iCam,0);
- }
-
- DWORD sTime = GetTickCount();
- while(TRUE)
- {
- if(pMain->m_GlassData.GetScanEnd(0) == TRUE)
- break;
-
- if(GetTickCount() - sTime >= 5000)
- break;
-
- Sleep(10);
- }
-
- for(iCam=0;iCam<MAX_CAMERA_COUNT;iCam++)
- {
- pMain->ScanStartManual(iCam,1);
- }
}
break;
}
diff --git a/EdgeInspector_App/Recipe/HardwareSettings.cpp b/EdgeInspector_App/Recipe/HardwareSettings.cpp
index d3bcaf1..f5f9d15 100644
--- a/EdgeInspector_App/Recipe/HardwareSettings.cpp
+++ b/EdgeInspector_App/Recipe/HardwareSettings.cpp
@@ -1034,6 +1034,9 @@
// ly,2025.07.10
m_bSaveResultByHour = rhs.m_bSaveResultByHour;
+ // ly,2025.08.14
+ m_bUseRipInspection = rhs.m_bUseRipInspection;
+
// ly,2025.07.07
m_bEnableAutoCopy = rhs.m_bEnableAutoCopy;
m_strCopyToolExePath = rhs.m_strCopyToolExePath;
@@ -1282,6 +1285,10 @@
else if ((void*)&m_bSaveResultByHour == pValue)
str = _T("SAVE_RESULT_BY_HOUR");
+ // ly,2025.08.14
+ else if ((void*)&m_bUseRipInspection == pValue)
+ str = _T("USE_RIP_INSPECTION");
+
// ly,2025.07.07
else if ((void*)&m_bEnableAutoCopy == pValue)
str = _T("ENABLE_AUTOCOPY");
@@ -1451,6 +1458,12 @@
if (str.IsEmpty() == TRUE)
return FALSE;
BasicInfoFile.GetItemValue((TCHAR*)(LPCTSTR)str, m_bSaveResultByHour, FALSE);
+
+ // ly,2025.08.14
+ str = GetFileString((void*)&m_bUseRipInspection);
+ if (str.IsEmpty() == TRUE)
+ return FALSE;
+ BasicInfoFile.GetItemValue((TCHAR*)(LPCTSTR)str, m_bUseRipInspection, FALSE);
// ly,2025.07.07
str = GetFileString((void*)&m_bEnableAutoCopy);
@@ -1632,6 +1645,12 @@
return FALSE;
Register.GetItemValue((TCHAR*)(LPCTSTR)str, m_bSaveResultByHour, FALSE);
+ // ly,2025.08.14
+ str = GetFileString((void*)&m_bUseRipInspection);
+ if (str.IsEmpty() == TRUE)
+ return FALSE;
+ Register.GetItemValue((TCHAR*)(LPCTSTR)str, m_bUseRipInspection, FALSE);
+
// ly,2025.07.07
str = GetFileString((void*)&m_bEnableAutoCopy);
if (str.IsEmpty() == TRUE)
@@ -1794,6 +1813,12 @@
if (str.IsEmpty() == TRUE)
return FALSE;
Register.SetItemValue((TCHAR*)(LPCTSTR)str, (int)m_bSaveResultByHour);
+
+ // ly,2025.08.14
+ str = GetFileString((void*)&m_bUseRipInspection);
+ if (str.IsEmpty() == TRUE)
+ return FALSE;
+ Register.SetItemValue((TCHAR*)(LPCTSTR)str, (int)m_bUseRipInspection);
// ly,2025.07.07
str = GetFileString((void*)&m_bEnableAutoCopy);
@@ -1983,6 +2008,13 @@
}
BasicInfoFile.SetItemValue((TCHAR*)(LPCTSTR)str, (int)m_bSaveResultByHour);
+ // ly,2025.08.14
+ str = GetFileString((void*)&m_bUseRipInspection);
+ if (str.IsEmpty() == TRUE) {
+ return FALSE;
+ }
+ BasicInfoFile.SetItemValue((TCHAR*)(LPCTSTR)str, (int)m_bUseRipInspection);
+
// ly,2025.07.07
str = GetFileString((void*)&m_bEnableAutoCopy);
if (str.IsEmpty() == TRUE) {
diff --git a/EdgeInspector_App/Recipe/HardwareSettings.h b/EdgeInspector_App/Recipe/HardwareSettings.h
index 114a279..2fbaff6 100644
--- a/EdgeInspector_App/Recipe/HardwareSettings.h
+++ b/EdgeInspector_App/Recipe/HardwareSettings.h
@@ -207,6 +207,9 @@
BOOL m_bSaveResultByHour;
public:
+ BOOL m_bUseRipInspection;
+
+public:
BOOL m_bEnableAutoCopy;
CString m_strCopyToolExePath;
CString m_strCopyToolConfigPath;
diff --git a/EdgeInspector_App/View/ViewMain_HWSetting.cpp b/EdgeInspector_App/View/ViewMain_HWSetting.cpp
index 6b944ba..527a082 100644
--- a/EdgeInspector_App/View/ViewMain_HWSetting.cpp
+++ b/EdgeInspector_App/View/ViewMain_HWSetting.cpp
@@ -67,8 +67,6 @@
DDX_Text(pDX, IDC_EDIT_SAVEIMAGE_QUALITY, m_pDlgHDSettingParm->m_nSaveImageQuality);
-
-
DDX_Text(pDX,IDC_EDIT_FOLDER_REMOVE_DAY,m_pDlgHDSettingParm->m_nFolderRemoveDay);
DDX_Check(pDX,IDC_CHK_USECOLORVISUAL,m_pDlgHDSettingParm->m_bUseColorVisual);
@@ -85,6 +83,8 @@
DDX_Check(pDX, IDC_CHECK_SAVE_RESULT_BY_HOUR, m_pDlgHDSettingParm->m_bSaveResultByHour); // ly,2025.07.10
+ DDX_Check(pDX, IDC_CHECK_USE_RIP_INSPECTION, m_pDlgHDSettingParm->m_bUseRipInspection); // ly,2025.08.14
+
DDX_Check(pDX, IDC_CHECK_ENABLE_AUTO_COPY, m_pDlgHDSettingParm->m_bEnableAutoCopy); // ly,2025.07.07
DDX_Text(pDX, IDC_EDIT_COPY_TOOL_EXE_PATH, m_pDlgHDSettingParm->m_strCopyToolExePath);
DDX_Text(pDX, IDC_EDIT_COPY_TOOL_CONFIG_PATH, m_pDlgHDSettingParm->m_strCopyToolConfigPath);
diff --git a/EdgeInspector_App/resource.h b/EdgeInspector_App/resource.h
index 4d52072..d4e5fd0 100644
--- a/EdgeInspector_App/resource.h
+++ b/EdgeInspector_App/resource.h
@@ -357,9 +357,9 @@
#define IDC_STATIC_CAM_INFO2 1069
#define IDC_EDIT_DELETE_TOOL_CONFIG_PATH 1069
#define IDC_STATIC_CAM_INFO3 1070
-#define IDC_CHECK1 1070
#define IDC_CHECK_SAVE_RESULT_BY_HOUR 1070
#define IDC_STATIC_CAM_INFO4 1071
+#define IDC_CHECK_USE_RIP_INSPECTION 1071
#define IDC_CHK_USECOLORVISUAL 1072
#define IDC_STATIC_SUBJECT 1072
#define IDC_SCROLLBAR_V_9 1072
@@ -600,7 +600,6 @@
#define IDC_RDO_INSTYPE_IN_CRACK 1833
#define IDC_RDO_INSTYPE_IN_CHAMFER 1834
#define IDC_RDO_INSTYPE_RIP_THICKNESS 1835
-#define IDC_RDO_INSTYPE_RIP_THICKNESS2 1860
#define ID_PROFILE_CHECKALL 32782
#define ID_PROFILE_CLEARALL 32783
#define ID_PROFILE_CURRENTX 32784
@@ -629,7 +628,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 330
#define _APS_NEXT_COMMAND_VALUE 32771
-#define _APS_NEXT_CONTROL_VALUE 1071
+#define _APS_NEXT_CONTROL_VALUE 1072
#define _APS_NEXT_SYMED_VALUE 310
#endif
#endif
--
Gitblit v1.9.3