From 47372488fddbcab4ab7b261d84a6b0f772a9bc34 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 07 八月 2025 18:03:29 +0800
Subject: [PATCH] 1. 侧面检添加配方功能 2. 侧面检本地加载 3. 侧面检运行界面添加
---
EdgeInspector_App/MainFrm.cpp | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/EdgeInspector_App/MainFrm.cpp b/EdgeInspector_App/MainFrm.cpp
index 9ffc2e9..74539d1 100644
--- a/EdgeInspector_App/MainFrm.cpp
+++ b/EdgeInspector_App/MainFrm.cpp
@@ -436,7 +436,7 @@
for(iCam=0;iCam<MAX_CAMERA_COUNT;iCam++)
{
pMain->ScanStartGrabManual(iCam,0);
- pMain->ScanStartManual(iCam,0);
+ pMain->ScanStartManual(iCam,0);
}
}
break;
@@ -490,7 +490,7 @@
for(iCam=0;iCam<MAX_CAMERA_COUNT;iCam++)
{
- pMain->ScanStartManual(iCam,1);
+ pMain->ScanStartManual(iCam,1);
}
}
break;
@@ -550,20 +550,18 @@
BOOL CMainFrame::IV2M_SetLiveGrabCommand(DimensionDir eDim,BOOL bStop)
{
- if (IsScanNow())
- {
+ if (IsScanNow()) {
g_pLog->DisplayMessage(_T("Doing Inspection"));
return TRUE;
}
// 4/13 MiniLED
- if(eDim < DIMENSION_A || eDim > DIMENSION_D)
+ if (eDim < DIMENSION_A || eDim > DIMENSION_D_RIP) {
return FALSE;
+ }
g_pLog->DisplayMessage(_T("Live Cam %d Start : Main"),(int)eDim);
-
BOOL bRet = SetLiveGrabCommand(eDim,bStop);
-
g_pLog->DisplayMessage(_T("Live Cam %d End : Main"),(int)eDim);
return bRet;
@@ -571,16 +569,18 @@
LPBYTE CMainFrame::IV2M_GetGrabBufferByDimension(DimensionDir eDim,int iVline)
{
- // if(IsScanNow())
- // {
- // g_pLog->DisplayMessage(_T("Doing Inspection"));
- // return NULL;
- // }
+ //if (IsScanNow()) {
+ // g_pLog->DisplayMessage(_T("Doing Inspection"));
+ // return NULL;
+ //}
- if(eDim < DIMENSION_A || eDim > DIMENSION_D_DN)
+ if (eDim < DIMENSION_A || eDim > DIMENSION_D_RIP) {
return NULL;
- if(iVline < 0)
+ }
+
+ if (iVline < 0) {
return NULL;
+ }
return GetGrabBuffer(eDim,iVline);
}
@@ -612,7 +612,6 @@
#ifndef _DEBUG
SetSlashText(GLOBAL_DEFINE::emShow, _T(""), RGB(0,0,0));
#endif
-
SetSlashText(GLOBAL_DEFINE::emText, _T("Image Loading Start"), RGB(0,0,0));
if(iSide > -1)
--
Gitblit v1.9.3