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/MainFrm.cpp | 90 ++++++++++++++++++++++++++------------------
1 files changed, 53 insertions(+), 37 deletions(-)
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;
}
--
Gitblit v1.9.3