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/resource.h |   68 +++++-----------------------------
 1 files changed, 10 insertions(+), 58 deletions(-)

diff --git a/ReviewSystem/ReviewSystem/resource.h b/ReviewSystem/ReviewSystem/resource.h
index 2fe97fb..8976ab8 100644
--- a/ReviewSystem/ReviewSystem/resource.h
+++ b/ReviewSystem/ReviewSystem/resource.h
@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}
-// Microsoft Visual C++�뿉�꽌 �깮�꽦�븳 �룷�븿 �뙆�씪�엯�땲�떎.
-// ReviewSystem.rc�뿉�꽌 �궗�슜�릺怨� �엳�뒿�땲�떎.
+// Microsoft Visual C++에서 생성한 포함 파일입니다.
+// ReviewSystem.rc에서 사용되고 있습니다.
 //
 #define IDCANCEL                        2
 #define IDD_ABOUTBOX                    100
@@ -8,8 +8,6 @@
 #define IDD_REVIEWSYSTEM_FORM           101
 #define IDD_DLG_RESULT_GRAPH            103
 #define IDR_POPUP_EDIT                  119
-#define ID_STATUSBAR_PANE1              120
-#define ID_STATUSBAR_PANE2              121
 #define IDS_STATUS_PANE1                122
 #define IDS_STATUS_PANE2                123
 #define IDS_TOOLBAR_STANDARD            124
@@ -68,6 +66,7 @@
 #define IDD_DLG_DEFECT_MAP_TAB          374
 #define IDD_DLG_ALIGN_TAB               376
 #define IDB_BITMAP2                     379
+#define IDD_DLG_MOTOR_OFFSET_TOOL       380
 #define IDD_DLG_HARDWARE_SETTING_MODE   381
 #define IDC_RADIO1                      1001
 #define IDC_RADIO_ZOOM_LEVEL_0          1001
@@ -80,8 +79,6 @@
 #define IDC_RADIO_ZOOM_LEVEL_2          1003
 #define IDC_RADIO_MAP_TYPE_1            1003
 #define IDC_RADIO_IMAGE_MODE_2          1003
-#define IDC_CHECK1                      1004
-#define IDC_CHECK_CAMERA_CONTROL        1004
 #define IDC_RADIO_MAP_TYPE_3            1004
 #define IDC_RADIO_IMAGE_MODE_3          1004
 #define IDC_CHECK_REDUCE                1004
@@ -95,17 +92,9 @@
 #define IDC_IMAGE_FLIP                  1005
 #define IDC_SLIDER2                     1006
 #define IDC_SLIDER_EXPOSURE_TIME        1006
-#define IDC_CHECK_AFM_TRACKING          1006
 #define IDC_BUTTON_UI_RIGHT1            1006
-#define IDC_CHECK2                      1007
-#define IDC_CHECK_MEASURE_POINT         1007
-#define IDC_CHECK_JOG_UP                1007
 #define IDC_RADIO_ZOOM_LEVEL_3          1007
 #define IDC_USE_DEFECT                  1007
-#define IDC_BUTTON2                     1008
-#define IDC_CHECK_MEASURE_POINT2        1008
-#define IDC_CHECK_CAMERA_RANGE          1008
-#define IDC_CHECK_REVIEW_PATH           1008
 #define IDC_CHECK_DRAW_REVIEW_PATH      1008
 #define IDC_SLIDER_LIGHT_LEVEL_1        1008
 #define IDC_SLIDER_LIGHT_LEVEL_TRANS    1008
@@ -114,46 +103,35 @@
 #define IDC_BUTTON_PROGRAMEXIT          1008
 #define IDC_BUTTON_ALIGNCAM_GRAB        1008
 #define IDC_SPIN2                       1009
-#define IDC_CHECK_REVIEW_PATH2          1009
-#define IDC_CHECK_AUTO_SELECT_CAMERA    1009
 #define IDC_CHECK_DRAW_SELECTED_DEFECT  1009
 #define IDC_BUTTON_APPLY_GRID_DATA      1009
 #define IDC_STATIC_ALIGN_RESULT         1010
-#define IDC_CHECK_REVIEW_PATH3          1010
 #define IDC_CHECK_DRAW_WSI_PATH         1010
 #define IDC_BUTTON_APPLT_OFFSET_PARAM   1010
 #define IDC_BUTTON_PREV_IMAGE           1011
 #define IDC_STATIC_ALIGN_ANGLE          1011
 #define IDC_BUTTON_PREV_BUFFER          1011
-#define IDC_CHECK_REVIEW_PATH4          1011
 #define IDC_CHECK_DRAW_CELL             1011
 #define IDC_STATIC_SIGNAL_SIGNAL_LOADING 1012
 #define IDC_BUTTON_NEXT_IMAGE           1012
 #define IDC_STATIC_ALIGN_DXDY           1012
 #define IDC_BUTTON_NEXT_BUFFER          1012
 #define IDC_STATIC_ALIGN_DX             1012
-#define IDC_CHECK_REVIEW_PATH5          1012
 #define IDC_CHECK_DRAW_DEFECT           1012
 #define IDC_BUTTON_JOG_UP               1013
 #define IDC_STATIC_ALIGN_DY             1013
