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 |  202 +++++++++++++++++++++++++++++++-------------------
 1 files changed, 124 insertions(+), 78 deletions(-)

diff --git a/ReviewSystem/ReviewSystem/ReviewSystem.rc b/ReviewSystem/ReviewSystem/ReviewSystem.rc
index 458c5c9..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
@@ -576,42 +577,72 @@
 BEGIN
     GROUPBOX        "File History",IDC_STATIC,7,286,421,86
     LISTBOX         IDC_LIST,14,297,409,69,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Data History",IDC_STATIC,292,7,136,278
-    CONTROL         "",IDC_GRID_GANTRY_DATA_HISTORY,"MFCGridCtrl",WS_TABSTOP,297,19,126,260
-    LTEXT           "Module Index :",IDC_STATIC,21,29,48,8
-    COMBOBOX        IDC_COMBO_MODULE_INDEX,71,28,48,34,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Measure Data",IDC_STATIC,7,7,280,278
-    CONTROL         IDB_BITMAP_MARK,IDC_STATIC,"Static",SS_BITMAP,98,67,37,37
-    CONTROL         IDB_BITMAP_MARK,IDC_STATIC,"Static",SS_BITMAP,98,205,37,37
-    CONTROL         IDB_BITMAP_GANTRY,IDC_STATIC,"Static",SS_BITMAP,40,70,39,168
-    LTEXT           "Theta(θ) :",IDC_STATIC,40,242,38,8
-    EDITTEXT        IDC_EDIT_GANTRY_THETA,40,253,40,14,ES_AUTOHSCROLL
-    RTEXT           "[°]",IDC_STATIC,80,255,10,8
-    LTEXT           ": Motor",IDC_STATIC,155,174,24,8
-    EDITTEXT        IDC_EDIT_GANTRY_MOTOR_X,82,116,35,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_GANTRY_MOTOR_Y,118,116,35,14,ES_AUTOHSCROLL
-    LTEXT           ": Pixel",IDC_STATIC,155,190,24,8
-    EDITTEXT        IDC_EDIT_GANTRY_PIXEL_X,82,132,35,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_GANTRY_PIXEL_Y,118,132,35,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_GANTRY_MOTOR_X2,82,172,35,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_GANTRY_MOTOR_Y2,118,172,35,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_GANTRY_PIXEL_X2,82,188,35,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_GANTRY_PIXEL_Y2,118,188,35,14,ES_AUTOHSCROLL
-    GROUPBOX        "Measure Data",IDC_STATIC,7,7,280,278
-    CTEXT           "X",IDC_STATIC,95,106,8,8
-    CTEXT           "Y",IDC_STATIC,130,106,8,8
-    CTEXT           "X",IDC_STATIC,96,162,8,8
-    CTEXT           "Y",IDC_STATIC,131,162,8,8
-    PUSHBUTTON      "Simulation",IDC_BUTTON_SIMULATION2,224,253,50,14
-    LTEXT           ": Motor",IDC_STATIC,245,119,24,8
-    LTEXT           ": Pixel",IDC_STATIC,245,135,24,8
-    CONTROL         IDB_BITMAP_MARK,IDC_STATIC,"Static",SS_BITMAP,189,67,37,37
-    EDITTEXT        IDC_EDIT_GANTRY_MOTOR_X3,172,116,35,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_GANTRY_MOTOR_Y3,208,116,35,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_GANTRY_PIXEL_X3,172,132,35,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_GANTRY_PIXEL_Y3,208,132,35,14,ES_AUTOHSCROLL
-    CTEXT           "X",IDC_STATIC,187,106,8,8
-    CTEXT           "Y",IDC_STATIC,221,106,8,8
+    GROUPBOX        "Data History",IDC_STATIC,337,7,91,278
+    CONTROL         "",IDC_GRID_GANTRY_DATA_HISTORY,"MFCGridCtrl",WS_TABSTOP,342,19,81,260
+    COMBOBOX        IDC_COMBO_MODULE_INDEX,123,18,48,34,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "Measure Data",IDC_STATIC,7,7,326,278
+    CONTROL         IDB_BITMAP_MARK,IDC_STATIC,"Static",SS_BITMAP,25,59,37,37
+    CONTROL         IDB_BITMAP_MARK,IDC_STATIC,"Static",SS_BITMAP,25,197,37,37
+    LTEXT           "Left Module Theta(θ) :",IDC_STATIC,17,264,74,8
+    EDITTEXT        IDC_EDIT_GANTRY_THETA,92,262,40,14,ES_AUTOHSCROLL
+    RTEXT           "[°]",IDC_STATIC,135,264,10,8
+    LTEXT           ": Motor",IDC_STATIC,82,166,24,8
+    EDITTEXT        IDC_EDIT_GANTRY_MOTOR_X,9,108,35,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_GANTRY_MOTOR_Y,45,108,35,14,ES_AUTOHSCROLL
+    LTEXT           ": Pixel",IDC_STATIC,82,182,24,8
+    EDITTEXT        IDC_EDIT_GANTRY_PIXEL_X,9,124,35,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_GANTRY_PIXEL_Y,45,124,35,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_GANTRY_MOTOR_X2,9,164,35,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_GANTRY_MOTOR_Y2,45,164,35,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_GANTRY_PIXEL_X2,9,180,35,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_GANTRY_PIXEL_Y2,45,180,35,14,ES_AUTOHSCROLL
+    GROUPBOX        "Measure Data",IDC_STATIC,7,7,327,278
+    CTEXT           "X",IDC_STATIC,22,98,8,8
+    CTEXT           "Y",IDC_STATIC,57,98,8,8
+    CTEXT           "X",IDC_STATIC,23,154,8,8
+    CTEXT           "Y",IDC_STATIC,58,154,8,8
+    PUSHBUTTON      "Simulation",IDC_BUTTON_SIMULATION2,11,18,50,14
+    LTEXT           ": Motor",IDC_STATIC,156,111,24,8
+    LTEXT           ": Pixel",IDC_STATIC,156,127,24,8
+    CONTROL         IDB_BITMAP_MARK,IDC_STATIC,"Static",SS_BITMAP,100,59,37,37
+    EDITTEXT        IDC_EDIT_GANTRY_MOTOR_X3,83,108,35,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_GANTRY_MOTOR_Y3,119,108,35,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_GANTRY_PIXEL_X3,83,124,35,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_GANTRY_PIXEL_Y3,119,124,35,14,ES_AUTOHSCROLL
+    CTEXT           "X",IDC_STATIC,98,98,8,8
+    CTEXT           "Y",IDC_STATIC,132,98,8,8
+    CONTROL         IDB_BITMAP_MARK,IDC_STATIC,"Static",SS_BITMAP,199,58,37,37
+    CONTROL         IDB_BITMAP_MARK,IDC_STATIC,"Static",SS_BITMAP,199,196,37,37
+    EDITTEXT        IDC_EDIT_GANTRY_MOTOR_X4,183,107,35,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_GANTRY_MOTOR_Y4,219,107,35,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_GANTRY_PIXEL_X4,183,123,35,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_GANTRY_PIXEL_Y4,219,123,35,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_GANTRY_MOTOR_X5,183,163,35,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_GANTRY_MOTOR_Y5,219,163,35,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_GANTRY_PIXEL_X5,183,179,35,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_GANTRY_PIXEL_Y5,219,179,35,14,ES_AUTOHSCROLL
+    CTEXT           "X",IDC_STATIC,196,97,8,8
+    CTEXT           "Y",IDC_STATIC,231,97,8,8
+    CTEXT           "X",IDC_STATIC,197,153,8,8
+    CTEXT           "Y",IDC_STATIC,232,153,8,8
+    CONTROL         IDB_BITMAP_MARK,IDC_STATIC,"Static",SS_BITMAP,274,58,37,37
+    EDITTEXT        IDC_EDIT_GANTRY_MOTOR_X6,257,107,35,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_GANTRY_MOTOR_Y6,293,107,35,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_GANTRY_PIXEL_X6,257,123,35,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_GANTRY_PIXEL_Y6,293,123,35,14,ES_AUTOHSCROLL
+    CTEXT           "X",IDC_STATIC,272,97,8,8
+    CTEXT           "Y",IDC_STATIC,306,97,8,8
+    GROUPBOX        "Right Module",IDC_STATIC,180,36,153,202
+    GROUPBOX        "Left Module",IDC_STATIC,7,36,173,203
+    LTEXT           "Right Module Theta(θ) :",IDC_STATIC,186,264,78,8
+    EDITTEXT        IDC_EDIT_GANTRY_THETA2,264,262,40,14,ES_AUTOHSCROLL
+    RTEXT           "[°]",IDC_STATIC,307,264,10,8
+    LTEXT           "First Setting Standard(θ) :",IDC_STATIC,18,247,83,8
+    EDITTEXT        IDC_EDIT_SQUARENESS_FIRSTSETTING,103,245,39,13,ES_AUTOHSCROLL
+    RTEXT           "[°]",IDC_STATIC,145,247,10,8
+    LTEXT           "First Setting Standard(θ) :",IDC_STATIC,185,247,83,8
+    EDITTEXT        IDC_EDIT_SQUARENESS_FIRSTSETTING2,271,245,39,13,ES_AUTOHSCROLL
+    RTEXT           "[°]",IDC_STATIC,313,247,10,8
 END
 
 IDD_DLG_SELF_DIAGNOSIS_FLATNESS DIALOGEX 0, 0, 435, 379
