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/stdafx.h | 55 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 45 insertions(+), 10 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/stdafx.h b/ReviewSystem/ReviewSystem/stdafx.h
index d482171..9036c4b 100644
--- a/ReviewSystem/ReviewSystem/stdafx.h
+++ b/ReviewSystem/ReviewSystem/stdafx.h
@@ -77,19 +77,33 @@
#define ID_TIMER_SEND_SIGNAL_ALIVE (WM_USER + 107)
-#define _REVIEW_SERVER_BASE_PATH_ _T("C:\\DIT_Review")
-#define _REVIEW_SERVER_LOG_PATH_ _T("C:\\DIT_Review\\ReviewServerLog")
-#define _REVIEW_RECIPE_PATH_ _T("C:\\DIT_Review\\Recipe")
-#define _REVIEW_REF_RECIPE_PATH_ _T("C:\\DIT_Review\\Recipe\\Reference")
-#define _REVIEW_SERVER_CONFIG_PATH_ _T("C:\\DIT_Review\\ReviewServerConfig")
-#define _REVIEW_SERVER_SYSTEM_SETTING_FILE_PATH_ _T("C:\\DIT_Review\\ReviewServerConfig\\SystemSetting.cfg")
+#define _REVIEW_SERVER_BASE_PATH_ _T("D:\\DIT_Review") //210805
+#define _REVIEW_SERVER_LOG_PATH_ _T("D:\\DIT_Review\\ReviewServerLog")
+#define _REVIEW_RECIPE_PATH_ _T("D:\\DIT_Review\\Recipe")
+#define _REVIEW_REF_RECIPE_PATH_ _T("D:\\DIT_Review\\Recipe\\Reference")
+#define _REVIEW_SERVER_CONFIG_PATH_ _T("D:\\DIT_Review\\ReviewServerConfig")
+#define _REVIEW_SERVER_SYSTEM_SETTING_FILE_PATH_ _T("D:\\DIT_Review\\ReviewServerConfig\\SystemSetting.cfg")
#define _SYSTEM_SETTING_TITLE_ _T("ReviewSystemSetting")
#define _RECIPE_EDITOR_TITLE_ _T("ReviewRecipeEditor")
-#define _REVIEW_LOGIN_LOG_PATH_ _T("C:\\DIT_Review\\ReviewServerLog\\LoginLog")
-#define _REVIEW_REFLOW_RECIPE_PATH_ _T("C:\\DIT_Review\\Recipe\\Reflow")
-#define ALIGN_TEMPLATE_PATH _T("C:\\DIT_Review\\Recipe\\AlignImage")
+#define _REVIEW_LOGIN_LOG_PATH_ _T("D:\\DIT_Review\\ReviewServerLog\\LoginLog")
+#define _REVIEW_REFLOW_RECIPE_PATH_ _T("D:\\DIT_Review\\Recipe\\Reflow")
+#define ALIGN_TEMPLATE_PATH _T("D:\\DIT_Review\\Recipe\\AlignImage")
#define _REVIEW_RECIPE_BACKUP_PATH_CPJT _T("\\\\126.100.100.5\\d\\DIT Back up\\DIT Review\\Recipe")
#define _REVIEW_SERVER_SYSTEM_SETTING_BACKUP_PATH_CPJT _T("\\\\126.100.100.5\\d\\DIT Back up\\DIT Review\\ReviewServerConfig")
+
+//#define _REVIEW_SERVER_BASE_PATH_ _T("C:\\DIT_Review")
+//#define _REVIEW_SERVER_LOG_PATH_ _T("C:\\DIT_Review\\ReviewServerLog")
+//#define _REVIEW_RECIPE_PATH_ _T("C:\\DIT_Review\\Recipe")
+//#define _REVIEW_REF_RECIPE_PATH_ _T("C:\\DIT_Review\\Recipe\\Reference")
+//#define _REVIEW_SERVER_CONFIG_PATH_ _T("C:\\DIT_Review\\ReviewServerConfig")
+//#define _REVIEW_SERVER_SYSTEM_SETTING_FILE_PATH_ _T("C:\\DIT_Review\\ReviewServerConfig\\SystemSetting.cfg")
+//#define _SYSTEM_SETTING_TITLE_ _T("ReviewSystemSetting")
+//#define _RECIPE_EDITOR_TITLE_ _T("ReviewRecipeEditor")
+//#define _REVIEW_LOGIN_LOG_PATH_ _T("C:\\DIT_Review\\ReviewServerLog\\LoginLog")
+//#define _REVIEW_REFLOW_RECIPE_PATH_ _T("C:\\DIT_Review\\Recipe\\Reflow")
+//#define ALIGN_TEMPLATE_PATH _T("C:\\DIT_Review\\Recipe\\AlignImage")
+//#define _REVIEW_RECIPE_BACKUP_PATH_CPJT _T("\\\\126.100.100.5\\d\\DIT Back up\\DIT Review\\Recipe")
+//#define _REVIEW_SERVER_SYSTEM_SETTING_BACKUP_PATH_CPJT _T("\\\\126.100.100.5\\d\\DIT Back up\\DIT Review\\ReviewServerConfig")
#define TOTAL_WINDOW_SIZE_X 1920
@@ -167,7 +181,25 @@
#define WM_OFFSETTOOL_MESSAGE2 (WM_USER + 9998)
#define WM_OFFSETTOOL_MESSAGE (WM_USER + 9999)
+/* < KEJ 20230621 - #4528 ADD 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 ADD End > */
#include <GdiPlus.h>
using namespace Gdiplus;
@@ -187,7 +219,9 @@
#define COPYDATA_SYSTEMSETTING2REVIEWSYSTEM 1500
#define COPYDATA_RECIPEEDITOR2REVIEWSYSTEM 1600
-
+/*< LYW 20211111 - #3766 ADD Start >*/
+#define COPYDATA_REVIEWHISTORYOR2REVIEWSYSTEM 1800
+/*< LYW 20211111 - #3766 ADD End >*/
// [2017:1:13]-[WEZASW] : �떎以� 紐⑤땲�꽣�뿉�꽌�쓽 ReviewSystem Display
enum MonitorPosition {MonitorPos_CENTER=0, MonitorPos_TOP, MonitorPos_BOTTOM, MonitorPos_LEFT, MonitorPos_RIGHT, MonitorPos_Count};
@@ -199,6 +233,7 @@
#include <afxcontrolbars.h>
#include <afxcontrolbars.h>
#include <afxcontrolbars.h>
+#include <afxcontrolbars.h>
enum MsgSystem2Rev
{
--
Gitblit v1.9.3