From 2bd50ead7f0b92fb9ed5b477b63dea8fbcf8217e Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 월, 19 7월 2021 10:40:50 +0900
Subject: [PATCH] Ongoing60 #3517 CF AOI Review 자가진단 기능 개선
---
ReviewSystem/ReviewSystem/DlgSelfDiagnosis_Setting.cpp | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 50 insertions(+), 3 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/DlgSelfDiagnosis_Setting.cpp b/ReviewSystem/ReviewSystem/DlgSelfDiagnosis_Setting.cpp
index 8419810..df5dc06 100644
--- a/ReviewSystem/ReviewSystem/DlgSelfDiagnosis_Setting.cpp
+++ b/ReviewSystem/ReviewSystem/DlgSelfDiagnosis_Setting.cpp
@@ -56,6 +56,12 @@
DDX_Control(pDX, IDC_EDIT_WSI_PANEL_POS_Y, m_editPanelPosY);
DDX_Control(pDX, IDC_EDIT_WSI_PANEL_POS_X2, m_editPanelPosX2);
DDX_Control(pDX, IDC_EDIT_WSI_PANEL_POS_Y2, m_editPanelPosY2);
+ //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_START
+ DDX_Control(pDX, IDC_CHECK_SELF_DIAGNOSIS_FLATNESS_SKIP, m_CheckFlatnessSkip);
+ DDX_Control(pDX, IDC_EDIT_SQUARENESS_STANDARD, m_editSquarenessStandard);
+ DDX_Control(pDX, IDC_EDIT_SQUARENESS_STANDARD2, m_editSquarenessStandard2);
+ DDX_Control(pDX, IDC_EDIT_WSI_STANDARD, m_editWSIStandard);
+ //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_END
DDX_Text(pDX, IDC_EDIT_REVIEW_PANEL_POS_X, m_dEditReviewPanelPosX);
DDX_Text(pDX, IDC_EDIT_REVIEW_PANEL_POS_Y, m_dEditReviewPanelPosY);
DDX_Text(pDX, IDC_EDIT_REVIEW_PANEL_POS_X2, m_dEditReviewPanelPosX2);
@@ -111,16 +117,19 @@
BOOL CDlgSelfDiagnosis_Setting::ReadAutoDiagnosisConfigFile()
{
+ //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_START
+ CString strConfigFilePath = _T("");
+ strConfigFilePath.Format(_T("%s\\%s"), REVIEW_AUTO_DIAGNOSIS_SETTING_FILE_PATH, REVIEW_AUTO_DIAGNOSIS_SETTING_FILE_NAME);
+ m_pDiagnosisManager->LoadSettingConfigFile(strConfigFilePath);
+ //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_END
CDiagnosisInfo* pSettingInfo = m_pDiagnosisManager->GetDiagnosisInfo();
if (pSettingInfo == NULL)
return FALSE;
CString strTemp = _T("");
- CString strFilePath = REVIEW_AUTO_DIAGNOSIS_SETTING_FILE_PATH;
- CString strFileName = _T("AutoDiagnosisSetting.cfg");
- m_editFilePath.SetWindowTextA(strFilePath +_T('\\') + strFileName);
+ m_editFilePath.SetWindowTextA(strConfigFilePath);
strTemp.Format("%d", pSettingInfo->GetModuleCount());
m_editModuleCount.SetWindowTextA(strTemp);
@@ -133,6 +142,14 @@
strTemp.Format("%f", pSettingInfo->GetJudgeData_Degree());
m_editJudgeData_Degree.SetWindowTextA(strTemp);
+
+ //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_START
+ strTemp.Format("%f", pSettingInfo->GetSquarenessStandard());
+ m_editSquarenessStandard.SetWindowTextA(strTemp);
+
+ strTemp.Format("%f", pSettingInfo->GetSquarenessStandard2());
+ m_editSquarenessStandard2.SetWindowTextA(strTemp);
+ //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_END
strTemp.Format("%d", pSettingInfo->GetCameraFrameWidth());
m_editFrameWidth.SetWindowTextA(strTemp);
@@ -166,12 +183,20 @@
strTemp.Format("%d", pSettingInfo->GetGlassSizeY_Flatness());
m_editGlassSizeY.SetWindowTextA(strTemp);
+ //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_START
+ m_CheckFlatnessSkip.SetCheck(pSettingInfo->GetFlastnessSkipMode());
+ //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_END
strTemp.Format("%d", pSettingInfo->GetPanelCount_Wsi());
m_editPanelCount_Wsi.SetWindowTextA(strTemp);
strTemp.Format("%f", pSettingInfo->GetJudgeData_3Sigma());
m_editJudgeData_3Sigma.SetWindowTextA(strTemp);
+
+ //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_START
+ strTemp.Format("%f", pSettingInfo->GetWSIStandard());
+ m_editWSIStandard.SetWindowTextA(strTemp);
+ //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_END
strTemp.Format("%f", pSettingInfo->GetPanelPosX_Wsi());
m_editPanelPosX.SetWindowTextA(strTemp);
@@ -278,6 +303,28 @@
nTemp = atoi(strTemp);
macroFile.SetItem(strItem, nTemp);
+ //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_START
+ strItem.Format(_T("FLATNESS_SKIPMODE"));
+ nTemp = m_CheckFlatnessSkip.GetCheck();
+ macroFile.SetItem(strItem, nTemp);
+
+ strItem.Format(_T("SQUARENESS_STANDARD"));
+ m_editSquarenessStandard.GetWindowTextA(strTemp);
+ dTemp = atof(strTemp);
+ macroFile.SetItem(strItem, dTemp);
+
+ strItem.Format(_T("SQUARENESS_STANDARD2"));
+ m_editSquarenessStandard2.GetWindowTextA(strTemp);
+ dTemp = atof(strTemp);
+ macroFile.SetItem(strItem, dTemp);
+
+ strItem.Format(_T("WSI_STANDARD"));
+ m_editWSIStandard.GetWindowTextA(strTemp);
+ dTemp = atof(strTemp);
+ macroFile.SetItem(strItem, dTemp);
+
+ //#3514_LYW_CF AOI Review �옄媛�吏꾨떒 湲곕뒫 媛쒖꽑_END
+
strItem.Format(_T("WSI_PANEL_COUNT"));
m_editPanelCount_Wsi.GetWindowTextA(strTemp);
nTemp = atoi(strTemp);
--
Gitblit v1.9.3