@@ -645,8 +676,8 @@
     GROUPBOX        "메뉴얼 조작",IDC_STATIC,18,21,80,40
     GROUPBOX        "File History",IDC_STATIC,5,245,421,86
     LISTBOX         IDC_LIST,10,257,413,69,LBS_SORT | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Data",IDC_STATIC,11,127,409,116
-    CONTROL         "ㄱ",IDC_GRID_WSI_RESULT_DATA,"MFCGridCtrl",WS_TABSTOP,17,137,400,100
+    GROUPBOX        "Data",IDC_STATIC,172,16,248,227
+    CONTROL         "ㄱ",IDC_GRID_WSI_RESULT_DATA,"MFCGridCtrl",WS_TABSTOP,409,231,6,6
     LTEXT           "Module 0",IDC_STATIC,37,80,30,8
     LTEXT           "Module 1",IDC_STATIC,37,95,30,8
     LTEXT           "ACC",IDC_STATIC,91,66,14,8
@@ -655,6 +686,10 @@
     EDITTEXT        IDC_EDIT_WSI_RTB_00,122,77,40,14,ES_AUTOHSCROLL
     EDITTEXT        IDC_EDIT_WSI_ACC_01,76,95,40,14,ES_AUTOHSCROLL
     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,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
@@ -666,12 +701,12 @@
     LTEXT           "파일 위치 :",IDC_STATIC,18,36,31,8
     PUSHBUTTON      "Save",IDC_BUTTON_SAVE,371,351,50,14
     PUSHBUTTON      "Load",IDC_BUTTON_LOAD,320,351,50,14
