From 6c48319c60c4eb6ad4ff3631f5caa6b297d2e787 Mon Sep 17 00:00:00 2001 From: LYW <leeyeanwoo@diteam.co.kr> Date: 수, 18 8월 2021 09:06:18 +0900 Subject: [PATCH] Merge branch 'feature/#3561_CF_AOI_Review_Align_카메라_끊김_현상_조치' into feature/#3562_CF_AOI_Review_실행_프로그램_경로_변경 --- ReviewSystem/ReviewSystem/resource.h | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 43 insertions(+), 1 deletions(-) diff --git a/ReviewSystem/ReviewSystem/resource.h b/ReviewSystem/ReviewSystem/resource.h index 5ff1b94..7659a7c 100644 --- a/ReviewSystem/ReviewSystem/resource.h +++ b/ReviewSystem/ReviewSystem/resource.h @@ -87,6 +87,7 @@ #define IDC_BUTTON_UI_LEFT 1004 #define IDC_CHECK_OFFSET_MODE 1004 #define IDC_IMAGE_ROTATION 1004 +#define IDC_CHECK_SELF_DIAGNOSIS_FLATNESS_SKIP 1004 #define IDC_SLIDER1 1005 #define IDC_SLIDER_LIGHT_LEVEL 1005 #define IDC_RADIO_MAP_TYPE_0 1005 @@ -110,6 +111,7 @@ #define IDC_BUTTON_LEFT 1008 #define IDC_BUTTON_APPLT_OFFSET 1008 #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 @@ -251,31 +253,45 @@ #define IDC_EDIT4 1088 #define IDC_EDIT_PANEL_COUNT_SQUARENESS 1089 #define IDC_EDIT_SCAN_COUNT 1089 +#define IDC_EDIT_WSI_HEIGHT4 1089 #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 #define IDC_EDIT_GLASS_SIZE_Y 1095 +#define IDC_EDIT_WSI_HEIGHT10 1095 #define IDC_EDIT_PANEL_COUNT_WSI 1096 +#define IDC_EDIT_WSI_HEIGHT14 1096 #define IDC_EDIT_JUDGE_DATA_3SIGMA 1097 +#define IDC_EDIT_WSI_HEIGHT15 1097 #define IDC_EDIT_WSI_PANEL_POS_X 1098 +#define IDC_EDIT_WSI_HEIGHT16 1098 #define IDC_EDIT_WSI_PANEL_POS_Y 1099 +#define IDC_EDIT_WSI_HEIGHT17 1099 #define IDC_STATIC_JOG_SPEED 1100 #define IDC_EDIT_WSI_PANEL_POS_X2 1100 +#define IDC_EDIT_WSI_HEIGHT18 1100 #define IDC_STATIC_LIGHT_LEVEL 1101 #define IDC_EDIT_WSI_PANEL_POS_Y2 1101 +#define IDC_EDIT_WSI_HEIGHT19 1101 #define IDC_EDIT_REVIEW_PANEL_POS_X 1102 +#define IDC_EDIT_WSI_HEIGHT20 1102 #define IDC_EDIT_REVIEW_PANEL_POS_Y 1103 #define IDC_RADIO_ZOOM_LEVEL_4 1104 #define IDC_EDIT_REVIEW_PANEL_POS_X2 1104 @@ -352,6 +368,7 @@ #define IDC_EDIT_GANTRY_THETA 1142 #define IDC_GRID_GANTRY_DATA_HISTORY 1143 #define IDC_EDIT_MODULE_COUNT 1144 +#define IDC_EDIT_GANTRY_THETA2 1144 #define IDC_EDIT_GANTRY_MOTOR_X 1145 #define IDC_GRID_WSI_RESULT_DATA 1145 #define IDC_EDIT_GANTRY_MOTOR_Y 1146 @@ -376,20 +393,45 @@ #define IDC_EDIT_GANTRY_PIXEL_Y3 1156 #define IDC_EDIT_CHANGE_TARGET_XPOS 1156 #define IDC_EDIT_CHANGE_TARGET_YPOS 1157 +#define IDC_EDIT_GANTRY_MOTOR_X4 1157 #define IDC_BUTTON5 1158 +#define IDC_EDIT_GANTRY_MOTOR_Y4 1158 #define IDC_EDIT_OFFSET_Y_VALUE 1159 +#define IDC_EDIT_GANTRY_PIXEL_X4 1159 #define IDC_EDIT_CAMERA_COUNT 1160 +#define IDC_EDIT_GANTRY_PIXEL_Y4 1160 #define IDC_PROGRESS_PROCESS 1161 +#define IDC_EDIT_GANTRY_MOTOR_X5 1161 #define IDC_EDIT_MOTOR_XPOS 1162 +#define IDC_EDIT_GANTRY_MOTOR_Y5 1162 #define IDC_EDIT_MOTOR_YPOS 1163 +#define IDC_EDIT_GANTRY_PIXEL_X5 1163 #define IDC_BUTTON6 1164 +#define IDC_EDIT_GANTRY_PIXEL_Y5 1164 #define IDC_TAB_HISTORY_CONTROL 1165 +#define IDC_EDIT_GANTRY_MOTOR_X6 1165 #define IDC_LIST_HISTORY_DEFECT 1166 +#define IDC_EDIT_GANTRY_MOTOR_Y6 1166 +#define IDC_EDIT_GANTRY_PIXEL_X6 1167 #define IDC_STATIC_MAP 1168 +#define IDC_EDIT_GANTRY_PIXEL_Y6 1168 #define IDC_GRID_ALIGN_ORIGIN_INFO 1170 #define IDC_GRID_ALIGN_HISTORY_INFO 1171 #define IDC_ALIGN_GRID_ORIGIN_INFO 1173 #define IDC_ALIGN_GRID_ALIGN_INFO 1174 +#define IDC_EDIT_SQUARENESS_STANDARD 1175 +#define IDC_EDIT_WSI_STANDARD 1176 +#define IDC_EDIT_SQUARENESS_FIRSTSETTING 1176 +#define IDC_EDIT_WSI_FIRST_STANDARD 1177 +#define IDC_EDIT_SQUARENESS_STANDARD2 1177 +#define IDC_EDIT_SQUARENESS_FIRSTSETTING2 1177 +#define IDC_EDIT_WSI_HEIGHT1 1178 +#define IDC_EDIT_WSI_HEIGHT2 1179 +#define IDC_EDIT_WSI_HEIGHT3 1180 +#define IDC_EDIT_WSI_HEIGHT11 1181 +#define IDC_EDIT_WSI_HEIGHT12 1182 +#define IDC_EDIT_WSI_HEIGHT13 1183 +#define IDC_LIST_WSI_DIAGNOSIS_RESULT 1184 #define ID_INS_HOOK 32772 #define ID_UNINS_HOOK 32773 @@ -399,7 +441,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 381 #define _APS_NEXT_COMMAND_VALUE 32775 -#define _APS_NEXT_CONTROL_VALUE 1175 +#define _APS_NEXT_CONTROL_VALUE 1185 #define _APS_NEXT_SYMED_VALUE 346 #endif #endif -- Gitblit v1.9.3