From daf053dfd30a3c20524d92290be9d3dc2ac599ec Mon Sep 17 00:00:00 2001
From: LWQ <1806950222@qq.com>
Date: 星期三, 30 七月 2025 19:27:02 +0800
Subject: [PATCH] 1.修复：区分测量精度及研磨量距离单像素精度功能 2.修改：上传到CIM的数据
---
ENRIT/View/ViewScanImage.cpp | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/ENRIT/View/ViewScanImage.cpp b/ENRIT/View/ViewScanImage.cpp
index e38a91b..b15dd60 100644
--- a/ENRIT/View/ViewScanImage.cpp
+++ b/ENRIT/View/ViewScanImage.cpp
@@ -119,7 +119,10 @@
BEGIN_MESSAGE_MAP(CViewScanImage, CDialogEx)
ON_WM_VSCROLL()
ON_WM_HSCROLL()
-
+ ON_WM_SHOWWINDOW()
+ ON_WM_TIMER()
+ ON_WM_PAINT()
+ ON_WM_MOUSEWHEEL()
ON_BN_CLICKED(IDC_BTN_LOAD1, &CViewScanImage::OnBnClickedBtnLoad1)
ON_BN_CLICKED(IDC_BTN_SAVE1, &CViewScanImage::OnBnClickedBtnSave1)
ON_BN_CLICKED(IDC_BTN_LOAD2, &CViewScanImage::OnBnClickedBtnLoad2)
@@ -130,9 +133,7 @@
ON_BN_CLICKED(IDC_BTN_SAVE4, &CViewScanImage::OnBnClickedBtnSave4)
ON_NOTIFY(NM_CUSTOMDRAW, IDC_SLIDER_ZOOM, &CViewScanImage::OnNMCustomdrawSliderZoom)
ON_NOTIFY(NM_RELEASEDCAPTURE, IDC_SLIDER_ZOOM, &CViewScanImage::OnNMReleasedcaptureSliderZoom)
- ON_WM_MOUSEWHEEL()
ON_BN_CLICKED(IDC_UPDN_WIDTH1, &CViewScanImage::OnBnClickedUpdnWidth1)
-
ON_BN_CLICKED(IDC_UPDN_WIDTH2, &CViewScanImage::OnBnClickedUpdnWidth2)
ON_BN_CLICKED(IDC_UPDN_WIDTH3, &CViewScanImage::OnBnClickedUpdnWidth3)
ON_BN_CLICKED(IDC_UPDN_WIDTH4, &CViewScanImage::OnBnClickedUpdnWidth4)
@@ -148,11 +149,9 @@
ON_BN_CLICKED(IDC_BTN_SAVE7, &CViewScanImage::OnBnClickedBtnSave7)
ON_BN_CLICKED(IDC_BTN_LOAD8, &CViewScanImage::OnBnClickedBtnLoad8)
ON_BN_CLICKED(IDC_BTN_SAVE8, &CViewScanImage::OnBnClickedBtnSave8)
- ON_BN_CLICKED(IDC_CHECK_AUTO_SIZE, &CViewScanImage::OnBnClickedCheckAutoSize)
- ON_WM_SHOWWINDOW()
- ON_WM_TIMER()
- ON_WM_PAINT()
- ON_MESSAGE(WM_POCESS_STATUS , OnProcessStatus)
+ ON_BN_CLICKED(IDC_CHECK_AUTO_SIZE, &CViewScanImage::OnBnClickedCheckAutoSize)
+ ON_MESSAGE(WM_POCESS_STATUS , &CViewScanImage::OnProcessStatus)
+ ON_MESSAGE(WM_BATCH_PROCESS_NEXT, &CViewScanImage::OnBatchProcessNext)
END_MESSAGE_MAP()
BEGIN_EVENTSINK_MAP(CViewScanImage, CDialogEx)
@@ -165,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_STOP_BATCH2, DISPID_CLICK, CViewScanImage::OnClickBtnStopBatch2, VTS_NONE)
END_EVENTSINK_MAP()
@@ -1079,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)) {
@@ -1533,4 +1533,9 @@
else
m_frameImg[i].ResetMode(MODE_AUTO_MEASURE);
}
-}
\ No newline at end of file
+}
+
+void CViewScanImage::OnClickBtnStopBatch2()
+{
+ SendMessage(WM_BATCH_PROCESS_NEXT, NULL, NULL);
+}
--
Gitblit v1.9.3