-    EDITTEXT        IDC_EDIT_PANEL_COUNT_SQUARENESS,67,94,40,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_CAMERA_RESOLUTION,183,94,40,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_JUDGE_DATA_DEGREE,67,111,40,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_MODULE_COUNT,67,127,40,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_CAMERA_FRAME_WIDTH,183,111,40,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_CAMERA_FRAME_HEIGHT,183,127,40,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_PANEL_COUNT_SQUARENESS,67,81,40,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_CAMERA_RESOLUTION,183,81,40,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_JUDGE_DATA_DEGREE,67,97,40,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_MODULE_COUNT,67,113,40,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_CAMERA_FRAME_WIDTH,183,96,40,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_CAMERA_FRAME_HEIGHT,183,112,40,14,ES_AUTOHSCROLL
     EDITTEXT        IDC_EDIT_REVIEW_PANEL_POS_X,43,184,40,14,ES_AUTOHSCROLL
     EDITTEXT        IDC_EDIT_REVIEW_PANEL_POS_Y,85,184,40,14,ES_AUTOHSCROLL
     EDITTEXT        IDC_EDIT_REVIEW_PANEL_POS_X3,43,200,40,14,ES_AUTOHSCROLL
@@ -685,47 +720,47 @@
     EDITTEXT        IDC_EDIT_REVIEW_PANEL_POS_X6,151,216,40,14,ES_AUTOHSCROLL
     EDITTEXT        IDC_EDIT_REVIEW_PANEL_POS_Y6,193,216,40,14,ES_AUTOHSCROLL
     EDITTEXT        IDC_EDIT_PANEL_COUNT_WSI,330,94,40,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_JUDGE_DATA_3SIGMA,330,111,40,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_JUDGE_DATA_3SIGMA,330,113,40,14,ES_AUTOHSCROLL
     EDITTEXT        IDC_EDIT_WSI_PANEL_POS_X,294,181,40,14,ES_AUTOHSCROLL
     EDITTEXT        IDC_EDIT_WSI_PANEL_POS_Y,336,181,40,14,ES_AUTOHSCROLL
     EDITTEXT        IDC_EDIT_WSI_PANEL_POS_X2,294,197,40,14,ES_AUTOHSCROLL
     EDITTEXT        IDC_EDIT_WSI_PANEL_POS_Y2,336,197,40,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_AF_DELAY,67,268,40,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_JUDGE_DATA_Z_RANGE,67,284,40,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_GLASS_SIZE_X,183,268,40,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_GLASS_SIZE_Y,183,284,40,14,ES_AUTOHSCROLL
