From 6d5796902a980f189f470a4e8ea7084548c52f49 Mon Sep 17 00:00:00 2001
From: KEJ <kimeungju@diteam.co.kr>
Date: 월, 26 6월 2023 17:43:48 +0900
Subject: [PATCH] Ongoing80 #4528 CF AOI Review Motor Offset 기능 추가 1. Motor Offset 설정 Dlg 추가. 2. Offset 파라미터 추가. 3. Motor Offset 기능 적용
---
ReviewSystem/ReviewSystem/DlgReviewOffSetTool.h | 55 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 35 insertions(+), 20 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/DlgReviewOffSetTool.h b/ReviewSystem/ReviewSystem/DlgReviewOffSetTool.h
index 303adea..629ec03 100644
--- a/ReviewSystem/ReviewSystem/DlgReviewOffSetTool.h
+++ b/ReviewSystem/ReviewSystem/DlgReviewOffSetTool.h
@@ -1,31 +1,36 @@
癤�//#include "ReviewInterface.h"
#pragma once
-enum OFFSETCOUNT {
- CAM_MAX_COUNT = 20, XPOS_MAX_COUNT = 10, SCAN_MAX_COUNT = 10, PROGRESS_BAR_MAX = 2000
-};
-
-enum COLORTYPE {
- FFA7A7 = RGB(255, 167, 167),
- FFC19E = RGB(255, 193, 158),
- FFE08C = RGB(255, 224, 140),
- FAED7D = RGB(250, 237, 125),
- FFB2F5 = RGB(255, 178, 245),
-
- A566FF = RGB(165, 102, 255),
- D9418C = RGB(217, 65, 140),
- A00D8FF = RGB(0, 216, 255),
- A2F9D27 = RGB(47, 157, 39),
- A4641D9 = RGB(70, 65, 217)
-};
+/* < KEJ 20230621 - #4528 DEL Start > */
+// enum OFFSETCOUNT {
+// CAM_MAX_COUNT = 20, XPOS_MAX_COUNT = 10, YPOS_MAX_COUNT = 10, SCAN_MAX_COUNT = 10, AOI_MAX_COUNT = 10, PROGRESS_BAR_MAX = 2000
+// };
+//
+// enum COLORTYPE {
+// FFA7A7 = RGB(255, 167, 167),
+// FFC19E = RGB(255, 193, 158),
+// FFE08C = RGB(255, 224, 140),
+// FAED7D = RGB(250, 237, 125),
+// FFB2F5 = RGB(255, 178, 245),
+//
+// A566FF = RGB(165, 102, 255),
+// D9418C = RGB(217, 65, 140),
+// A00D8FF = RGB(0, 216, 255),
+// A2F9D27 = RGB(47, 157, 39),
+// A4641D9 = RGB(70, 65, 217)
+// };
+/* < KEJ 20230621 - #4528 DEL End > */
//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")
+/*< LYW 20220525 - #4161 ADD Start >*/
+#define _REVIEW_SERVER_SYSTEM_SETTING_BACKUP_PATH_CPJT _T("\\\\126.100.100.5\\d\\DIT Back up\\DIT Review\\ReviewServerConfig")
+/*< LYW 20220525 - #4161 ADD End >*/
#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
@@ -34,6 +39,7 @@
virtual BOOL IDRO2P_GetMotorPos(int nModule, double &dXpos, double &dYpos)= 0;
virtual BOOL IDRO2P_SetGlassMode(BOOL bMode, int nCamidx, int nScanidx, double nXpos, double nYpos) = 0;
+ virtual BOOL IDRO2P_SetOffsetPram(int nCamIdx, int nScanIdx, BOOL bUse = 0) = 0;
//virtual const CSystemInfo* SP2P_System_GetSystemInfo()= 0;
//virtual const CMotorControlInfo* ISP2P_System_GetMotorInfo() = 0;
};
@@ -184,4 +190,13 @@
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 >*/
+ virtual BOOL OnNotify(WPARAM wParam, LPARAM lParam, LRESULT* pResult);
};
--
Gitblit v1.9.3