-#define IDC_CHECK_REVIEW_PATH6          1013
-#define IDC_CHECK_CAMERA_POSITION       1013
 #define IDC_CHECK_DRAW_CAMERA_POSITION  1013
 #define IDC_STATIC_SIGNAL_SIGNAL_REVIEW_START 1014
 #define IDC_BUTTON_JOG_DOWN             1014
 #define IDC_STATIC_ALIGN_OX             1014
-#define IDC_CHECK_REVIEW_PATH7          1014
-#define IDC_CHECK_DRAW_RULER            1014
 #define IDC_CHECK_USE_WSI               1014
 #define IDC_STATIC_SIGNAL_SIGNAL_REVIEW_END 1015
 #define IDC_STATIC_ALIGN_OY             1015
-#define IDC_CHECK_REVIEW_PATH8          1015
 #define IDC_CHECK_DRAW_REVIEW_DEFECT    1015
 #define IDC_STATIC_SIGNAL_SIGNAL_UNLOADING 1016
 #define IDC_CHECK_DRAW_WSI_DEFECT       1016
 #define IDC_CHECK_DRAW_USER_PATH        1017
 #define IDC_STATIC_SIGNAL_SIGNAL_VCR_READ 1017
-#define IDC_CHECK_DRAW_WSI_PATH3        1018
 #define IDC_CHECK_DRAW_MEASURE_PATH     1018
 #define IDC_CHECK_USE_WSI_MEASUREMENT   1019
 #define IDC_EDIT_GO_POS_X               1022
@@ -163,24 +141,15 @@
 #define IDC_LIST_DEFECT                 1036
 #define IDC_BUTTON_MOTOR_GO_XY          1037
 #define IDC_LIST_LOG                    1038
-#define IDC_BUTTON_UI_EXPAND            1038
 #define IDC_CHECK_UI_REDUCE             1038
-#define IDC_CHECK_TYPE_B                1039
 #define OnBnClickedButtonUiRight        1039
-#define IDC_BUTTON_UI_RIGHT             1039
-#define IDC_CHECK_TYPE_B2               1040
-#define IDC_CHECK_TYPE_W                1040
 #define IDC_STATIC_MEASURE_GRAPH        1040
 #define IDC_STATIC_GRAPH_VIEW           1040
 #define IDC_COMBO_VIEW_FIRST            1041
-#define IDC_COMBO2                      1042
-#define IDC_COMBO_VIEW_SECOND           1042
 #define IDC_GRID_MAP_OPTION             1042
 #define IDC_COMBO_SELECT_MODULE         1042
 #define IDC_STATIC_DATE_TIME            1043
 #define IDC_STATIC_VERSION              1044
-#define IDC_COMBO1                      1044
-#define IDC_COMBO_VIEW_MODE             1044
 #define IDC_COMBO_MODE                  1044
 #define IDC_COMBO_FLANTESS_MODE         1044
 #define IDC_COMBO_MODULE_INDEX          1044
@@ -199,7 +168,6 @@
 #define IDC_STATIC_VERSION4             1049
 #define IDC_EDIT_WSI_RTB_01             1049
 #define IDC_EDIT_SCAN_INDEX             1049
-#define IDC_BUTTON3                     1050
 #define IDC_BUTTON_LONG_RUN_STOP        1050
 #define IDC_STATIC_TOTAL_DEFECT2        1050
 #define IDC_STATIC_TOTAL_DEFECT         1050
@@ -220,29 +188,21 @@
 #define IDC_STATIC_MACHINETYPE          1053
 #define IDC_EDIT8                       1053
 #define IDC_GRID_AFM_INFO               1054
-#define IDC_EDIT9                       1054
 #define IDC_EDIT10                      1055
 #define IDC_EDIT11                      1056
 #define IDC_EDIT12                      1057
 #define IDC_STATIC_X_JOG_PLUS           1058
-#define IDC_EDIT15                      1058
 #define IDC_STATIC_Y_JOG_PLUS           1059
 #define IDC_EDIT14                      1059
 #define IDC_STATIC_R_JOG_PLUS           1060
 #define IDC_EDIT13                      1060
 #define IDC_STATIC_X_JOG_MINUS          1061
-#define IDC_EDIT17                      1061
 #define IDC_STATIC_Y_JOG_MINUS          1062
-#define IDC_EDIT18                      1062
 #define IDC_STATIC_R_JOG_MINUS          1063
-#define IDC_EDIT19                      1063
 #define IDC_BUTTON_ALIGN_PROCESS        1064
-#define IDC_EDIT20                      1064
 #define IDC_STATIC_SIGNAL_SIGNAL_ALIGN_START 1065
-#define IDC_EDIT21                      1065
 #define IDC_STATIC_SIGNAL_SIGNAL_READ_RAWFILE 1066
 #define IDC_TAB_CONTROL                 1067
-#define IDC_CHECK_DIGITAL_ZOOM          1068
 #define IDC_SLIDER_JOG_SPEED            1069
 #define IDC_GRID_CAMERA_POS             1070
 #define IDC_RADIO_MAP_TYPE_4            1071
