From be72a344954f46a40c96848071a10996fc4bf030 Mon Sep 17 00:00:00 2001
From: LWQ <1806950222@qq.com>
Date: 星期三, 13 八月 2025 19:17:08 +0800
Subject: [PATCH] 1.添加侧面检缺陷检测参数到配方
---
EdgeInspector_App/InterfaceManager.cpp | 58 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 37 insertions(+), 21 deletions(-)
diff --git a/EdgeInspector_App/InterfaceManager.cpp b/EdgeInspector_App/InterfaceManager.cpp
index 92fd985..7eb3223 100644
--- a/EdgeInspector_App/InterfaceManager.cpp
+++ b/EdgeInspector_App/InterfaceManager.cpp
@@ -868,10 +868,12 @@
g_pStatus->m_iScanIdx = 1;
- AfxBeginThread(ScanStartCam_0,this);
- AfxBeginThread(ScanStartCam_1,this);
- AfxBeginThread(ScanStartCam_2,this);
- AfxBeginThread(ScanStartCam_3,this);
+ AfxBeginThread(ScanStartCam_0, this);
+ AfxBeginThread(ScanStartCam_1, this);
+ AfxBeginThread(ScanStartCam_2, this);
+ AfxBeginThread(ScanStartCam_3, this);
+ AfxBeginThread(ScanStartCam_4, this);
+ AfxBeginThread(ScanStartCam_5, this);
AfxBeginThread(CheckScanStart,this);
}
@@ -884,10 +886,12 @@
g_pStatus->m_iScanIdx = 0;
- AfxBeginThread(ScanStartCam_0,this);
- AfxBeginThread(ScanStartCam_1,this);
- AfxBeginThread(ScanStartCam_2,this);
- AfxBeginThread(ScanStartCam_3,this);
+ AfxBeginThread(ScanStartCam_0, this);
+ AfxBeginThread(ScanStartCam_1, this);
+ AfxBeginThread(ScanStartCam_2, this);
+ AfxBeginThread(ScanStartCam_3, this);
+ AfxBeginThread(ScanStartCam_4, this);
+ AfxBeginThread(ScanStartCam_5, this);
AfxBeginThread(CheckScanStart,this);
@@ -901,20 +905,16 @@
UINT CInterfaceManager::CheckScanStart(LPVOID pParam)
{
- CInterfaceManager *pInter = static_cast<CInterfaceManager*>(pParam);
+ CInterfaceManager *pInter = static_cast<CInterfaceManager*>(pParam);
+ double CurTime = GetTickCount();
- double CurTime = GetTickCount();
-
- do
- {
- if (GetTickCount() - CurTime > 10000)
- {
+ do {
+ if (GetTickCount() - CurTime > 10000) {
g_pLog->DisplayMessage(_T("Scan Start Ack TimeOut : Scan %d-%d"),g_pStatus->m_iScanIdx,pInter->m_nScanStartCount);
break;
}
- if(pInter->m_nScanStartCount == MAX_CAMERA_COUNT)
- {
+ if(pInter->m_nScanStartCount == MAX_CAMERA_COUNT) {
g_pLog->DisplayMessage(_T("Scan Start Ack Ok : Scan %d-%d"),g_pStatus->m_iScanIdx,pInter->m_nScanStartCount);
break;
}
@@ -923,13 +923,11 @@
} while (1);
g_pLog->DisplayMessage(_T("Scan Start Ack Signal Send : Scan %d-%d"),g_pStatus->m_iScanIdx,pInter->m_nScanStartCount);
- if(g_pStatus->m_iScanIdx == 0)
- {
+ if(g_pStatus->m_iScanIdx == 0) {
if(pInter->m_pThread_SendMSG != NULL)
pInter->m_pThread_SendMSG->AddSendMSG(SEND_MESSAGE_CONTROLSIGNAL,IToC_Ack_LongScanStartSuccess,TRUE);
}
- else
- {
+ else {
if(pInter->m_pThread_SendMSG != NULL)
pInter->m_pThread_SendMSG->AddSendMSG(SEND_MESSAGE_CONTROLSIGNAL,IToC_Ack_ShortScanStartSuccess,TRUE);
}
@@ -1017,6 +1015,24 @@
return 0;
}
+UINT CInterfaceManager::ScanStartCam_4(LPVOID pParam)
+{
+ CInterfaceManager* pInter = static_cast<CInterfaceManager*>(pParam);
+
+ pInter->ScanStartCamera(4);
+
+ return 0;
+}
+
+UINT CInterfaceManager::ScanStartCam_5(LPVOID pParam)
+{
+ CInterfaceManager* pInter = static_cast<CInterfaceManager*>(pParam);
+
+ pInter->ScanStartCamera(5);
+
+ return 0;
+}
+
BOOL CInterfaceManager::ScanStartGrabManual(int iCam,int iScan)
{
if(m_pGrabber[iCam] != NULL)
--
Gitblit v1.9.3