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/ReviewSystem.rc | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/ReviewSystem.rc b/ReviewSystem/ReviewSystem/ReviewSystem.rc
index a565daf..fc957db 100644
--- a/ReviewSystem/ReviewSystem/ReviewSystem.rc
+++ b/ReviewSystem/ReviewSystem/ReviewSystem.rc
@@ -483,9 +483,9 @@
PUSHBUTTON "Key Jog 시작",IDC_KEY_JOD_MOVE,207,167,45,17,NOT WS_VISIBLE | NOT WS_TABSTOP
PUSHBUTTON "test2",IDC_BUTTON_TEST2,273,167,34,17,NOT WS_VISIBLE
CTEXT "Key Jog시작",IDC_KEY_JOG_MOVE,392,160,31,24
- PUSHBUTTON "Reduce",IDC_CHECK_UI_REDUCE,436,77,51,17
- PUSHBUTTON "Left",IDC_BUTTON_UI_LEFT,436,96,50,17
- PUSHBUTTON "Right",IDC_BUTTON_UI_RIGHT1,436,116,50,17
+ PUSHBUTTON "Reduce",IDC_CHECK_UI_REDUCE,436,73,51,17
+ PUSHBUTTON "Left",IDC_BUTTON_UI_LEFT,436,92,50,17
+ PUSHBUTTON "Right",IDC_BUTTON_UI_RIGHT1,436,112,50,17
CONTROL "Track",IDC_CHECK_AFM_TRACK,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,369,77,29,57
LTEXT "GlassCenter X/Y(mm)",IDC_STATIC,10,105,74,8
PUSHBUTTON "Go",IDC_BUTTON_GLASSCENTER_GO_XY,196,101,27,17
@@ -494,6 +494,7 @@
CONTROL "OffSet ON",IDC_SELECT_OFFSET_ON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,418,61,63,10
PUSHBUTTON "ReviewPopUp",IDC_BT_REVIEW_POPUP,433,18,54,17
CONTROL "Use Simulation",IDC_CHECK_USE_SIMULATION,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,418,41,66,10
+ PUSHBUTTON "Align Grab",IDC_BUTTON_ALIGNCAM_GRAB,436,130,50,16
END
IDD_DLG_MODULE_INFO DIALOGEX 0, 0, 532, 187
@@ -848,11 +849,11 @@
PUSHBUTTON "SET",IDC_BUTTION_CAHNGE_TARGET_POS,207,41,50,14
PUSHBUTTON "APPLY",IDC_BUTTON_APPLT_OFFSET,262,26,60,23
GROUPBOX "결함 정보",IDC_STATIC,7,2,328,59
- GROUPBOX "적용될 OFF SET",IDC_STATIC,339,11,173,50
- EDITTEXT IDC_EDIT_OFFSET_X_VALUE,352,37,66,14,ES_AUTOHSCROLL
- EDITTEXT IDC_EDIT_OFFSET_Y_VALUE,423,37,66,14,ES_AUTOHSCROLL
- LTEXT "Xmotor Pos : ",IDC_STATIC,354,22,44,8
- LTEXT "Ymotor Pos : ",IDC_STATIC,426,22,44,8
+ GROUPBOX "적용될 OFF SET",IDC_STATIC,339,3,173,25
+ EDITTEXT IDC_EDIT_OFFSET_X_VALUE,379,11,39,14,ES_AUTOHSCROLL
+ EDITTEXT IDC_EDIT_OFFSET_Y_VALUE,450,11,39,14,ES_AUTOHSCROLL
+ LTEXT "X Pos : ",IDC_STATIC,354,13,25,8
+ LTEXT "Y Pos : ",IDC_STATIC,426,13,23,8
COMBOBOX IDC_COMBO_SELECT_MODULE,47,67,75,104,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP,WS_EX_CLIENTEDGE
LTEXT "모듈 선택 ",IDC_STATIC,13,70,34,8
GROUPBOX "Param Setting ",IDC_STATIC,518,5,233,79
@@ -866,7 +867,7 @@
EDITTEXT IDC_EDIT_SETTINGFILE_PATH,545,50,202,14,ES_AUTOHSCROLL | WS_DISABLED
LTEXT "X Pos Count",IDC_STATIC,621,32,40,8
EDITTEXT IDC_EDIT_XPOS_COUNT,662,28,40,14,ES_AUTOHSCROLL
- PUSHBUTTON "APPLY GRID DATA",IDC_BUTTON_APPLY_GRID_DATA,132,62,134,23
+ PUSHBUTTON "APPLY GRID DATA",IDC_BUTTON_APPLY_GRID_DATA,209,62,65,23
PUSHBUTTON "APPLY",IDC_BUTTON_APPLT_OFFSET_PARAM,704,14,43,23
CONTROL "",IDC_PROGRESS_PROCESS,"msctls_progress32",PBS_SMOOTH | WS_BORDER,337,67,168,14
PUSHBUTTON "SAVE",IDC_BUTTON_SAVE_SETTING_FILE,279,64,56,20
@@ -875,6 +876,14 @@
EDITTEXT IDC_EDIT_SCAN_INDEX,621,67,19,14,ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_CAM_INDEX,600,67,19,14,ES_AUTOHSCROLL
EDITTEXT IDC_EDIT_MOTOR_YPOS,694,67,54,14,ES_AUTOHSCROLL
+ PUSHBUTTON "Offset Load",IDC_OFFSET_LOAD,139,63,62,22
+ GROUPBOX "기준 값 설정",IDC_STATIC,340,31,172,33
+ LTEXT "경 알람 기준",IDC_STATIC,369,38,42,8
+ LTEXT "중 알람 기준",IDC_STATIC,431,38,42,8
+ EDITTEXT IDC_EDIT_WARN_STANDARD,368,48,38,13,ES_AUTOHSCROLL
+ EDITTEXT IDC_EDIT_HARD_STANDARD,432,48,38,13,ES_AUTOHSCROLL
+ LTEXT "um",IDC_STATIC,410,50,10,8
+ LTEXT "um",IDC_STATIC,474,49,10,8
END
IDD_DLG_REVIEW_HISTORY_TOOL DIALOGEX 0, 0, 961, 455
--
Gitblit v1.9.3