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