From 26e2541b87ca76e16cf69399eb9a3cce62d2e864 Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 목, 14 10월 2021 17:58:19 +0900
Subject: [PATCH] Ongoing80 #3671 CF AOI Review 전설비 Align Matching 방법 개선
---
ReviewSystem/ReviewRecipeEditor/DlgAlign.cpp | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/ReviewSystem/ReviewRecipeEditor/DlgAlign.cpp b/ReviewSystem/ReviewRecipeEditor/DlgAlign.cpp
index 453c49c..27668bd 100644
--- a/ReviewSystem/ReviewRecipeEditor/DlgAlign.cpp
+++ b/ReviewSystem/ReviewRecipeEditor/DlgAlign.cpp
@@ -16,6 +16,8 @@
CDlgAlign::CDlgAlign(CWnd* pParent /*=NULL*/)
: CDialog(CDlgAlign::IDD, pParent)
+ , m_dMatchingPixelStandard(0)
+ , m_dMatchingAlarmCondition(0)
{
m_pFirstView = new CCHImageView(this);
m_pSecondView = new CCHImageView(this);
@@ -71,6 +73,8 @@
DDX_Control(pDX, IDC_CHECK_EDGEALIGN_PROCESS, m_ctrlCheckEdgeAlignProcess);
DDX_Control(pDX, IDC_CHECK_ALIGN_SKIP, m_ctrlCheckAlignSkip);
DDX_Control(pDX, IDC_CHECK_TOTALPITCHMEASRE, m_ctrlTotalPitchMeasure);
+ DDX_Text(pDX, IDC_EDIT_MATCHONG_PIXEL_STANDARD, m_dMatchingPixelStandard);
+ DDX_Text(pDX, IDC_EDIT_MATCHING_ALARM_CONDITION, m_dMatchingAlarmCondition);
}
@@ -377,6 +381,12 @@
nRowIdx++;
pRcpRsAlignManager->GetRsRcpAlignInfo()->m_strSecondAssistantImageFile = m_ctrlGridAlignImageInfo.GetItemText(nRowIdx, nColIdx);
nRowIdx++;
+
+ strItemText.Format(_T("%d"), m_dMatchingPixelStandard);
+ pRcpRsAlignManager->GetRsRcpAlignInfo()->m_strMatchingPixelStandard = strItemText;
+
+ strItemText.Format(_T("%d"), m_dMatchingAlarmCondition);
+ pRcpRsAlignManager->GetRsRcpAlignInfo()->m_strMatchingAlarmCondition = strItemText;
/*< LYW 20211012 - #3671 ADD End >*/
strItemText = m_ctrlGridAlignImageInfo.GetItemText(nRowIdx, nColIdx);
@@ -746,6 +756,15 @@
pCellButton = (CGridCellButton*)m_ctrlGridAlignImageInfo.GetCell(nRowIdx, nColIdx);
pCellButton->SetText(_T("Browser"));
+ /*< LYW 20211014 - #3671 ADD Start >*/
+ strItemText = pRcpRsAlignManager->GetRsRcpAlignInfo()->m_strMatchingPixelStandard;
+ m_dMatchingPixelStandard = _tcstod(strItemText, NULL);
+
+ strItemText = pRcpRsAlignManager->GetRsRcpAlignInfo()->m_strMatchingAlarmCondition;
+ m_dMatchingAlarmCondition = _tcstod(strItemText, NULL);
+
+ /*< LYW 20211014 - #3671 ADD End >*/
+
m_ctrlCheckImageProcess.SetCheck(pRcpRsAlignManager->GetRsRcpAlignInfo()->m_bUseImage);
@@ -951,6 +970,9 @@
FillAlignRotateInfo();
FillAlignImageInfo();
+ /*< LYW 20211014 - #3671 ADD Start >*/
+ UpdateData(FALSE);
+ /*< LYW 20211014 - #3671 ADD End >*/
Invalidate(FALSE);
}
--
Gitblit v1.9.3