-    COMBOBOX        IDC_COMBO_FLANTESS_MODE,67,308,48,62,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
-    GROUPBOX        "Setting",IDC_STATIC,7,60,414,282
-    RTEXT           "Resolution :",IDC_STATIC,143,96,39,8
-    RTEXT           "Panel Count :",IDC_STATIC,23,96,43,8
-    RTEXT           "Judge Data :",IDC_STATIC,26,114,40,10
-    RTEXT           "AF Delay :",IDC_STATIC,34,273,32,8
-    RTEXT           "Judge Data :\n(Z Range)",IDC_STATIC,24,287,42,21
-    RTEXT           "Mode :",IDC_STATIC,43,309,23,8
-    RTEXT           "Range Count :",IDC_STATIC,136,309,46,8
-    RTEXT           "GlassSizeX :",IDC_STATIC,146,273,36,8
-    RTEXT           "GlassSizeY :",IDC_STATIC,145,287,37,8
+    EDITTEXT        IDC_EDIT_AF_DELAY,67,275,40,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_JUDGE_DATA_Z_RANGE,67,291,40,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_GLASS_SIZE_X,183,275,40,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_GLASS_SIZE_Y,183,291,40,14,ES_AUTOHSCROLL
+    COMBOBOX        IDC_COMBO_FLANTESS_MODE,67,315,48,62,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP
+    GROUPBOX        "Setting",IDC_STATIC,7,67,414,282
+    RTEXT           "Resolution :",IDC_STATIC,143,84,39,8
+    RTEXT           "Panel Count :",IDC_STATIC,23,83,43,8
+    RTEXT           "Judge Data :",IDC_STATIC,26,101,40,10
+    RTEXT           "AF Delay :",IDC_STATIC,34,280,32,8
+    RTEXT           "Judge Data :\n(Z Range)",IDC_STATIC,24,294,42,21
+    RTEXT           "Mode :",IDC_STATIC,43,316,23,8
+    RTEXT           "Range Count :",IDC_STATIC,136,316,46,8
+    RTEXT           "GlassSizeX :",IDC_STATIC,146,280,36,8
+    RTEXT           "GlassSizeY :",IDC_STATIC,145,294,37,8
     RTEXT           "Panel Count : ",IDC_STATIC,286,96,43,8
     RTEXT           "Judge Data :\n(3sigma)  ",IDC_STATIC,287,114,42,17
