From df45966c52bac2eb465cf05c1d6328bf0d00c5ac Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期六, 16 八月 2025 15:27:10 +0800
Subject: [PATCH] 1. 补提交添加保存图像的类
---
EdgeInspector_App/View/ViewMain_ScanImage.cpp | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/EdgeInspector_App/View/ViewMain_ScanImage.cpp b/EdgeInspector_App/View/ViewMain_ScanImage.cpp
index b20660d..2e50ca6 100644
--- a/EdgeInspector_App/View/ViewMain_ScanImage.cpp
+++ b/EdgeInspector_App/View/ViewMain_ScanImage.cpp
@@ -286,7 +286,11 @@
strTitle.Format(_T("BORD[%d] CHANNEL[%d]"), pCamera->m_iCamera, 0);
m_staticCamInfo[i].SetWindowText(strTitle);
}
- }
+ }
+
+ if (m_pGlassData != nullptr) {
+ m_frameImg[i].SetRecipe(m_pGlassData->GetGlassRecipe());
+ }
}
m_bInitDlg = TRUE;
@@ -945,7 +949,7 @@
BOOL CViewMain_ScanImage::ManualThreadStart(int nCmd,int nIndex /*= -1*/)
{
if(m_pManualProcess) {
- DWORD dwWait = ::WaitForSingleObject(m_pManualProcess->m_hThread, 1000);
+ DWORD dwWait = ::WaitForSingleObject(m_pManualProcess->m_hThread, 3000);
if (dwWait == WAIT_TIMEOUT) {
DWORD dwExitCode;
if ((::GetExitCodeThread(m_pManualProcess->m_hThread, &dwExitCode)) && (dwExitCode == STILL_ACTIVE)) {
--
Gitblit v1.9.3