Merge branch 'feature/#4528_CF_AOI_Review_Motor_Offset_기능_추가' into develop

KEJ

2023-11-24 9020bfb6f86ff853d5d5b3cee882132a244232da

 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
@@ -508,13 +509,15 @@
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
    CONTROL         IDD_DLG_TAB_LOG,IDC_STATIC_LOGO,"Static",SS_BITMAP | NOT WS_VISIBLE,3,4,97,90
    CONTROL         IDD_DLG_TAB_LOG,IDC_STATIC_LOGO,"Static",SS_BITMAP | NOT WS_VISIBLE,3,5,97,90
    PUSHBUTTON      "Left",IDC_BUTTON_LEFT,5,68,28,14
    PUSHBUTTON      "Center",IDC_BUTTON_CENTER,39,68,27,14
    PUSHBUTTON      "Right",IDC_BUTTON_RIGHT,71,68,25,14
    CONTROL         "Reduce",IDC_CHECK_REDUCE,"Button",BS_AUTOCHECKBOX | BS_PUSHLIKE | WS_TABSTOP,28,49,49,16
    PUSHBUTTON      "OFFSET",IDC_BUTTON5,65,11,33,14
    PUSHBUTTON      "History",IDC_BUTTON6,6,11,33,14
    PUSHBUTTON      "OFFSET",IDC_BUTTON5,68,7,30,14
    PUSHBUTTON      "History",IDC_BUTTON6,6,7,29,14
    PUSHBUTTON      "H / W",IDC_BUTTON_HW_SETTING_MODE,35,7,33,14
    PUSHBUTTON      "Motor Offset",IDC_BUTTON_MOTOR_OFFSET_TOOL,6,22,64,14
END

IDD_DLG_RESULT_GRAPH DIALOGEX 0, 0, 409, 264
@@ -848,11 +851,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 +869,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 +878,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
@@ -945,6 +956,49 @@
    CONTROL         "",IDC_PICTURECTRL2,"Static",SS_BLACKFRAME | SS_REALSIZEIMAGE,380,4,113,78,WS_EX_DLGMODALFRAME | WS_EX_TRANSPARENT
    CONTROL         "Custom1",IDC_ALIGN_GRID_ALIGN_INFO,"MFCGridCtrl",WS_TABSTOP,7,38,253,43
    CONTROL         "Custom1",IDC_ALIGN_GRID_ORIGIN_INFO,"MFCGridCtrl",WS_TABSTOP,7,4,233,30
END

IDD_DLG_HARDWARE_SETTING_MODE DIALOGEX 0, 0, 309, 176
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "HardWare Setting Mode"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
    DEFPUSHBUTTON   "확인",IDOK,198,155,50,14
    PUSHBUTTON      "취소",IDCANCEL,252,155,50,14
    GROUPBOX        "ReviewCamera",IDC_STATIC_REVIEW_CAMERA,14,14,86,103
    GROUPBOX        "Connect",IDC_STATIC,19,25,76,39
    GROUPBOX        "DisConnect",IDC_STATIC,19,69,76,39
    GROUPBOX        "Align Camera",IDC_STATIC,111,14,86,103
    GROUPBOX        "Connect",IDC_STATIC,117,25,76,39
    GROUPBOX        "DisConnect",IDC_STATIC,117,69,76,39
    GROUPBOX        "AFM",IDC_STATIC,207,14,86,103
    GROUPBOX        "Connect",IDC_STATIC,213,25,76,39
    GROUPBOX        "DisConnect",IDC_STATIC,213,69,76,39
    PUSHBUTTON      "Connect",IDC_BUTTON_AFM_CONNECT,220,38,63,18
    PUSHBUTTON      "DisConnect",IDC_BUTTON_AFM_DISCONNECT,220,85,63,17
    PUSHBUTTON      "Connect",IDC_BUTTON_ALIGN_CAM_CONNECT,124,38,63,18
    PUSHBUTTON      "DisConnect",IDC_BUTTON_ALIGN_CAM_DISCONNECT,124,84,63,18
    PUSHBUTTON      "Connect",IDC_BUTTON_REVIEW_CAM_CONNECT,26,39,63,19
    PUSHBUTTON      "DisConnect",IDC_BUTTON_REVIEW_CAM_DISCONNECT,26,84,63,19
END

IDD_DLG_MOTOR_OFFSET_TOOL DIALOGEX 0, 0, 707, 420
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
    DEFPUSHBUTTON   "확인",IDOK,595,399,50,14
    PUSHBUTTON      "취소",IDCANCEL,649,399,50,14
    EDITTEXT        IDC_EDIT_MOTOR_OFFSET_COUNTX,561,21,40,14,ES_AUTOHSCROLL | ES_NUMBER
    EDITTEXT        IDC_EDIT_MOTOR_OFFSET_COUNTY,645,21,40,14,ES_AUTOHSCROLL | ES_NUMBER
    LTEXT           "X Count",IDC_STATIC,525,21,26,8
    LTEXT           "Y Count",IDC_STATIC,609,21,35,8
    LTEXT           "(0~100)",IDC_STATIC,525,28,28,8
    LTEXT           "(0~100)",IDC_STATIC,609,28,28,8
    GROUPBOX        "Param Setting",IDC_STATIC,511,7,182,35
    CONTROL         "Custom1",IDC_GRID_MOTOR_OFFSET_INFO,"MFCGridCtrl",WS_TABSTOP,7,49,686,343
    COMBOBOX        IDC_COMBO_MOTOR_OFFSET_MODULEIDX,42,21,48,77,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
    GROUPBOX        "Module",IDC_STATIC,7,7,91,35
    LTEXT           "iIndex : ",IDC_STATIC,14,23,28,8
END


@@ -1330,6 +1384,22 @@
        TOPMARGIN, 4
        BOTTOMMARGIN, 82
    END

    IDD_DLG_HARDWARE_SETTING_MODE, DIALOG
    BEGIN
        LEFTMARGIN, 7
        RIGHTMARGIN, 302
        TOPMARGIN, 7
        BOTTOMMARGIN, 169
    END

    IDD_DLG_MOTOR_OFFSET_TOOL, DIALOG
    BEGIN
        LEFTMARGIN, 7
        RIGHTMARGIN, 700
        TOPMARGIN, 7
        BOTTOMMARGIN, 413
    END
END
#endif    // APSTUDIO_INVOKED

@@ -1439,6 +1509,16 @@
    0
END

IDD_DLG_HARDWARE_SETTING_MODE AFX_DIALOG_LAYOUT
BEGIN
    0
END

IDD_DLG_MOTOR_OFFSET_TOOL AFX_DIALOG_LAYOUT
BEGIN
    0
END


/////////////////////////////////////////////////////////////////////////////
//