From 75fa4f9c3c26407b906f9de0a4f5ed7708cb68b3 Mon Sep 17 00:00:00 2001
From: LWQ <1806950222@qq.com>
Date: 星期四, 24 七月 2025 10:01:57 +0800
Subject: [PATCH] 新增切换下一张产品运行按钮功能
---
ENRIT/resource.h | 0
ENRIT/View/ViewScanImage.cpp | 10 ++++++++--
ENRIT/View/ViewScanImage.h | 1 +
ENRIT/ENRIT.rc | 0
4 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ENRIT/ENRIT.rc b/ENRIT/ENRIT.rc
index 5b08580..2616070 100644
--- a/ENRIT/ENRIT.rc
+++ b/ENRIT/ENRIT.rc
Binary files differ
diff --git a/ENRIT/View/ViewScanImage.cpp b/ENRIT/View/ViewScanImage.cpp
index fd009a8..4f669a0 100644
--- a/ENRIT/View/ViewScanImage.cpp
+++ b/ENRIT/View/ViewScanImage.cpp
@@ -164,6 +164,7 @@
ON_EVENT(CViewScanImage, IDC_SAVE_ALL, DISPID_CLICK, CViewScanImage::OnBnClickedSaveAll, VTS_NONE)
ON_EVENT(CViewScanImage, IDC_BTN_START_BATCH, DISPID_CLICK, CViewScanImage::OnBtnStartBatch, VTS_NONE)
ON_EVENT(CViewScanImage, IDC_BTN_STOP_BATCH, DISPID_CLICK, CViewScanImage::OnBtnStopBatch, VTS_NONE)
+ ON_EVENT(CViewScanImage, IDC_BTN_NEXT_PROCESS, DISPID_CLICK, CViewScanImage::OnClickBtnNextProcess, VTS_NONE)
END_EVENTSINK_MAP()
@@ -1078,7 +1079,7 @@
BOOL CViewScanImage::ManualThreadStart(int nCmd,int nIndex /*= -1*/)
{
if (m_pManualProcess) {
- DWORD dwWait = ::WaitForSingleObject(m_pManualProcess->m_hThread, 3000);
+ DWORD dwWait = ::WaitForSingleObject(m_pManualProcess->m_hThread, 10000);
if (dwWait == WAIT_TIMEOUT) {
DWORD dwExitCode;
if ((::GetExitCodeThread(m_pManualProcess->m_hThread, &dwExitCode)) && (dwExitCode == STILL_ACTIVE)) {
@@ -1532,4 +1533,9 @@
else
m_frameImg[i].ResetMode(MODE_AUTO_MEASURE);
}
-}
\ No newline at end of file
+}
+
+void CViewScanImage::OnClickBtnNextProcess()
+{
+ SendMessage(WM_BATCH_PROCESS_NEXT, NULL, NULL);
+}
diff --git a/ENRIT/View/ViewScanImage.h b/ENRIT/View/ViewScanImage.h
index 865d1a1..e5a75f8 100644
--- a/ENRIT/View/ViewScanImage.h
+++ b/ENRIT/View/ViewScanImage.h
@@ -80,6 +80,7 @@
void OnBnClickedSaveAll();
void OnBtnStartBatch();
void OnBtnStopBatch();
+ void OnClickBtnNextProcess();
protected:
int GetSideIdx(int nViewIndex);
diff --git a/ENRIT/resource.h b/ENRIT/resource.h
index 481054b..dba52a7 100644
--- a/ENRIT/resource.h
+++ b/ENRIT/resource.h
Binary files differ
--
Gitblit v1.9.3