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

KEJ

2023-11-24 9020bfb6f86ff853d5d5b3cee882132a244232da

 ReviewSystem/ReviewSystem/ReviewSystem.rc

@@ -509,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
@@ -956,6 +958,49 @@
    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


/////////////////////////////////////////////////////////////////////////////
//
@@ -1339,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

@@ -1448,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


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