@@ -258,20 +218,16 @@
 #define IDC_BUTTON_GLASS_GO_XY          1090
 #define IDC_EDIT_REVIEW_CAMCOUNT        1090
 #define IDC_EDIT_WSI_HEIGHT5            1090
-#define IDC_BUTTON_TEST1                1091
 #define IDC_KEY_JOD_MOVE                1091
 #define IDC_EDIT_JUDGE_DATA_Z_RANGE     1091
-#define IDC_EDIT16                      1091
 #define IDC_EDIT_SETTINGFILE_PATH       1091
 #define IDC_EDIT_WSI_HEIGHT6            1091
-#define IDC_BUTTON_GLASS_GO_XY3         1092
 #define IDC_BUTTON_TEST2                1092
 #define IDC_EDIT_XPOS_COUNT             1092
 #define IDC_EDIT_WSI_HEIGHT7            1092
 #define IDC_CHECK_AFM_TRACK             1093
 #define IDC_EDIT_RANGE_COUNT_FLATNESS   1093
 #define IDC_EDIT_WSI_HEIGHT8            1093
-#define IDC_BUTTON_GLASS_GO_XY2         1094
 #define IDC_BUTTON_GLASSCENTER_GO_XY    1094
 #define IDC_EDIT_GLASS_SIZE_X           1094
 #define IDC_EDIT_WSI_HEIGHT9            1094
@@ -302,14 +258,11 @@
 #define IDC_GRID_MOTOR_POS2             1106
 #define IDC_GRID_GLASS_POS              1106
 #define IDC_EDIT_REVIEW_PANEL_POS_X3    1106
-#define IDC_CHECK3                      1107
 #define IDC_GRID_GLASSCENTER_POS        1107
 #define IDC_EDIT_REVIEW_PANEL_POS_Y3    1107
 #define IDC_EDIT_REVIEW_PANEL_POS_X4    1108
-#define IDC_BUTTON1                     1109
 #define IDC_BUTTON_VERSION              1109
 #define IDC_INS_HOOK                    1109
-#define IDC_BUTTON_REDUCE               1109
 #define IDC_BUTTON_GET_TEMPLETE_IMAGE   1109
 #define IDC_BUTTON_MANUAL               1109
 #define IDC_BT_REVIEW_POPUP             1109
@@ -320,7 +273,6 @@
 #define IDC_BUTTON_AFM_CONNECT          1109
 #define IDC_GRID_ALIGN_INFO             1110
 #define IDC_EDIT_UPDATE_NOTE            1110
-#define IDC_BUTTON4                     1110
 #define IDC_UNINS_HOOK                  1110
 #define IDC_BUTTON_RIGHT                1110
 #define IDC_BUTTON_SIMULATION           1110
@@ -342,10 +294,8 @@
 #define IDC_GO_WSI                      1116
 #define IDC_CHECK_USE_WSI_CONTROL       1116
 #define IDC_BUTTON_ALIGN_CAM_DISCONNECT 1116
-#define IDC_CHECK4                      1117
 #define IDC_SELECT_OFFSET_ON            1117
 #define IDC_BUTTON_REVIEW_CAM_CONNECT   1117
-#define IDC_CHECK5                      1118
 #define IDC_NOT_USE_CENTER_POS          1118
 #define IDC_CHECK_USE_SIMULATION        1118
 #define IDC_BUTTON_REVIEW_CAM_DISCONNECT 1120
@@ -406,6 +356,7 @@
 #define IDC_EDIT_GANTRY_MOTOR_Y4        1158
 #define IDC_EDIT_OFFSET_Y_VALUE         1159
 #define IDC_EDIT_GANTRY_PIXEL_X4        1159
+#define IDC_BUTTON_MOTOR_OFFSET_TOOL    1159
 #define IDC_EDIT_CAMERA_COUNT           1160
 #define IDC_EDIT_GANTRY_PIXEL_Y4        1160
 #define IDC_PROGRESS_PROCESS            1161
@@ -443,18 +394,19 @@
 #define IDC_OFFSET_LOAD                 1185
 #define IDC_EDIT_WARN_STANDARD          1186
 #define IDC_EDIT_HARD_STANDARD          1187
-#define IDC_BUTTON_STANDARD_SAVE        1188
 #define IDC_STATIC_REVIEW_CAMERA        1189
-#define ID_INS_HOOK                     32772
-#define ID_UNINS_HOOK                   32773
+#define IDC_EDIT_MOTOR_OFFSET_COUNTX    1190
+#define IDC_EDIT_MOTOR_OFFSET_COUNTY    1191
+#define IDC_GRID_MOTOR_OFFSET_INFO      1192
+#define IDC_COMBO_MOTOR_OFFSET_MODULEIDX 1193
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        383
+#define _APS_NEXT_RESOURCE_VALUE        385
 #define _APS_NEXT_COMMAND_VALUE         32775
-#define _APS_NEXT_CONTROL_VALUE         1190
+#define _APS_NEXT_CONTROL_VALUE         1194
 #define _APS_NEXT_SYMED_VALUE           346
 #endif
 #endif

--
Gitblit v1.9.3