-    GROUPBOX        "직각도",IDC_STATIC,15,83,233,166
-    GROUPBOX        "평탄도",IDC_STATIC,15,253,233,80
-    EDITTEXT        IDC_EDIT_RANGE_COUNT_FLATNESS,183,308,40,14,ES_AUTOHSCROLL | WS_DISABLED
+    GROUPBOX        "직각도",IDC_STATIC,15,75,233,176
+    GROUPBOX        "평탄도",IDC_STATIC,15,252,233,80
+    EDITTEXT        IDC_EDIT_RANGE_COUNT_FLATNESS,183,315,40,14,ES_AUTOHSCROLL | WS_DISABLED
     GROUPBOX        "WSI",IDC_STATIC,254,83,164,146
-    RTEXT           "Frame Width :",IDC_STATIC,135,114,47,8
-    RTEXT           "Frame Height :",IDC_STATIC,127,131,55,8
+    RTEXT           "Frame Width :",IDC_STATIC,135,99,47,8
+    RTEXT           "Frame Height :",IDC_STATIC,127,115,55,8
     RTEXT           "[nm]",IDC_STATIC,372,114,16,8
-    RTEXT           "[um]",IDC_STATIC,226,97,16,8
+    RTEXT           "[um]",IDC_STATIC,226,81,16,8
+    RTEXT           "[px]",IDC_STATIC,226,99,14,8
     RTEXT           "[px]",IDC_STATIC,226,114,14,8
-    RTEXT           "[px]",IDC_STATIC,226,129,14,8
-    RTEXT           "[°]",IDC_STATIC,109,114,10,8
-    LTEXT           "[ms]",IDC_STATIC,109,273,15,8
-    LTEXT           "[um]",IDC_STATIC,109,287,16,8
-    LTEXT           "[ea]",IDC_STATIC,226,311,14,8
-    LTEXT           "[mm]",IDC_STATIC,226,273,18,8
-    LTEXT           "[mm]",IDC_STATIC,226,287,18,8
-    LTEXT           "[ea]",IDC_STATIC,109,97,14,8
+    RTEXT           "[°]",IDC_STATIC,109,99,10,8
+    LTEXT           "[ms]",IDC_STATIC,109,280,15,8
+    LTEXT           "[um]",IDC_STATIC,109,294,16,8
+    LTEXT           "[ea]",IDC_STATIC,226,318,14,8
+    LTEXT           "[mm]",IDC_STATIC,226,280,18,8
+    LTEXT           "[mm]",IDC_STATIC,226,294,18,8
+    LTEXT           "[ea]",IDC_STATIC,109,84,14,8
     LTEXT           "[ea]",IDC_STATIC,373,97,14,8
-    RTEXT           "ModuleCount :",IDC_STATIC,20,131,46,8
+    RTEXT           "ModuleCount :",IDC_STATIC,20,117,46,8
     CTEXT           "Module1 Panel",IDC_STATIC,62,163,46,8
     GROUPBOX        "Panel Motor Position",IDC_STATIC,22,148,218,94
     CTEXT           "1",IDC_STATIC,34,186,8,8
@@ -745,6 +780,17 @@
     CTEXT           "2",IDC_STATIC,284,200,8,8
     CTEXT           "3",IDC_STATIC,34,219,8,8
     CTEXT           "3",IDC_STATIC,141,219,8,8
+    CONTROL         "Use Skip Mode",IDC_CHECK_SELF_DIAGNOSIS_FLATNESS_SKIP,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,66,260,62,10
+    LTEXT           "Left Standard :",IDC_STATIC,17,133,49,9
+    LTEXT           "Standard :",IDC_STATIC,296,135,33,9
+    EDITTEXT        IDC_EDIT_SQUARENESS_STANDARD,67,130,40,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_EDIT_WSI_STANDARD,330,132,40,14,ES_AUTOHSCROLL
+    RTEXT           "[nm]",IDC_STATIC,372,134,16,8
+    RTEXT           "[°]",IDC_STATIC,108,133,10,8
+    LTEXT           "Right Standard :",IDC_STATIC,131,132,53,9
+    EDITTEXT        IDC_EDIT_SQUARENESS_STANDARD2,183,130,40,14,ES_AUTOHSCROLL
+    RTEXT           "[°]",IDC_STATIC,226,132,10,8
 END
 
 IDD_DLG_TAB_DEFECT_INFO DIALOGEX 0, 0, 539, 282

--
Gitblit v1.9.3