From 344c17c8fcceea4c72e26ef1b4b9a11abfd0f3c4 Mon Sep 17 00:00:00 2001
From: LYW <leeyeanwoo@diteam.co.kr>
Date: 목, 11 11월 2021 17:57:01 +0900
Subject: [PATCH] Merge branch 'feature/#3766_CF_AOI_Review_전설비_설정한_기준치_이상_Offset_적용시_경고_기능_추가' into feature/#3662_CF_AOI_Review_전설비_알람_발생_조치
---
ReviewSystem/ReviewSystem/DlgReviewOffSetTool.h | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/DlgReviewOffSetTool.h b/ReviewSystem/ReviewSystem/DlgReviewOffSetTool.h
index 303adea..625b363 100644
--- a/ReviewSystem/ReviewSystem/DlgReviewOffSetTool.h
+++ b/ReviewSystem/ReviewSystem/DlgReviewOffSetTool.h
@@ -21,11 +21,11 @@
//enum MotorOringTYPE {
// LEFT_Top = 0, RIGHT_TOP,LEFT_BOTTOM, RIGHT_BOTTOM
//};
-#define REVIEW_OFFSET_CONFIGFILE_PATH _T("C:\\DIT_Review\\ReviewServerConfig\\")
+#define REVIEW_OFFSET_CONFIGFILE_PATH _T("D:\\DIT_Review\\ReviewServerConfig\\") //210805
#define REVIEW_OFFSET_CONFIGFILE_NAME _T("ReviewOffSet.cfg")
-#define REVIEW_OFFSET_CONFIGFILE_FULL_PATHNAME _T("C:\\DIT_Review\\ReviewServerConfig\\ReviewOffSet.cfg")
+#define REVIEW_OFFSET_CONFIGFILE_FULL_PATHNAME _T("D:\\DIT_Review\\ReviewServerConfig\\ReviewOffSet.cfg")
#define REVIEW_OFFSET_BACKUP_FORDER_NAME _T("OffsetBackup")
-#define REVIEW_OFFSET_BACKUP_FORDER_PATH _T("C:\\DIT_Review\\ReviewServerConfig\\OffsetBackup\\")
+#define REVIEW_OFFSET_BACKUP_FORDER_PATH _T("D:\\DIT_Review\\ReviewServerConfig\\OffsetBackup\\")
// CDlgDefocusList ���솕 �긽�옄�엯�땲�떎.
interface IDialogReviewOffSet2Parent
@@ -184,4 +184,12 @@
double m_editGlassOffSetmodeXpos;
double m_editGlassOffSetmodeYpos;
afx_msg void OnBnClickedCheckOffsetMode();
+ /*< LYW 20211025 - #index ADD Start >*/
+ afx_msg void OnBnClickedOffsetLoad();
+ void OffsetLoad();
+ /*< LYW 20211025 - #index ADD End >*/
+ /*< LYW 20211111 - #3766 ADD Start >*/
+ double m_dWarnStandard;
+ double m_dHardStandard;
+ /*< LYW 20211111 - #3766 ADD End >*/
};
--
Gitblit v1.9.3