From c6e24163c3c852b4ac3e45d100b9253b3db0e182 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 15 八月 2025 16:59:00 +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 cebf8b4..874a1ef 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, 3000);
+ DWORD dwWait = ::WaitForSingleObject(m_pManualProcess->m_hThread, 1000);
if (dwWait == WAIT_TIMEOUT) {
DWORD dwExitCode;
if ((::GetExitCodeThread(m_pManualProcess->m_hThread, &dwExitCode)) && (dwExitCode == STILL_ACTIVE)) {
--
Gitblit v1.9.3