From ac1a257eb74395f949a1a9693cbb3a1e16e69717 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期五, 15 八月 2025 11:44:52 +0800
Subject: [PATCH] 1. 优化SIdeDimensionSetting表格的读取 2. 优化侧面检的功能，从固定的36个检测点变更为自己设置
---
EdgeInspector_App/ViewMain_Recipe.cpp | 81 +++++++++++++++++-----------------------
1 files changed, 34 insertions(+), 47 deletions(-)
diff --git a/EdgeInspector_App/ViewMain_Recipe.cpp b/EdgeInspector_App/ViewMain_Recipe.cpp
index c6b393c..3b7f916 100644
--- a/EdgeInspector_App/ViewMain_Recipe.cpp
+++ b/EdgeInspector_App/ViewMain_Recipe.cpp
@@ -1224,58 +1224,44 @@
void CViewMain_Recipe::UpdateRecipe(BOOL bGetData, int type)
{
- if(bGetData == FALSE)
- {
- // UpdateData(FALSE); // Parameter
-
- Fill_PanelInfo(bGetData);
- Fill_SideInsInfo(bGetData);
- Fill_JudgementInfo(bGetData);
-
- UpdateSideImage(); // Image
-
- UpdateMarkImage(); // Mark Image
-
- m_dScanTimeOut = m_pDlgRecipe->m_RecieParm.m_dOneScanTime_sec;
-
- if(m_pViewSideDimensionSetting != NULL)
- m_pViewSideDimensionSetting->UpdateRecipe(bGetData);
-
- if(m_pViewSideNotchSetting != NULL)
- m_pViewSideNotchSetting->UpdateRecipe(bGetData);
-
- if(m_pViewSideExceptionSetting != NULL)
- m_pViewSideExceptionSetting->UpdateRecipe(bGetData);
-
- if(m_pViewSideUserDefectSetting != NULL)
- m_pViewSideUserDefectSetting->UpdateRecipe(bGetData);
-
- UpdateData(FALSE);
- }
- else
- {
- UpdateData(TRUE); // Parameter
-
- Fill_PanelInfo(bGetData);
- Fill_SideInsInfo(bGetData);
- Fill_JudgementInfo(bGetData);
-
+ if (bGetData) {
+ UpdateData(TRUE);
m_pDlgRecipe->m_RecieParm.m_dOneScanTime_sec = m_dScanTimeOut;
+ }
+ else {
+ m_dScanTimeOut = m_pDlgRecipe->m_RecieParm.m_dOneScanTime_sec;
+ }
- if (type == 1)
- {
- if (m_pViewSideDimensionSetting != NULL)
- m_pViewSideDimensionSetting->UpdateRecipe(bGetData);
+ Fill_PanelInfo(bGetData);
+ Fill_SideInsInfo(bGetData);
+ Fill_JudgementInfo(bGetData);
+
+ if (!bGetData) {
+ UpdateSideImage();
+ UpdateMarkImage();
+ }
+
+ auto UpdateChild = [&](auto* pView) {
+ if (pView) {
+ pView->UpdateRecipe(bGetData);
}
+ };
- if(m_pViewSideNotchSetting != NULL)
- m_pViewSideNotchSetting->UpdateRecipe(bGetData);
+ const bool bNeedUpdateSideDim = (!bGetData) || (type == 1);
+ const bool bNeedRefreshSideUI = (!bGetData);
+ if (m_pViewSideDimensionSetting && bNeedUpdateSideDim) {
+ if (bNeedRefreshSideUI) {
+ m_pViewSideDimensionSetting->RefreshSideUI(TRUE);
+ }
+ m_pViewSideDimensionSetting->UpdateRecipe(bGetData);
+ }
- if(m_pViewSideExceptionSetting != NULL)
- m_pViewSideExceptionSetting->UpdateRecipe(bGetData);
+ UpdateChild(m_pViewSideNotchSetting);
+ UpdateChild(m_pViewSideExceptionSetting);
+ UpdateChild(m_pViewSideUserDefectSetting);
- if(m_pViewSideUserDefectSetting != NULL)
- m_pViewSideUserDefectSetting->UpdateRecipe(bGetData);
+ if (!bGetData) {
+ UpdateData(FALSE);
}
}
@@ -3513,8 +3499,9 @@
void CViewMain_Recipe::ClickButtonOpenDimensionSettingView()
{
- if(m_pViewSideDimensionSetting == NULL)
+ if (m_pViewSideDimensionSetting == NULL) {
return;
+ }
m_pViewSideDimensionSetting->SetGlassData(m_pGlassData);
m_pViewSideDimensionSetting->ShowWindow(SW_SHOW);
--
Gitblit v1.9.3