From 9020bfb6f86ff853d5d5b3cee882132a244232da Mon Sep 17 00:00:00 2001
From: KEJ <kimeungju@diteam.co.kr>
Date: 금, 24 11월 2023 15:33:29 +0900
Subject: [PATCH] Merge branch 'feature/#4528_CF_AOI_Review_Motor_Offset_기능_추가' into develop
---
ReviewSystem/ReviewSystem/ReviewSystemView.cpp | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/ReviewSystemView.cpp b/ReviewSystem/ReviewSystem/ReviewSystemView.cpp
index 4eb601a..75ac167 100644
--- a/ReviewSystem/ReviewSystem/ReviewSystemView.cpp
+++ b/ReviewSystem/ReviewSystem/ReviewSystemView.cpp
@@ -479,14 +479,28 @@
m_DlgOffSetTool->Create(IDD_DLG_REVIEW_OFFSET_TOOL, this);
m_DlgOffSetTool->SetDDL2P(static_cast<IDialogReviewOffSet2Parent*>(pMainFrame));
- //Review HistoryTool �깮�꽦
- m_DlgHistoryTool = new CDlgReviewHistoryTool(this);
- m_DlgHistoryTool->Create(IDD_DLG_REVIEW_HISTORY_TOOL, this);
- m_DlgHistoryTool->SetDDL2P(static_cast<IDialogReviewHistory2Parent*>(pMainFrame));
+ /*< LYW 20211112 - #3708 ADD Start >*/
+ m_DlgHardWareSettingMode = new DlgHardwareSettingMode(this);
+ m_DlgHardWareSettingMode->Create(IDD_DLG_HARDWARE_SETTING_MODE, this);
+ m_DlgHardWareSettingMode->SetDHM2P(static_cast<IDialogHardwareSettingMode2Parent*>(pMainFrame));
+ /*< LYW 20211112 - #3708 ADD End >*/
+
+ /*< LYW 20211109 - #3662 Delete Start >*/
+ ////Review HistoryTool �깮�꽦
+ //m_DlgHistoryTool = new CDlgReviewHistoryTool(this);
+ //m_DlgHistoryTool->Create(IDD_DLG_REVIEW_HISTORY_TOOL, this);
+ //m_DlgHistoryTool->SetDDL2P(static_cast<IDialogReviewHistory2Parent*>(pMainFrame));
+ /*< LYW 20211109 - #3662 Delete End >*/
// m_DlgOffSetTool->ShowWindow(SW_SHOW);
+ /* < KEJ 20230621 - #4528 ADD Start > */
+ //Motor OffsetTool �깮�꽦
+ m_DlgMotorOffSetTool = new CDlgMotorOffSetTool(this);
+ m_DlgMotorOffSetTool->Create(IDD_DLG_MOTOR_OFFSET_TOOL, this);
+ m_DlgMotorOffSetTool->SetDMO2P(static_cast<IDialogMotorOffSet2Parent*>(pMainFrame));
+ /* < KEJ 20230621 - #4528 ADD End > */
}
@@ -688,6 +702,14 @@
delete m_DlgHistoryTool;
m_DlgHistoryTool = NULL;
}
+ /* < KEJ 20230621 - #4528 ADD Start > */
+ if (m_DlgMotorOffSetTool)
+ {
+ m_DlgMotorOffSetTool->DestroyWindow();
+ delete m_DlgMotorOffSetTool;
+ m_DlgMotorOffSetTool = NULL;
+ }
+ /* < KEJ 20230621 - #4528 ADD End > */
TRACE(_T("[A2E]DeleteDialogs 醫낅즺\n"));
}
@@ -917,6 +939,17 @@
m_DlgHistoryTool->GetHistoryList();
}
+void CReviewSystemView::ShowHWSettingMode()
+{
+ m_DlgHardWareSettingMode->ShowWindow(SW_SHOW);
+}
+/* < KEJ 20230621 - #4528 ADD Start > */
+void CReviewSystemView::ShowMotorOffSetTool()
+{
+ m_DlgMotorOffSetTool->ShowWindow(SW_SHOW);
+}
+/* < KEJ 20230621 - #4528 ADD End > */
+
//181203
BOOL CReviewSystemView::SaveDefectMap( const CString& strPath )
{
--
Gitblit v1.9.3