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/ReviewSystem.rc | 72 +++---------------------------------
1 files changed, 6 insertions(+), 66 deletions(-)
diff --git a/ReviewSystem/ReviewSystem/ReviewSystem.rc b/ReviewSystem/ReviewSystem/ReviewSystem.rc
index 0a9c0ae..767a254 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
@@ -687,69 +688,8 @@
EDITTEXT IDC_EDIT_WSI_RTB_01,123,94,40,14,ES_AUTOHSCROLL
LTEXT "WSI Standard (um)",IDC_STATIC,32,113,65,10
EDITTEXT IDC_EDIT_WSI_FIRST_STANDARD,97,112,40,15,ES_AUTOHSCROLL
- LTEXT "um",IDC_STATIC,267,33,19,12
- LTEXT "WSI Height 1",IDC_STATIC,179,34,43,8
- LTEXT "WSI Height 2",IDC_STATIC,179,48,43,8
- LTEXT "WSI Height 3",IDC_STATIC,179,62,43,8
- LTEXT "WSI Height 4",IDC_STATIC,179,76,43,8
- LTEXT "WSI Height 5",IDC_STATIC,179,90,43,8
- LTEXT "WSI Height 6",IDC_STATIC,179,104,43,8
- LTEXT "WSI Height 7",IDC_STATIC,179,117,43,8
- LTEXT "WSI Height 8",IDC_STATIC,179,132,43,8
- LTEXT "WSI Height 9",IDC_STATIC,179,145,43,8
- LTEXT "WSI Height 10",IDC_STATIC,179,158,47,8
- EDITTEXT IDC_EDIT_WSI_HEIGHT1,227,33,39,12,ES_AUTOHSCROLL
- EDITTEXT IDC_EDIT_WSI_HEIGHT2,227,47,39,12,ES_AUTOHSCROLL
- EDITTEXT IDC_EDIT_WSI_HEIGHT3,227,61,39,12,ES_AUTOHSCROLL
- EDITTEXT IDC_EDIT_WSI_HEIGHT4,226,75,39,12,ES_AUTOHSCROLL
- EDITTEXT IDC_EDIT_WSI_HEIGHT5,226,89,39,12,ES_AUTOHSCROLL
- EDITTEXT IDC_EDIT_WSI_HEIGHT6,226,103,39,12,ES_AUTOHSCROLL
- EDITTEXT IDC_EDIT_WSI_HEIGHT7,226,117,39,12,ES_AUTOHSCROLL
- EDITTEXT IDC_EDIT_WSI_HEIGHT8,226,131,39,12,ES_AUTOHSCROLL
- EDITTEXT IDC_EDIT_WSI_HEIGHT9,226,145,39,12,ES_AUTOHSCROLL
- EDITTEXT IDC_EDIT_WSI_HEIGHT10,226,158,39,12,ES_AUTOHSCROLL
- LTEXT "um",IDC_STATIC,148,121,19,12
- LTEXT "um",IDC_STATIC,267,47,19,12
- LTEXT "um",IDC_STATIC,267,61,19,12
- LTEXT "um",IDC_STATIC,267,75,19,12
- LTEXT "um",IDC_STATIC,267,89,19,12
- LTEXT "um",IDC_STATIC,267,103,19,12
- LTEXT "um",IDC_STATIC,267,117,19,12
- LTEXT "um",IDC_STATIC,267,131,19,12
- LTEXT "um",IDC_STATIC,267,145,19,12
- LTEXT "um",IDC_STATIC,267,159,19,12
- LTEXT "um",IDC_STATIC,387,33,19,12
- LTEXT "WSI Height 1",IDC_STATIC,299,34,43,8
- LTEXT "WSI Height 2",IDC_STATIC,299,48,43,8
- LTEXT "WSI Height 3",IDC_STATIC,299,62,43,8
- LTEXT "WSI Height 4",IDC_STATIC,299,76,43,8
- LTEXT "WSI Height 5",IDC_STATIC,299,90,43,8
- LTEXT "WSI Height 6",IDC_STATIC,299,104,43,8
- LTEXT "WSI Height 7",IDC_STATIC,299,117,43,8
- LTEXT "WSI Height 8",IDC_STATIC,299,132,43,8
- LTEXT "WSI Height 9",IDC_STATIC,299,145,43,8
- LTEXT "WSI Height 10",IDC_STATIC,299,158,47,8
- EDITTEXT IDC_EDIT_WSI_HEIGHT11,347,33,39,12,ES_AUTOHSCROLL
- EDITTEXT IDC_EDIT_WSI_HEIGHT12,347,47,39,12,ES_AUTOHSCROLL
- EDITTEXT IDC_EDIT_WSI_HEIGHT13,347,61,39,12,ES_AUTOHSCROLL
- EDITTEXT IDC_EDIT_WSI_HEIGHT14,346,75,39,12,ES_AUTOHSCROLL
- EDITTEXT IDC_EDIT_WSI_HEIGHT15,346,89,39,12,ES_AUTOHSCROLL
- EDITTEXT IDC_EDIT_WSI_HEIGHT16,346,103,39,12,ES_AUTOHSCROLL
- EDITTEXT IDC_EDIT_WSI_HEIGHT17,346,117,39,12,ES_AUTOHSCROLL
- EDITTEXT IDC_EDIT_WSI_HEIGHT18,346,131,39,12,ES_AUTOHSCROLL
- EDITTEXT IDC_EDIT_WSI_HEIGHT19,346,145,39,12,ES_AUTOHSCROLL
- EDITTEXT IDC_EDIT_WSI_HEIGHT20,346,158,39,12,ES_AUTOHSCROLL
- LTEXT "um",IDC_STATIC,387,47,19,12
- LTEXT "um",IDC_STATIC,387,61,19,12
- LTEXT "um",IDC_STATIC,387,75,19,12
- LTEXT "um",IDC_STATIC,387,89,19,12
- LTEXT "um",IDC_STATIC,387,103,19,12
- LTEXT "um",IDC_STATIC,387,117,19,12
- LTEXT "um",IDC_STATIC,387,131,19,12
- LTEXT "um",IDC_STATIC,387,145,19,12
- LTEXT "um",IDC_STATIC,387,159,19,12
- GROUPBOX "Left",IDC_STATIC,176,24,105,154
- GROUPBOX "Right",IDC_STATIC,296,24,105,154
+ LTEXT "um",IDC_STATIC,141,113,19,12
+ CONTROL "",IDC_LIST_WSI_DIAGNOSIS_RESULT,"SysListView32",LVS_REPORT | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,182,30,162,187
END
IDD_DLG_SELF_DIAGNOSIS_SETTING DIALOGEX 0, 0, 435, 379
--
Gitblit v1.9.3