diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log index f02cea1..1d2b0b1 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log @@ -2978,3 +2978,133 @@ Init:Open device succeed . _start_machine Exit: Exit_SO7Usb Destruct Cso7_Proto. +Construct Cso7_Proto. +Construct Cso7_Proto. +Construct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/Utility_Config.ini b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/Utility_Config.ini index 03419fd..4089092 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/Utility_Config.ini +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/Utility_Config.ini @@ -11,11 +11,11 @@ MOVETOSPEED_FAST_Z=0.00000000 MOVETOSPEED_SLOW_Z=0.00000000 MOVETOSPEED_SCALE_Z=1.00000000 ; -SPEED_BASE_X1=20 -SPEED_MAX_X1=20 +SPEED_BASE_X1=26 +SPEED_MAX_X1=60 SPEED_START_X1=20 SPEED_FRESH_X1=8 -SPEED_SLOW_X1=3.300 +SPEED_SLOW_X1=3.000 ; SPEED_BASE_X2=16 SPEED_MAX_X2=10 @@ -24,21 +24,21 @@ SPEED_FRESH_X2=10 SPEED_SLOW_X2=2.000 ; SPEED_BASE_X3=2 -SPEED_MAX_X3=5 +SPEED_MAX_X3=0 SPEED_START_X3=8 -SPEED_FRESH_X3=100 +SPEED_FRESH_X3=10 SPEED_SLOW_X3=0.500 ; SPEED_BASE_X4=2 SPEED_MAX_X4=0 SPEED_START_X4=5 -SPEED_FRESH_X4=100 +SPEED_FRESH_X4=10 SPEED_SLOW_X4=0.100 ; SPEED_BASE_X5=2 SPEED_MAX_X5=0 SPEED_START_X5=50 -SPEED_FRESH_X5=100 +SPEED_FRESH_X5=10 SPEED_SLOW_X5=0.100 ; SPEED_BASE_Y1=20 @@ -53,22 +53,22 @@ SPEED_START_Y2=12 SPEED_FRESH_Y2=10 SPEED_SLOW_Y2=1.000 ; -SPEED_BASE_Y3=1 -SPEED_MAX_Y3=5 -SPEED_START_Y3=1 -SPEED_FRESH_Y3=100 -SPEED_SLOW_Y3=0.100 +SPEED_BASE_Y3=2 +SPEED_MAX_Y3=0 +SPEED_START_Y3=8 +SPEED_FRESH_Y3=10 +SPEED_SLOW_Y3=0.500 ; -SPEED_BASE_Y4=1 +SPEED_BASE_Y4=0 SPEED_MAX_Y4=0 -SPEED_START_Y4=6 -SPEED_FRESH_Y4=100 +SPEED_START_Y4=10 +SPEED_FRESH_Y4=10 SPEED_SLOW_Y4=0.100 ; SPEED_BASE_Y5=1 SPEED_MAX_Y5=0 SPEED_START_Y5=50 -SPEED_FRESH_Y5=100 +SPEED_FRESH_Y5=10 SPEED_SLOW_Y5=0.100 ; SPEED_BASE_Z1=20 @@ -116,11 +116,11 @@ X_SCALE_RESOLUTION=0.500 Y_SCALE_RESOLUTION=0.500 Z_SCALE_RESOLUTION=0.500 ; -X_NEG_WORKING_LIMIT=-0.000 +X_NEG_WORKING_LIMIT=0.000 Y_NEG_WORKING_LIMIT=0.000 Z_NEG_WORKING_LIMIT=0.000 ; -X_POS_WORKING_LIMIT=-0.000 +X_POS_WORKING_LIMIT=200.000 Y_POS_WORKING_LIMIT=300.000 Z_POS_WORKING_LIMIT=200.000 ; diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc index 26a9a3b..c0bdc5b 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc @@ -52,7 +52,7 @@ BEGIN EDITTEXT IDC_EDIT_COAXIAL_LIGHT4,261,83,41,12,ES_AUTOHSCROLL EDITTEXT IDC_EDIT_COAXIAL_LIGHT,261,97,41,12,ES_AUTOHSCROLL EDITTEXT IDC_EDIT_COAXIAL_LIGHT2,261,111,41,12,ES_AUTOHSCROLL - PUSHBUTTON "Motion Parameter",IDC_BUTTON_LOAD_SO7CONFIG,20,143,44,23,BS_MULTILINE + PUSHBUTTON "Motion",IDC_BUTTON_MOTION_PARAMETER,20,143,44,27,BS_MULTILINE PUSHBUTTON "V+",IDC_BUTTON_SO7_MOVE_ZOOM_IN,77,159,25,12 PUSHBUTTON "V-",IDC_BUTTON_SO7_MOVE_ZOOM_OUT,77,180,25,12 PUSHBUTTON "Z+",IDC_BUTTON_SO7_MOVE_Z_UP,101,140,25,12 @@ -65,10 +65,9 @@ BEGIN PUSHBUTTON "Home Manual",IDC_BUTTON_MANUAL_HOME,277,135,76,14 PUSHBUTTON "Home DCC",IDC_BUTTON_RESET_WORKTABLE,277,192,40,14 PUSHBUTTON "Home Worktable Right",IDC_BUTTON_RESET_WORKTABLE_RIGHT,277,173,76,14 - PUSHBUTTON "Move\n To",IDC_BUTTON_MOVE_TO,359,142,32,27,BS_MULTILINE - PUSHBUTTON "Auto Zoom",IDC_BUTTON_AUTO_ZOOM,359,177,32,27,BS_MULTILINE + PUSHBUTTON "Auto Zoom",IDC_BUTTON_AUTO_ZOOM,360,156,32,27,BS_MULTILINE PUSHBUTTON "Set Reset Flag",IDC_BUTTON_SET_RESET_FLAG,133,108,61,14 - PUSHBUTTON "Set outport",IDC_BUTTON_GET_LASER,181,240,61,14 + PUSHBUTTON "Set outport",IDC_BUTTON_SET_OUT_PORT,181,240,61,14 PUSHBUTTON "Home V",IDC_BUTTON_RESET_V,100,240,61,14 EDITTEXT IDC_EDIT_X_SCALE_COEFFICIENT,62,284,39,12,ES_CENTER | ES_AUTOHSCROLL EDITTEXT IDC_EDIT_Y_SCALE_COEFFICIENT,121,284,39,12,ES_CENTER | ES_AUTOHSCROLL @@ -77,17 +76,12 @@ BEGIN GROUPBOX "USB Control",IDC_STATIC,15,12,89,115 GROUPBOX "Config",IDC_STATIC,13,129,55,83 GROUPBOX "Get_Data",IDC_STATIC,114,13,98,115 - PUSHBUTTON "当前探头：激光",IDC_BUTTON_PROBE_ONOFF,30,459,48,20,BS_MULTILINE | NOT WS_VISIBLE - PUSHBUTTON "当前状态：夹具开",IDC_BUTTON_FIXTURE_ONOFF,40,459,48,20,BS_MULTILINE | NOT WS_VISIBLE - PUSHBUTTON "当前状态：夹具上",IDC_BUTTON_FIXTURE_UPDOWN,47,459,48,20,BS_MULTILINE | NOT WS_VISIBLE GROUPBOX "Ver NO.",IDC_STATIC,252,303,145,29 LTEXT "Set Ver NO.",IDC_STATIC,272,316,39,8 GROUPBOX "R/W Data",IDC_STATIC,253,334,144,65 CONTROL "X",IDC_RADIO_SELECT_X,"Button",BS_AUTORADIOBUTTON,261,348,20,10 CONTROL "Y",IDC_RADIO_SELECT_Y,"Button",BS_AUTORADIOBUTTON,261,364,20,10 CONTROL "Z",IDC_RADIO_SELECT_Z,"Button",BS_AUTORADIOBUTTON,261,380,20,10 - PUSHBUTTON "Set Section",IDC_BUTTON_SET_SECTION,44,458,46,21,BS_MULTILINE | NOT WS_VISIBLE - PUSHBUTTON "Correction Scale",IDC_BUTTON_CORRECTION_SCALE,20,458,46,21,BS_MULTILINE | NOT WS_VISIBLE GROUPBOX "Light Control",IDC_STATIC,226,14,85,113 LTEXT "Top",IDC_STATIC,236,28,18,11 LTEXT "Bottom",IDC_STATIC,234,43,22,11 @@ -128,7 +122,7 @@ BEGIN CTEXT "Z",IDC_STATIC,195,273,8,8 CTEXT "Scale Resolution",IDC_STATIC,20,280,35,20 GROUPBOX "Set Gear",IDC_STATIC,208,132,56,81 - PUSHBUTTON "so7_config",IDC_BUTTON_SETUP_SO7CONFIG,20,184,44,23 + PUSHBUTTON "so7_config",IDC_BUTTON_SETUP_SO7CONFIG,20,179,44,27 LTEXT "1",IDC_STATIC,337,27,8,8 LTEXT "2",IDC_STATIC,337,43,8,8 LTEXT "3",IDC_STATIC,337,59,8,8 @@ -143,12 +137,10 @@ BEGIN CONTROL "",IDC_MFCBUTTON_STATUS_IN_PORT4,"MfcButton",WS_TABSTOP,353,72,21,14 CONTROL "",IDC_MFCBUTTON_STATUS_IN_PORT5,"MfcButton",WS_TABSTOP,353,88,21,14 CONTROL "",IDC_MFCBUTTON_STATUS_IN_PORT6,"MfcButton",WS_TABSTOP,353,104,21,14 - EDITTEXT IDC_EDIT_SO7_READ_IO_STATUS_ADDRESS,79,465,40,14,ES_AUTOHSCROLL | NOT WS_VISIBLE - LTEXT "Addr",IDC_STATIC,120,459,16,8,NOT WS_VISIBLE PUSHBUTTON "Test Z Signal",IDC_BUTTON_SO7_TEST_Z_SIGNAL,26,240,61,14 PUSHBUTTON "CNC Program",IDC_BUTTON_SO7_CNC_PROGRAM,297,273,52,19 GROUPBOX "CNC",IDC_STATIC,252,265,143,34 - CONTROL "ON",IDC_CHECK_SO7_TURN_ON_FFF_LASER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,220,225,26,10 + CONTROL "ON",IDC_CHECK_SO7_OUT_PORT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,220,225,26,10 EDITTEXT IDC_EDIT_RWDATA_DATA,307,371,44,13,ES_AUTOHSCROLL PUSHBUTTON "Write",IDC_BUTTON_SO7_SENDDATATOFPGA,360,344,34,19 PUSHBUTTON "Read",IDC_BUTTON_SO7_READDATAFROMFPGA,360,369,34,19 @@ -167,7 +159,7 @@ END IDD_S07_UTIL_SEND_PARAMETER DIALOGEX 0, 0, 753, 481 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Send Parameter" +CAPTION "Set Parameter" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN GROUPBOX "坐标轴",IDC_STATIC,379,399,50,56 @@ -269,12 +261,12 @@ BEGIN PUSHBUTTON "Save To Controller",IDC_BUTTON_SAVE_PARAMETER,46,413,50,24,BS_MULTILINE PUSHBUTTON "Read From Controller",IDC_BUTTON_READ_PARAMETER_FROM_CONTROLLER,120,413,50,24,BS_MULTILINE PUSHBUTTON "Save...",IDC_BUTTON_SAVE,194,413,50,24 - PUSHBUTTON "Exit",IDCANCEL,696,449,50,14 + PUSHBUTTON "Exit",IDCANCEL,699,449,50,14,NOT WS_VISIBLE LTEXT "Z=",IDC_STATIC,229,387,10,8 LTEXT "Y=",IDC_STATIC,90,302,10,8 - EDITTEXT IDC_EDIT_INPUT_FILE,58,12,186,14,ES_AUTOHSCROLL - LTEXT "Input_File",IDC_STATIC,18,15,33,8 - PUSHBUTTON "Browse...",IDC_BUTTON_BROWSE,252,12,36,14 + EDITTEXT IDC_EDIT_INPUT_FILE,58,12,181,14,ES_AUTOHSCROLL + LTEXT "Input File",IDC_STATIC,11,15,42,8 + PUSHBUTTON "Browse...",IDC_BUTTON_BROWSE,246,12,44,14 GROUPBOX "速度参数",IDC_STATIC,17,29,273,254 LTEXT "X-1",IDC_STATIC,27,63,12,8 LTEXT "X-2",IDC_STATIC,27,78,12,8 @@ -318,7 +310,7 @@ BEGIN LTEXT "相对距离",IDC_STATIC,436,407,33,8 LTEXT "采样时间",IDC_STATIC,529,407,33,8 PUSHBUTTON "Stop",IDC_BUTTON_STOP_SAMPLE_SCURVE,627,425,50,14 - CONTROL "运动曲线图",IDC_CUSTOM_CANVAS,"CDrawGraph",WS_TABSTOP,309,29,423,349 + CONTROL "运动曲线图",IDC_CUSTOM_CANVAS,"CDrawGraph",WS_TABSTOP,308,29,431,349 EDITTEXT IDC_EDIT_SET_PARAMETER_MSGOUTPUT,440,428,165,25,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL LTEXT "mm",IDC_STATIC,506,406,12,8 LTEXT "s",IDC_STATIC,597,406,8,8 @@ -395,10 +387,10 @@ BEGIN CONTROL "控制器（RS232）",IDC_RADIO__SO7_RS232,"Button",BS_AUTORADIOBUTTON,175,57,77,10 CONTROL "LK_G激光",IDC_RADIO_KEYENCE_LASER,"Button",BS_AUTORADIOBUTTON,175,75,76,10 CONTROL "LK_H激光",IDC_RADIO_KEYENCE_LASER_LK_H,"Button",BS_AUTORADIOBUTTON,175,93,76,10 - CONTROL "LJ_G激光",IDC_RADIO_KEYENCE_LASER3,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,175,111,76,10 + CONTROL "LJ_G激光",IDC_RADIO_KEYENCE_LASER3,"Button",BS_AUTORADIOBUTTON,175,111,76,10 CONTROL "Verifcation algorithm",IDC_RADIO_SO7_VERIFICATION_ALGORITHM, "Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,48,138,81,10 - CONTROL "Image.dll",IDC_RADIO_TEST_IMAGE_DLL,"Button",BS_AUTORADIOBUTTON,175,124,45,10 + CONTROL "Image.dll",IDC_RADIO_TEST_IMAGE_DLL,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,175,124,45,10 DEFPUSHBUTTON "OK",IDOK,181,145,50,14 PUSHBUTTON "Cancel",IDCANCEL,241,145,50,14 GROUPBOX "测试选项",IDC_STATIC,29,15,243,120 @@ -491,22 +483,22 @@ END IDD_SO7_UTIL_MOVE_LOCATION DIALOGEX 0, 0, 511, 354 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Move To Location(SO7)" +CAPTION "Move To Location" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN CONTROL "System",IDC_RADIO_SPEED_SYSTEM,"Button",BS_AUTORADIOBUTTON | WS_GROUP,179,20,39,10 CONTROL "Fast",IDC_RADIO_SPEED_FAST,"Button",BS_AUTORADIOBUTTON,179,31,30,10 CONTROL "Slow",IDC_RADIO_SPEED_SLOW,"Button",BS_AUTORADIOBUTTON,179,42,31,10 EDITTEXT IDC_EDIT_MOVE_TO_X,41,78,53,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_MOVE_TO_Y,41,99,53,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_MOVE_TO_Z,41,120,53,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_MOVE_TO_ZM,39,141,53,12,ES_AUTOHSCROLL - CONTROL "Reverse",IDC_CHECK_REVERSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,119,79,43,10 - PUSHBUTTON "Move To XYZ",ID_OK_START,102,108,71,13,BS_MULTILINE - PUSHBUTTON "Move To Zoom",IDC_BUTTON_MOVE_TO_ZOOM,100,140,71,13 - PUSHBUTTON "Move To XYZ(JM)",IDC_BUTTON_MOVE_TO_XYZ_JM,180,78,71,13 - PUSHBUTTON "Move To XYZ(Laser)",IDC_BUTTON_MOVE_TO_XYZ_LASER,180,108,71,13 - PUSHBUTTON "Move To XYZV",IDC_BUTTON_MOVE_TO_XYZV,180,140,71,13 + EDITTEXT IDC_EDIT_MOVE_TO_Y,41,101,53,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_MOVE_TO_Z,41,124,53,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_MOVE_TO_ZM,41,147,53,12,ES_AUTOHSCROLL + CONTROL "Reverse",IDC_CHECK_REVERSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,91,43,10 + PUSHBUTTON "Move To XYZ",IDC_BUTTON_MOVE_TO_XYZ,103,107,71,24,BS_MULTILINE + PUSHBUTTON "Move To Zoom",IDC_BUTTON_MOVE_TO_ZOOM,103,136,71,24 + PUSHBUTTON "Move To XYZ(JM)",IDC_BUTTON_MOVE_TO_XYZ_JM,180,78,71,24,BS_MULTILINE + PUSHBUTTON "Move To XYZ (Laser)",IDC_BUTTON_MOVE_TO_XYZ_LASER,180,107,70,24,BS_MULTILINE + PUSHBUTTON "Move To XYZV",IDC_BUTTON_MOVE_TO_XYZV,180,136,71,24 EDITTEXT IDC_EDIT_REPETEST_DIS,366,78,57,12,ES_AUTOHSCROLL EDITTEXT IDC_EDIT_REPETEST_TIMES,366,102,57,12,ES_AUTOHSCROLL EDITTEXT IDC_EDIT_REPETEST_INTERVAL,366,126,45,12,ES_RIGHT | ES_AUTOHSCROLL @@ -521,11 +513,11 @@ BEGIN CONTROL "Relative",IDC_RADIO_MOVE_RELATIVE,"Button",BS_AUTORADIOBUTTON | WS_GROUP,107,22,42,10 CONTROL "Absolute",IDC_RADIO_MOVE_ABSOLUTE,"Button",BS_AUTORADIOBUTTON,107,38,44,10 GROUPBOX "Move Speed",IDC_STATIC,168,9,330,46 - PUSHBUTTON "EXIT",IDCANCEL,454,333,50,14 + PUSHBUTTON "EXIT",IDCANCEL,454,333,50,14,NOT WS_VISIBLE LTEXT "x",IDC_STATIC,29,78,8,8 - LTEXT "y",IDC_STATIC,29,99,8,8 - LTEXT "z",IDC_STATIC,29,120,8,8 - LTEXT "zm",IDC_STATIC,25,141,8,8 + LTEXT "y",IDC_STATIC,29,101,8,8 + LTEXT "z",IDC_STATIC,29,124,8,8 + LTEXT "zm",IDC_STATIC,25,147,8,8 LTEXT "x",IDC_STATIC,39,188,8,11 LTEXT "y",IDC_STATIC,131,188,8,11 LTEXT "z",IDC_STATIC,221,188,8,11 @@ -561,8 +553,10 @@ BEGIN LTEXT "mm/s",IDC_STATIC,283,29,18,8 LTEXT "mm/s",IDC_STATIC,375,29,18,8 LTEXT "mm/s",IDC_STATIC,462,28,18,8 - PUSHBUTTON "Clear All",IDC_BUTTON_SO7_MOVETO_CLEAR_ALL_LOG,452,266,50,14 - CONTROL "ErrPos",IDC_CHECK_SO7_MOVETO_FPGADATA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,459,186,34,10 + PUSHBUTTON "Clear All",IDC_BUTTON_SO7_MOVETO_CLEAR_ALL_LOG,452,266,50,21 + CONTROL "ErrPos",IDC_CHECK_SO7_MOVETO_FPGADATA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,459,187,34,10 + CONTROL "Auto Set Zero ",IDC_CHECK_SO7_MOTION_AUTO_SET_ZERO, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,75,59,10 END IDD_SO7_UTIL_IMAGE_DLL DIALOGEX 0, 0, 377, 184 @@ -862,7 +856,7 @@ BEGIN IDD_S07_UTIL_SEND_PARAMETER, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 746 + RIGHTMARGIN, 749 TOPMARGIN, 7 BOTTOMMARGIN, 463 END diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Move_Location.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Move_Location.cpp index 7cf53e9..e714635 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Move_Location.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Move_Location.cpp @@ -1,7 +1,7 @@ // SO7_Move_Location.cpp : 实现文件 // #include "stdafx.h" -#include "afxdialogex.h" +#include "afxpropertysheet.h" #include "resource.h" #include "..\..\..\SevenOcean\SO7_Proto.h" #include "..\..\..\SevenOcean\CMMIO_SERIAL.H" @@ -23,10 +23,9 @@ bool bFlag(false); //===================================================== -IMPLEMENT_DYNAMIC(CSO7_Move_Location, CDialog) +IMPLEMENT_DYNAMIC(CSO7_Move_Location, CMFCPropertyPage) - CSO7_Move_Location::CSO7_Move_Location(CWnd* pParent /*=NULL*/) - : CDialog(CSO7_Move_Location::IDD, pParent) + CSO7_Move_Location::CSO7_Move_Location(): CMFCPropertyPage(CSO7_Move_Location::IDD) { m_bOutputTime=FALSE; } @@ -37,7 +36,7 @@ CSO7_Move_Location::~CSO7_Move_Location() void CSO7_Move_Location::DoDataExchange(CDataExchange* pDX) { - CDialog::DoDataExchange(pDX); + CMFCPropertyPage::DoDataExchange(pDX); DDX_Text(pDX, IDC_EDIT_MOVE_TO_X, m_Move_to_X); DDX_Text(pDX, IDC_EDIT_MOVE_TO_Y, m_Move_to_Y); DDX_Text(pDX, IDC_EDIT_MOVE_TO_Z, m_Move_to_Z); @@ -52,10 +51,10 @@ void CSO7_Move_Location::DoDataExchange(CDataExchange* pDX) } -BEGIN_MESSAGE_MAP(CSO7_Move_Location, CDialog) +BEGIN_MESSAGE_MAP(CSO7_Move_Location, CMFCPropertyPage) ON_WM_TIMER() ON_BN_CLICKED(IDCANCEL, &CSO7_Move_Location::OnBnClickedCancel) - ON_BN_CLICKED(ID_OK_START, &CSO7_Move_Location::OnBnClickedOkStart) + ON_BN_CLICKED(IDC_BUTTON_MOVE_TO_XYZ, &CSO7_Move_Location::OnBnClickedButtonMoveToXyz) ON_BN_CLICKED(IDC_BUTTON_MOVE_TO_ZOOM, &CSO7_Move_Location::OnBnClickedButtonMoveToZoom) ON_BN_CLICKED(IDC_BUTTON_MOVE_TO_XYZ_LASER, &CSO7_Move_Location::OnBnClickedButtonMoveToXyzLaser) ON_BN_CLICKED(IDC_BUTTON_MOVE_TO_XYZ_JM, &CSO7_Move_Location::OnBnClickedButtonMoveToXyzJm) @@ -149,11 +148,32 @@ BOOL CSO7_Move_Location::OnInitDialog() m_RepeTest_ErrRange=_T("0"); bRepeTestDone=false; UpdateData(FALSE); - SetTimer(1,150,0); - //SetTimer(4,20,NULL); return TRUE; } //========================================================================================= +BOOL CSO7_Move_Location::OnSetActive() +{ + bRepeTestDone=false; + bFlag=false; + bRepeTestDone=true; + m_OutMessageX=_T(""); + m_OutMessageY=_T(""); + m_OutMessageZ=_T(""); + m_OutMessageV=_T(""); + ((CButton*)GetDlgItem(IDC_BUTTON_BEGIN_REPE_TEST))->SetWindowTextW(_T("Begin")); + SetTimer(1,150,0); + return CPropertyPage::OnSetActive(); +} +//========================================================================================= +BOOL CSO7_Move_Location::OnKillActive() +{ + KillTimer(1); + KillTimer(2); + KillTimer(4); + KillTimer(5); + return CPropertyPage::OnKillActive(); +} +//========================================================================================= void CSO7_Move_Location::OnBnClickedCancel() { KillTimer(1); @@ -163,12 +183,15 @@ void CSO7_Move_Location::OnBnClickedCancel() Sleep(20); - CDialog::OnCancel(); + CMFCPropertyPage::OnCancel(); } //========================================================================================= void CSO7_Move_Location::OnBnClickedButtonMoveToZoom() { - + if (((CButton *)GetDlgItem(IDC_CHECK_SO7_MOTION_AUTO_SET_ZERO))->GetCheck()) + { + OnBnClickedButtonZeroSet(); + } UpdateData(TRUE); USES_CONVERSION; const char* cMove_to_ZM=T2A(m_Move_to_ZM); @@ -201,8 +224,12 @@ void CSO7_Move_Location::OnBnClickedButtonMoveToZoom() m_pSO7_Proto->_send_cmd_SO7_CMD_MOVE_TO_POS_ZM(); } //========================================================================================= -void CSO7_Move_Location::OnBnClickedOkStart() +void CSO7_Move_Location::OnBnClickedButtonMoveToXyz() { + if (((CButton *)GetDlgItem(IDC_CHECK_SO7_MOTION_AUTO_SET_ZERO))->GetCheck()) + { + OnBnClickedButtonZeroSet(); + } UpdateData(TRUE); USES_CONVERSION; @@ -275,6 +302,10 @@ void CSO7_Move_Location::OnBnClickedOkStart() //========================================================================================= void CSO7_Move_Location::OnBnClickedButtonMoveToXyzLaser() { + if (((CButton *)GetDlgItem(IDC_CHECK_SO7_MOTION_AUTO_SET_ZERO))->GetCheck()) + { + OnBnClickedButtonZeroSet(); + } UpdateData(TRUE); USES_CONVERSION; @@ -347,6 +378,10 @@ void CSO7_Move_Location::OnBnClickedButtonMoveToXyzLaser() //========================================================================================= void CSO7_Move_Location::OnBnClickedButtonMoveToXyzJm() { + if (((CButton *)GetDlgItem(IDC_CHECK_SO7_MOTION_AUTO_SET_ZERO))->GetCheck()) + { + OnBnClickedButtonZeroSet(); + } UpdateData(TRUE); USES_CONVERSION; @@ -419,6 +454,10 @@ void CSO7_Move_Location::OnBnClickedButtonMoveToXyzJm() //========================================================================================= void CSO7_Move_Location::OnBnClickedButtonMoveToXyzv() { + if (((CButton *)GetDlgItem(IDC_CHECK_SO7_MOTION_AUTO_SET_ZERO))->GetCheck()) + { + OnBnClickedButtonZeroSet(); + } UpdateData(TRUE); USES_CONVERSION; @@ -504,7 +543,6 @@ void CSO7_Move_Location::OnBnClickedButtonMoveToXyzv() //========================================================================================= void CSO7_Move_Location::OnBnClickedButtonZeroSet() { - m_pSO7_Proto->_send_cmd_SO7_CMD_READ_AXIS_XYZ(); m_pSO7_Proto->g_machine.x._lSet_Zero_Pos =m_pSO7_Proto->g_machine.x._scale_pos._long_; @@ -522,14 +560,11 @@ void CSO7_Move_Location::OnBnClickedButtonZeroSet() m_pSO7_Proto->_send_cmd_SO7_CMD_READ_V_DATA(); m_pSO7_Proto->g_machine.zm._lSet_Zero_Pos=m_pSO7_Proto->g_machine.zm._scale_pos._long_; } - - //===================================================================================== void CSO7_Move_Location::OnBnClickedRadioScale() { SetDlgItemText(IDC_STATIC_DEADBAND_UNITS,_T("pulse")); } - //===================================================================================== void CSO7_Move_Location::OnBnClickedRadioMm() { @@ -753,7 +788,6 @@ void CSO7_Move_Location::OnBnClickedCheckRepetestAbsolute() //========================================================================================= void CSO7_Move_Location::OnBnClickedButtonBeginRepeTest() { - if (bFlag) { m_pSO7_Proto->_send_cmd_SO7_CMD_STOP_MOVE_XYZ(); @@ -2314,7 +2348,9 @@ void CSO7_Move_Location::OnTimer(UINT_PTR nIDEvent) { if (m_pSO7_Proto->g_machine.s_status._machine_running) { - if (((CButton *)GetDlgItem(IDC_RADIO_SCALE))->GetCheck()) + m_pSO7_Proto->_send_cmd_SO7_CMD_READ_AXIS_XYZ(); + m_pSO7_Proto->_send_cmd_SO7_CMD_READ_V_DATA(); + if (((CButton *)GetDlgItem(IDC_RADIO_SCALE))->GetCheck()) { m_X_Position.Format(_T("%8ld"),(m_pSO7_Proto->g_machine.x._scale_pos._long_-m_pSO7_Proto->g_machine.x._lSet_Zero_Pos)); GetDlgItem(IDC_EDIT_X_AXIS)->SetWindowText(m_X_Position); @@ -2326,7 +2362,6 @@ void CSO7_Move_Location::OnTimer(UINT_PTR nIDEvent) m_Zm_Position.Format(_T("%8ld"),(m_pSO7_Proto->g_machine.zm._scale_pos._long_ - m_pSO7_Proto->g_machine.zm._lSet_Zero_Pos)); GetDlgItem(IDC_EDIT_ZM_AXIS)->SetWindowText(m_Zm_Position); } - else if(((CButton *)GetDlgItem(IDC_RADIO_INCH))->GetCheck()) { m_X_Position.Format(_T("%8.4lf"), (m_pSO7_Proto->g_machine.x._d_cur_pos_-m_pSO7_Proto->g_machine.x._dSet_Zero_Pos)/25.4); @@ -2535,7 +2570,7 @@ void CSO7_Move_Location::OnTimer(UINT_PTR nIDEvent) break; } } - CDialog::OnTimer(nIDEvent); + CMFCPropertyPage::OnTimer(nIDEvent); } //===================================================================================== diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Move_Location.h b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Move_Location.h index b205d30..94054ba 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Move_Location.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Move_Location.h @@ -2,13 +2,13 @@ // CSO7_Move_Location 对话框 -class CSO7_Move_Location : public CDialog +class CSO7_Move_Location : public CMFCPropertyPage { DECLARE_DYNAMIC(CSO7_Move_Location) public: - CSO7_Move_Location(CWnd* pParent = NULL); // 标准构造函数 - virtual ~CSO7_Move_Location(); + CSO7_Move_Location(); + ~CSO7_Move_Location(); // 对话框数据 enum { IDD = IDD_SO7_UTIL_MOVE_LOCATION }; @@ -16,7 +16,9 @@ public: protected: virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 支持 virtual BOOL OnInitDialog(); - DECLARE_MESSAGE_MAP() + virtual BOOL OnSetActive(); + virtual BOOL OnKillActive(); + DECLARE_MESSAGE_MAP() public: double m_move_to_x; double m_move_to_y; @@ -75,7 +77,7 @@ public: CString m_OutputTime; void OutputWithScroll(const CString &strNewText,CEdit &edtOutput); afx_msg void OnBnClickedCancel(); - afx_msg void OnBnClickedOkStart(); + afx_msg void OnBnClickedButtonMoveToXyz(); afx_msg void OnTimer(UINT_PTR nIDEvent); afx_msg void OnBnClickedButtonMoveToZoom(); afx_msg void OnBnClickedButtonMoveToXyzLaser(); diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Send_Parameter.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Send_Parameter.cpp index 223e022..ef900d1 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Send_Parameter.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Send_Parameter.cpp @@ -2,7 +2,7 @@ // #include "stdafx.h" #include -#include "afxdialogex.h" +#include "afxpropertysheet.h" #include "resource.h" #include "..\..\..\SevenOcean\EF8000_Interface.h" #include "..\..\..\SevenOcean\SO7_Proto.h" @@ -18,10 +18,9 @@ extern CEF8000_Interface* m_pEF8000_Interface; // CSO7_Send_Parameter dialog -IMPLEMENT_DYNAMIC(CSO7_Send_Parameter, CDialog) +IMPLEMENT_DYNAMIC(CSO7_Send_Parameter, CMFCPropertyPage) - CSO7_Send_Parameter::CSO7_Send_Parameter(CWnd* pParent /*=NULL*/) - : CDialog(CSO7_Send_Parameter::IDD, pParent) + CSO7_Send_Parameter::CSO7_Send_Parameter():CMFCPropertyPage(CSO7_Send_Parameter::IDD) { m_dbStartX=0.0; m_dbEndX=10; @@ -52,7 +51,7 @@ CSO7_Send_Parameter::~CSO7_Send_Parameter() //================================================================ void CSO7_Send_Parameter::DoDataExchange(CDataExchange* pDX) { - CDialog::DoDataExchange(pDX); + CMFCPropertyPage::DoDataExchange(pDX); DDX_Text(pDX, IDC_EDIT_BASESPEED_X1, m_csBaseSpeedX[0]); DDX_Text(pDX, IDC_EDIT_MAXSPEED_X1, m_csMaxSpeedX[0]); @@ -156,7 +155,7 @@ void CSO7_Send_Parameter::DoDataExchange(CDataExchange* pDX) //================================================================ -BEGIN_MESSAGE_MAP(CSO7_Send_Parameter, CDialog) +BEGIN_MESSAGE_MAP(CSO7_Send_Parameter, CMFCPropertyPage) ON_WM_TIMER() ON_WM_PAINT() ON_WM_ERASEBKGND() @@ -176,7 +175,7 @@ END_MESSAGE_MAP() // CSO7_Send_Parameter message handlers BOOL CSO7_Send_Parameter::OnInitDialog() { - CDialog::OnInitDialog(); + CMFCPropertyPage::OnInitDialog(); // Add "About..." menu item to system menu. @@ -235,13 +234,24 @@ BOOL CSO7_Send_Parameter::OnInitDialog() return TRUE; // return TRUE unless you set the focus to a control } - +//========================================================================================= +BOOL CSO7_Send_Parameter::OnSetActive() +{ + ((CButton*)GetDlgItem(IDC_BUTTON_START_SAMPLE_SCURVE))->EnableWindow(TRUE); + return CPropertyPage::OnSetActive(); +} +//========================================================================================= +BOOL CSO7_Send_Parameter::OnKillActive() +{ + KillTimer(1); + return CPropertyPage::OnKillActive(); +} //================================================================ void CSO7_Send_Parameter::OnPaint() { CPaintDC dc(this); // device context for painting OnDraw(&dc); - CDialog::OnPaint(); + CMFCPropertyPage::OnPaint(); } //================================================================ @@ -258,14 +268,14 @@ BOOL CSO7_Send_Parameter::OnEraseBkgnd(CDC* pDC) { //UNREFERENCED_PARAMETER(pDC); //return TRUE; - return CDialog::OnEraseBkgnd(pDC); + return CMFCPropertyPage::OnEraseBkgnd(pDC); } //================================================================ void CSO7_Send_Parameter::OnBnClickedOk() { KillTimer(1); - CDialog::OnOK(); + CMFCPropertyPage::OnOK(); } #pragma region Send_Parameter @@ -976,7 +986,7 @@ void CSO7_Send_Parameter::OnTimer(UINT_PTR nIDEvent) } } - CDialog::OnTimer(nIDEvent); + CMFCPropertyPage::OnTimer(nIDEvent); } //#pragma endregion @@ -1007,5 +1017,5 @@ void CSO7_Send_Parameter::OnBnClickedCancel() CString csPath; m_pSO7_Proto->GetAppPath(csPath); m_pSO7_Proto->Save_SevenOcean_Inifile(csPath+_T("\\Utility_Config.ini")); - CDialog::OnCancel(); + CMFCPropertyPage::OnCancel(); } diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Send_Parameter.h b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Send_Parameter.h index 5dd5b34..9f14b08 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Send_Parameter.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Send_Parameter.h @@ -5,13 +5,13 @@ // CSO7_Send_Parameter dialog -class CSO7_Send_Parameter : public CDialog +class CSO7_Send_Parameter : public CMFCPropertyPage { DECLARE_DYNAMIC(CSO7_Send_Parameter) public: - CSO7_Send_Parameter(CWnd* pParent = NULL); // standard constructor - virtual ~CSO7_Send_Parameter(); + CSO7_Send_Parameter(); + ~CSO7_Send_Parameter(); // Dialog Data enum { IDD = IDD_S07_UTIL_SEND_PARAMETER }; @@ -19,6 +19,8 @@ public: protected: virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support virtual BOOL OnInitDialog(); + virtual BOOL OnSetActive(); + virtual BOOL OnKillActive(); afx_msg void OnTimer(UINT_PTR nIDEvent); afx_msg void OnPaint(); void OnDraw(CDC* pDC); diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.cpp index 559cd03..11aca73 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.cpp @@ -15,6 +15,7 @@ #include "MyListCtrl.h" #include "MyMFCButton.h" #include "So7_Util_Program.h" +#include "So7_Motion_Pages.h" #include "SO7_UtilDlg.h" // CSO7_UtilDlg 对话框 @@ -98,7 +99,6 @@ BEGIN_MESSAGE_MAP(CSO7_UtilDlg, CDialog) ON_BN_CLICKED(IDCANCEL, &CSO7_UtilDlg::OnBnClickedCancel) ON_BN_CLICKED(IDC_BUTTON_STOP_SO7MACHINE, &CSO7_UtilDlg::OnBnClickedButtonStopSo7machine) ON_BN_CLICKED(IDC_BUTTON_SO7_RESET_XYZ, &CSO7_UtilDlg::OnBnClickedButtonSo7ResetXyz) - ON_BN_CLICKED(IDC_BUTTON_MOVE_TO, &CSO7_UtilDlg::OnBnClickedButtonMoveTo) ON_BN_CLICKED(IDC_BUTTON_SO7_READ_AXIS_XYZ, &CSO7_UtilDlg::OnBnClickedButtonSo7ReadAxisXyz) ON_BN_CLICKED(IDC_RADIO_SPEED_GEAR1, &CSO7_UtilDlg::OnBnClickedRadioSpeedGear1) ON_BN_CLICKED(IDC_RADIO_SPEED_GEAR2, &CSO7_UtilDlg::OnBnClickedRadioSpeedGear2) @@ -118,31 +118,25 @@ BEGIN_MESSAGE_MAP(CSO7_UtilDlg, CDialog) ON_BN_CLICKED(IDC_BUTTON_RESET_V, &CSO7_UtilDlg::OnBnClickedButtonResetV) ON_BN_CLICKED(IDC_BUTTON_GET_FIXTURE_FLAG, &CSO7_UtilDlg::OnBnClickedButtonGetFixtureFlag) ON_BN_CLICKED(IDC_BUTTON_SET_RESET_FLAG, &CSO7_UtilDlg::OnBnClickedButtonSetResetFlag) - ON_BN_CLICKED(IDC_BUTTON_PROBE_ONOFF, &CSO7_UtilDlg::OnBnClickedButtonProbeOnoff) ON_EN_KILLFOCUS(IDC_EDIT_SET_VER_NO, &CSO7_UtilDlg::OnEnKillfocusEditSetVerNo) - ON_BN_CLICKED(IDC_BUTTON_FIXTURE_ONOFF, &CSO7_UtilDlg::OnBnClickedButtonFixtureOnoff) - ON_BN_CLICKED(IDC_BUTTON_FIXTURE_UPDOWN, &CSO7_UtilDlg::OnBnClickedButtonFixtureUpdown) ON_BN_CLICKED(IDC_BUTTON_RESET_WORKTABLE_RIGHT, &CSO7_UtilDlg::OnBnClickedButtonResetWorktableRight) - ON_BN_CLICKED(IDC_BUTTON_GET_LASER, &CSO7_UtilDlg::OnBnClickedButtonGetLaser) - ON_BN_CLICKED(IDC_BUTTON_SET_SECTION, &CSO7_UtilDlg::OnBnClickedButtonSetSection) - ON_BN_CLICKED(IDC_BUTTON_CORRECTION_SCALE, &CSO7_UtilDlg::OnBnClickedButtonCorrectionScale) + ON_BN_CLICKED(IDC_BUTTON_SET_OUT_PORT, &CSO7_UtilDlg::OnBnClickedButtonSetOutPort) ON_EN_KILLFOCUS(IDC_EDIT_X_SCALE_COEFFICIENT, &CSO7_UtilDlg::OnEnKillfocusEditXScaleCoefficient) ON_EN_KILLFOCUS(IDC_EDIT_Y_SCALE_COEFFICIENT, &CSO7_UtilDlg::OnEnKillfocusEditYScaleCoefficient) ON_EN_KILLFOCUS(IDC_EDIT_Z_SCALE_COEFFICIENT, &CSO7_UtilDlg::OnEnKillfocusEditZScaleCoefficient) - ON_BN_CLICKED(IDC_BUTTON_LOAD_SO7CONFIG, &CSO7_UtilDlg::OnBnClickedButtonLoadSo7config) ON_BN_CLICKED(IDC_BUTTON_AUTO_ZOOM, &CSO7_UtilDlg::OnBnClickedButtonAutoZoom) ON_BN_CLICKED(IDC_BUTTON_MANUAL_HOME, &CSO7_UtilDlg::OnBnClickedButtonManualHome) ON_BN_CLICKED(IDC_BUTTON_SETUP_SO7CONFIG, &CSO7_UtilDlg::OnBnClickedButtonSetupSo7config) ON_BN_CLICKED(IDC_BUTTON_SO7_READ_IN_PORT_STATUS, &CSO7_UtilDlg::OnBnClickedButtonSo7ReadInPortStatus) ON_BN_CLICKED(IDC_RADIO_SPEED_GEAR5, &CSO7_UtilDlg::OnBnClickedRadioSpeedGear5) - ON_EN_KILLFOCUS(IDC_EDIT_SO7_READ_IO_STATUS_ADDRESS, &CSO7_UtilDlg::OnEnKillfocusEditSo7ReadIoStatusAddress) ON_BN_CLICKED(IDC_BUTTON_SO7_TEST_Z_SIGNAL, &CSO7_UtilDlg::OnBnClickedButtonSo7TestZSignal) ON_BN_CLICKED(IDC_BUTTON_SO7_CNC_PROGRAM, &CSO7_UtilDlg::OnBnClickedButtonSo7CncProgram) - ON_BN_CLICKED(IDC_CHECK_SO7_TURN_ON_FFF_LASER, &CSO7_UtilDlg::OnBnClickedCheckSo7TurnOnFffLaser) + ON_BN_CLICKED(IDC_CHECK_SO7_OUT_PORT, &CSO7_UtilDlg::OnBnClickedCheckSo7TurnOnFffLaser) ON_BN_CLICKED(IDC_BUTTON_SO7_SENDDATATOFPGA, &CSO7_UtilDlg::OnBnClickedButtonSo7Senddatatofpga) ON_BN_CLICKED(IDC_BUTTON_SO7_READDATAFROMFPGA, &CSO7_UtilDlg::OnBnClickedButtonSo7Readdatafromfpga) ON_BN_CLICKED(IDC_RADIO_READ_INPUT_PORT, &CSO7_UtilDlg::OnBnClickedRadioReadInputPort) ON_BN_CLICKED(IDC_RADIO_READ_OUTPUT_PORT, &CSO7_UtilDlg::OnBnClickedRadioReadOutputPort) + ON_BN_CLICKED(IDC_BUTTON_MOTION_PARAMETER, &CSO7_UtilDlg::OnBnClickedButtonMotionParameter) END_MESSAGE_MAP() @@ -218,7 +212,6 @@ BOOL CSO7_UtilDlg::OnInitDialog() ((CComboBox *)GetDlgItem(IDC_COMBO_RWDATA_ADDR))->InsertString(i,csTmp); } ((CComboBox *)GetDlgItem(IDC_COMBO_RWDATA_ADDR))->SetCurSel(10); - GetDlgItem(IDC_EDIT_SO7_READ_IO_STATUS_ADDRESS)->SetWindowTextW(_T("4")); GetDlgItem(IDC_EDIT_RWDATA_DATA)->SetWindowTextW(_T("0")); ((CComboBox *)GetDlgItem(IDC_COMBO_SO7_HOMEMODE))->ResetContent(); @@ -293,9 +286,9 @@ void CSO7_UtilDlg::UpdateCtrlsStatus(bool _bEnable) GetDlgItem(IDC_EDIT_COAXIAL_LIGHT2)->EnableWindow(_bEnable); GetDlgItem(IDC_EDIT_COAXIAL_LIGHT3)->EnableWindow(_bEnable); GetDlgItem(IDC_EDIT_COAXIAL_LIGHT4)->EnableWindow(_bEnable); - + + GetDlgItem(IDC_BUTTON_MOTION_PARAMETER)->EnableWindow(_bEnable); GetDlgItem(IDC_BUTTON_SETUP_SO7CONFIG)->EnableWindow(_bEnable); - GetDlgItem(IDC_BUTTON_LOAD_SO7CONFIG)->EnableWindow(_bEnable); GetDlgItem(IDC_BUTTON_SO7_MOVE_ZOOM_IN)->EnableWindow(_bEnable); GetDlgItem(IDC_BUTTON_SO7_MOVE_ZOOM_OUT)->EnableWindow(_bEnable); GetDlgItem(IDC_BUTTON_SO7_MOVE_Z_UP)->EnableWindow(_bEnable); @@ -313,27 +306,19 @@ void CSO7_UtilDlg::UpdateCtrlsStatus(bool _bEnable) GetDlgItem(IDC_BUTTON_RESET_WORKTABLE)->EnableWindow(_bEnable); GetDlgItem(IDC_BUTTON_RESET_WORKTABLE_RIGHT)->EnableWindow(_bEnable); GetDlgItem(IDC_BUTTON_MANUAL_HOME)->EnableWindow(_bEnable); - - GetDlgItem(IDC_BUTTON_MOVE_TO)->EnableWindow(_bEnable); GetDlgItem(IDC_BUTTON_AUTO_ZOOM)->EnableWindow(_bEnable); GetDlgItem(IDC_BUTTON_SET_RESET_FLAG)->EnableWindow(_bEnable); - GetDlgItem(IDC_BUTTON_GET_LASER)->EnableWindow(_bEnable); - GetDlgItem(IDC_BUTTON_PROBE_ONOFF)->EnableWindow(_bEnable); - GetDlgItem(IDC_BUTTON_FIXTURE_ONOFF)->EnableWindow(_bEnable); - GetDlgItem(IDC_BUTTON_FIXTURE_UPDOWN)->EnableWindow(_bEnable); + GetDlgItem(IDC_CHECK_SO7_OUT_PORT)->EnableWindow(_bEnable); + GetDlgItem(IDC_BUTTON_SET_OUT_PORT)->EnableWindow(_bEnable); GetDlgItem(IDC_BUTTON_SO7_READ_IN_PORT_STATUS)->EnableWindow(_bEnable); GetDlgItem(IDC_CHECK_CONTINUOUS_READ_IO_STATUS)->EnableWindow(_bEnable); GetDlgItem(IDC_BUTTON_SO7_TEST_Z_SIGNAL)->EnableWindow(_bEnable); GetDlgItem(IDC_EDIT_SET_VER_NO)->EnableWindow(_bEnable); - GetDlgItem(IDC_BUTTON_SET_SECTION)->EnableWindow(_bEnable); - GetDlgItem(IDC_BUTTON_CORRECTION_SCALE)->EnableWindow(_bEnable); GetDlgItem(IDC_BUTTON_SO7_CNC_PROGRAM)->EnableWindow(_bEnable); - GetDlgItem(IDC_CHECK_SO7_TURN_ON_FFF_LASER)->EnableWindow(_bEnable); GetDlgItem(IDC_BUTTON_SO7_SENDDATATOFPGA)->EnableWindow(_bEnable); GetDlgItem(IDC_BUTTON_SO7_READDATAFROMFPGA)->EnableWindow(_bEnable); - } //===================================================================== @@ -398,10 +383,6 @@ void CSO7_UtilDlg::OnBnClickedButtonStartSo7machine() m_pSO7_Proto->g_machine.GetInterruptMsgMethod=E_GET_INTERRUPT_MSG_INQUIRY; m_pSO7_Proto->_send_cmd_SO7_CMD_SET_GET_INTERRUPT_MSG_METHOD(m_pSO7_Proto->g_machine.GetInterruptMsgMethod); } - ((CButton*)GetDlgItem(IDC_BUTTON_PROBE_ONOFF))->SetWindowTextW(_T("当前探头：激光")); - ((CButton*)GetDlgItem(IDC_BUTTON_FIXTURE_ONOFF))->SetWindowTextW(_T("当前状态：夹具开")); - ((CButton*)GetDlgItem(IDC_BUTTON_FIXTURE_UPDOWN))->SetWindowTextW(_T("当前状态：夹具上")); - UpdateCtrlsStatus(true); SetTimer(1, 150, 0); GetDlgItem(IDC_EDIT_UPDATE_FREQ)->SetWindowText(_T("150")); @@ -445,29 +426,8 @@ void CSO7_UtilDlg::OnBnClickedCancel() //===================================================================== void CSO7_UtilDlg::OnBnClickedButtonSo7ResetXyz() { - m_pSO7_Proto->_send_cmd_SO7_CMD_RESET_XYZ(); } - -//===================================================================== -void CSO7_UtilDlg::OnBnClickedButtonMoveTo() -{ - if(!g_pVolComp) - g_pVolComp=new CSO7_VolComp(); - - CSO7_Move_Location* pSO7_Move_Location=new CSO7_Move_Location; - pSO7_Move_Location->DoModal(); - delete pSO7_Move_Location; - pSO7_Move_Location=NULL; - - if (g_pVolComp) - { - delete g_pVolComp; - g_pVolComp=nullptr; - } - return; -} - //============================================ void CSO7_UtilDlg::OnBnClickedButtonAutoZoom() { @@ -710,10 +670,8 @@ void CSO7_UtilDlg::OnEnKillfocusEditLightSizeValue() { m_pSO7_Proto->_send_cmd_SO7_CMD_SET_LIGHT_SIZE(CT_LIGHT4_SIZE,m_pSO7_Proto->g_machine.Light_Size); } - } - void CSO7_UtilDlg::OnEnKillfocusEditLightSwitch() { @@ -787,46 +745,36 @@ void CSO7_UtilDlg::OnBnClickedButtonResetWorktable() } } m_pSO7_Proto->so7_motion_reset_worktable_lower_left(m_HomeMode); - } void CSO7_UtilDlg::OnBnClickedButtonResetWorktableRight() { - m_pSO7_Proto->so7_motion_reset_worktable_top_right(); } void CSO7_UtilDlg::OnBnClickedButtonResetV() { - m_pSO7_Proto->_send_cmd_SO7_CMD_RESET_V(); } - void CSO7_UtilDlg::OnBnClickedButtonGetFixtureFlag() { - m_pSO7_Proto->_send_cmd_SO7_CMD_GET_FIXTURE_VALUE(); CString csOutMessage; csOutMessage.Format(_T("%d"),m_pSO7_Proto->g_machine.cFixtureFlag); m_OutMessage = _T("Fixture_Flag : ")+csOutMessage; OutputWithScroll(m_OutMessage,m_edMSG); - - } void CSO7_UtilDlg::OnBnClickedButtonSetResetFlag() { - m_pSO7_Proto->_send_cmd_SO7_CMD_SET_RESET_FLAG(); } - void CSO7_UtilDlg::OnEnKillfocusEditSetVerNo() { - UpdateData(TRUE); USES_CONVERSION; const char* cTempSendCmd; @@ -835,73 +783,11 @@ void CSO7_UtilDlg::OnEnKillfocusEditSetVerNo() m_pSO7_Proto->_send_cmd_SO7_CMD_SET_VER_NUMBER(); } - -void CSO7_UtilDlg::OnBnClickedButtonProbeOnoff() -{ - - static bool bFlag(false); - - if (bFlag) - { - m_pSO7_Proto->so7_motion_probe_on_off_(false); - ((CButton*)GetDlgItem(IDC_BUTTON_PROBE_ONOFF))->SetWindowTextW(_T("当前探头：激光")); - bFlag=false; - } - else - { - m_pSO7_Proto->so7_motion_probe_on_off_(true); - ((CButton*)GetDlgItem(IDC_BUTTON_PROBE_ONOFF))->SetWindowTextW(_T("当前探头：接触式")); - bFlag=true; - } -} - - -void CSO7_UtilDlg::OnBnClickedButtonFixtureOnoff() -{ - - static bool bFlag(false); - - if (bFlag) - { - m_pSO7_Proto->so7_motion_fixture_on_off(true); - ((CButton*)GetDlgItem(IDC_BUTTON_FIXTURE_ONOFF))->SetWindowTextW(_T("当前状态：夹具开")); - bFlag=false; - } - else - { - m_pSO7_Proto->so7_motion_fixture_on_off(false); - ((CButton*)GetDlgItem(IDC_BUTTON_FIXTURE_ONOFF))->SetWindowTextW(_T("当前状态：夹具关")); - bFlag=true; - } -} - - -void CSO7_UtilDlg::OnBnClickedButtonFixtureUpdown() -{ - - static bool bFlag(false); - - if (bFlag) - { - m_pSO7_Proto->so7_motion_fixture_up_down(true); - ((CButton*)GetDlgItem(IDC_BUTTON_FIXTURE_UPDOWN))->SetWindowTextW(_T("当前状态：夹具上")); - bFlag=false; - } - else - { - m_pSO7_Proto->so7_motion_fixture_up_down(false); - ((CButton*)GetDlgItem(IDC_BUTTON_FIXTURE_UPDOWN))->SetWindowTextW(_T("当前状态：夹具下")); - bFlag=true; - } -} - - - -void CSO7_UtilDlg::OnBnClickedButtonGetLaser() +void CSO7_UtilDlg::OnBnClickedButtonSetOutPort() { m_SetIOStatusAddr=static_cast(((CComboBox *)GetDlgItem(IDC_COMBO_OUTPORT_NUMBER))->GetCurSel()); char cSetValue(0); - if (((CButton *)GetDlgItem(IDC_CHECK_SO7_TURN_ON_FFF_LASER))->GetCheck()) + if (((CButton *)GetDlgItem(IDC_CHECK_SO7_OUT_PORT))->GetCheck()) { cSetValue=1; } @@ -911,66 +797,6 @@ void CSO7_UtilDlg::OnBnClickedButtonGetLaser() } m_pSO7_Proto->_send_cmd_SO7_CMD_COMMON_COMMAND_DATA(CT_DATA,CT_WRITE_IO_DAT,m_SetIOStatusAddr,cSetValue); } - - -void CSO7_UtilDlg::OnBnClickedButtonSetSection() -{ - - if (((CButton *)GetDlgItem(IDC_RADIO_SELECT_X))->GetCheck()) - { - m_pSO7_Proto->_send_cmd_SO7_CMD_SET_SECTION(0); - } - - else if (((CButton *)GetDlgItem(IDC_RADIO_SELECT_Y))->GetCheck()) - { - m_pSO7_Proto->_send_cmd_SO7_CMD_SET_SECTION(1); - } - - else if (((CButton *)GetDlgItem(IDC_RADIO_SELECT_Z))->GetCheck()) - { - m_pSO7_Proto->_send_cmd_SO7_CMD_SET_SECTION(2); - } - - -} - - -void CSO7_UtilDlg::OnBnClickedButtonCorrectionScale() -{ - /***************************************************************** - m_pSO7_Proto->g_machine.x._pos_fixed._long_=m_pSO7_Proto->MMtoScale(100,m_pSO7_Proto->g_machine.s_machine_config.x_axis._scale_resolution); - m_pSO7_Proto->g_machine.y._pos_fixed._long_=m_pSO7_Proto->MMtoScale(-100,m_pSO7_Proto->g_machine.s_machine_config.y_axis._scale_resolution); - m_pSO7_Proto->g_machine.z._pos_fixed._long_=m_pSO7_Proto->MMtoScale(0,m_pSO7_Proto->g_machine.s_machine_config.z_axis._scale_resolution); - m_pSO7_Proto->_send_cmd_SO7_CMD_MOVE_X(m_pSO7_Proto->g_machine.x._Move_Speed_Gear); - Sleep(600); - m_pSO7_Proto->_send_cmd_SO7_CMD_STOP_MOVE_XYZ(); - Sleep(50); - m_pSO7_Proto->_send_cmd_SO7_CMD_MOVE_Y(-m_pSO7_Proto->g_machine.y._Move_Speed_Gear); - m_pSO7_Proto->_send_cmd_SO7_CMD_MOVE_TO_POS_XYZ(CT_MOVETOXYZ); - - //m_pSO7_Proto->g_machine.x._pos_fixed._long_=m_pSO7_Proto->MMtoScale(100,m_pSO7_Proto->g_machine.s_machine_config.x_axis._scale_resolution); - //m_pSO7_Proto->g_machine.y._pos_fixed._long_=m_pSO7_Proto->MMtoScale(0,m_pSO7_Proto->g_machine.s_machine_config.y_axis._scale_resolution); - //m_pSO7_Proto->g_machine.z._pos_fixed._long_=m_pSO7_Proto->MMtoScale(0,m_pSO7_Proto->g_machine.s_machine_config.z_axis._scale_resolution); - //m_pSO7_Proto->_send_cmd_SO7_CMD_MOVE_TO_POS_XYZ(CT_MOVETOXYZ); - /************************************************************/ - if (((CButton *)GetDlgItem(IDC_RADIO_SELECT_X))->GetCheck()) - { - m_pSO7_Proto->_send_cmd_SO7_CMD_CORRECTION_SCALE(0); - } - - else if (((CButton *)GetDlgItem(IDC_RADIO_SELECT_Y))->GetCheck()) - { - m_pSO7_Proto->_send_cmd_SO7_CMD_CORRECTION_SCALE(1); - } - - else if (((CButton *)GetDlgItem(IDC_RADIO_SELECT_Z))->GetCheck()) - { - m_pSO7_Proto->_send_cmd_SO7_CMD_CORRECTION_SCALE(2); - } - -} - - void CSO7_UtilDlg::OnEnKillfocusEditXScaleCoefficient() { @@ -980,8 +806,6 @@ void CSO7_UtilDlg::OnEnKillfocusEditXScaleCoefficient() m_pSO7_Proto->g_machine.s_machine_config.x_axis._scale_resolution = atof(cTempValue); } - - void CSO7_UtilDlg::OnEnKillfocusEditYScaleCoefficient() { @@ -1003,16 +827,24 @@ void CSO7_UtilDlg::OnEnKillfocusEditZScaleCoefficient() m_pSO7_Proto->g_machine.s_machine_config.z_axis._scale_resolution = atof(cTempValue); } - -void CSO7_UtilDlg::OnBnClickedButtonLoadSo7config() +void CSO7_UtilDlg::OnBnClickedButtonMotionParameter() { KillTimer(1); - CSO7_Send_Parameter* pSO7_Send_Parameter=new CSO7_Send_Parameter; - pSO7_Send_Parameter->DoModal(); - delete pSO7_Send_Parameter; + if(!g_pVolComp) + g_pVolComp=new CSO7_VolComp(); + + CSo7_Motion_Pages *pSo7_Motion_Pages = new CSo7_Motion_Pages(_T("Motion"), this); + pSo7_Motion_Pages->DoModal(); + delete pSo7_Motion_Pages; + pSo7_Motion_Pages=nullptr; + + if (g_pVolComp) + { + delete g_pVolComp; + g_pVolComp=nullptr; + } SetTimer(1,150,NULL); return; - } //=================================================== @@ -1171,18 +1003,6 @@ void CSO7_UtilDlg::OnBnClickedButtonSo7Readdatafromfpga() m_OutMessage.Format(_T("[Read]Data=%d ."),m_pSO7_Proto->g_machine.FPGAData); OutputWithScroll(m_OutMessage,m_edMSG); } - -//================================================================================================ -void CSO7_UtilDlg::OnEnKillfocusEditSo7ReadIoStatusAddress() -{ - UpdateData(TRUE); - USES_CONVERSION; - CString str; - GetDlgItem(IDC_EDIT_SO7_READ_IO_STATUS_ADDRESS)->GetWindowText(str); - const char* cTempValue=T2A(str); - - m_ReadIOStatusAddr= static_cast(atoi(cTempValue)); -} //================================================================================================ void CSO7_UtilDlg::OnBnClickedRadioReadInputPort() { @@ -1414,7 +1234,7 @@ void CSO7_UtilDlg::OnBnClickedButtonSo7CncProgram() void CSO7_UtilDlg::OnBnClickedCheckSo7TurnOnFffLaser() { - if (((CButton *)GetDlgItem(IDC_CHECK_SO7_TURN_ON_FFF_LASER))->GetCheck()) + if (((CButton *)GetDlgItem(IDC_CHECK_SO7_OUT_PORT))->GetCheck()) { m_pSO7_Proto->_send_cmd_SO7_CMD_COMMON_COMMAND(CT_MOTOR,CT_M_LASE_ON,0); } @@ -1422,6 +1242,4 @@ void CSO7_UtilDlg::OnBnClickedCheckSo7TurnOnFffLaser() { m_pSO7_Proto->_send_cmd_SO7_CMD_COMMON_COMMAND(CT_MOTOR,CT_M_LASE_OFF,0); } -} - - +} \ No newline at end of file diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.h b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.h index ff005e9..9f36f53 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.h @@ -73,7 +73,6 @@ public: afx_msg void OnBnClickedCancel(); afx_msg void OnBnClickedButtonStopSo7machine(); afx_msg void OnBnClickedButtonSo7ResetXyz(); - afx_msg void OnBnClickedButtonMoveTo(); afx_msg void OnBnClickedButtonSo7ReadAxisXyz(); afx_msg void OnTimer(UINT_PTR nIDEvent); afx_msg BOOL PreTranslateMessage(MSG* pMsg); @@ -99,24 +98,17 @@ public: afx_msg void OnBnClickedButtonResetV(); afx_msg void OnBnClickedButtonGetFixtureFlag(); afx_msg void OnBnClickedButtonSetResetFlag(); - afx_msg void OnBnClickedButtonProbeOnoff(); afx_msg void OnEnKillfocusEditSetVerNo(); - afx_msg void OnBnClickedButtonFixtureOnoff(); - afx_msg void OnBnClickedButtonFixtureUpdown(); afx_msg void OnBnClickedButtonResetWorktableRight(); - afx_msg void OnBnClickedButtonGetLaser(); - afx_msg void OnBnClickedButtonSetSection(); - afx_msg void OnBnClickedButtonCorrectionScale(); + afx_msg void OnBnClickedButtonSetOutPort(); afx_msg void OnEnKillfocusEditXScaleCoefficient(); afx_msg void OnEnKillfocusEditYScaleCoefficient(); afx_msg void OnEnKillfocusEditZScaleCoefficient(); - afx_msg void OnBnClickedButtonLoadSo7config(); afx_msg void OnBnClickedButtonAutoZoom(); afx_msg void OnBnClickedButtonManualHome(); afx_msg void OnBnClickedButtonSetupSo7config(); afx_msg void OnBnClickedButtonSo7ReadInPortStatus(); afx_msg void OnBnClickedRadioSpeedGear5(); - afx_msg void OnEnKillfocusEditSo7ReadIoStatusAddress(); afx_msg void OnBnClickedButtonSo7TestZSignal(); afx_msg void OnBnClickedButtonSo7CncProgram(); afx_msg void OnBnClickedCheckSo7TurnOnFffLaser(); @@ -124,4 +116,5 @@ public: afx_msg void OnBnClickedButtonSo7Readdatafromfpga(); afx_msg void OnBnClickedRadioReadInputPort(); afx_msg void OnBnClickedRadioReadOutputPort(); + afx_msg void OnBnClickedButtonMotionParameter(); }; diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Motion_Pages.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Motion_Pages.cpp new file mode 100644 index 0000000..bc0db6b --- /dev/null +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Motion_Pages.cpp @@ -0,0 +1,78 @@ +#include "stdafx.h" +#include "afxpropertysheet.h" +#include "resource.h" +#include "..\..\..\SevenOcean\EF8000_Interface.h" +#include "..\..\..\SevenOcean\SO7_Proto.h" +#include "..\..\..\SevenOcean\CMMIO_SERIAL.H" +#include "DrawGraph.h" +#include "ProcessButton.h" +#include "SO7_UtilDlg.h" +#include "SO7_Send_Parameter.h" + +#include "SO7_VolComp.h" +#include "SO7_Move_Location.h" + +#include "So7_Motion_Pages.h" + +#ifdef _DEBUG +#define new DEBUG_NEW +#undef THIS_FILE +static char THIS_FILE[] = __FILE__; +#endif +///////////////////////////////////////////////////////////////////////////// +// CSo7_Motion_Pages + +IMPLEMENT_DYNAMIC(CSo7_Motion_Pages, CMFCPropertySheet) + +CSo7_Motion_Pages::CSo7_Motion_Pages(LPCTSTR pszCaption, CWnd* pParentWnd, UINT iSelectPage) +:CMFCPropertySheet(pszCaption, pParentWnd, iSelectPage) +{ + m_psh.dwFlags |=PSH_NOAPPLYNOW; + m_psh.dwFlags &=~PSH_HASHELP; + SetLook(CMFCPropertySheet::PropSheetLook_Tabs); + AddPage(&m_PageSendParameter); + AddPage(&m_PageMoveLocation); + m_hIcon = AfxGetApp()->LoadIcon(IDR_MAINFRAME); +} + +CSo7_Motion_Pages::~CSo7_Motion_Pages() +{ +} + +BEGIN_MESSAGE_MAP(CSo7_Motion_Pages, CMFCPropertySheet) + ON_BN_CLICKED(IDC_BUTTON_DIY_EXIT_BUTTON, &CSo7_Motion_Pages::OnCancel) +END_MESSAGE_MAP() + +//================================================================ +BOOL CSo7_Motion_Pages::OnInitDialog() +{ + BOOL bResult = CMFCPropertySheet::OnInitDialog(); + SetIcon(m_hIcon, TRUE); // Set big icon + SetIcon(m_hIcon, FALSE); // Set small icon + + CRect BtnRect, TabCtrlRect; + int BtnWidth(0); + GetDlgItem(IDOK)->GetWindowRect(BtnRect); + GetTabControl()->GetWindowRect(TabCtrlRect); + ScreenToClient(BtnRect); + ScreenToClient(TabCtrlRect); + BtnWidth = BtnRect.Width(); + BtnRect.left = TabCtrlRect.right - BtnWidth; + BtnRect.right = TabCtrlRect.right; + m_ExitButton.Create(_T("Exit"),BS_PUSHBUTTON|WS_CHILD|WS_TABSTOP, BtnRect, this, IDC_BUTTON_DIY_EXIT_BUTTON);//WS_VISIBLE + m_ExitButton.SetFont(GetFont()); + + GetDlgItem(IDOK)->ShowWindow(SW_HIDE); + GetDlgItem(IDHELP)->ShowWindow(SW_HIDE); + GetDlgItem(ID_APPLY_NOW)->ShowWindow(SW_HIDE); + //GetDlgItem(IDCANCEL)->ShowWindow(SW_HIDE); + ((CButton*)GetDlgItem(IDCANCEL))->SetWindowTextW(_T("Exit")); + + return bResult; +} +//================================================================ +void CSo7_Motion_Pages::OnCancel() +{ + CMFCPropertySheet::OnClose(); + //Default(); +} \ No newline at end of file diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Motion_Pages.h b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Motion_Pages.h new file mode 100644 index 0000000..e1e883f --- /dev/null +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Motion_Pages.h @@ -0,0 +1,27 @@ +#pragma once +///////////////////////////////////////////////////////////////////////////// +// CSo7_Motion_Pages + +class CSo7_Motion_Pages : public CMFCPropertySheet +{ + DECLARE_DYNAMIC(CSo7_Motion_Pages) + +// Construction +public: + CSo7_Motion_Pages(LPCTSTR pszCaption, CWnd* pParentWnd = NULL, UINT iSelectPage = 0); + +// Attributes +public: + CSO7_Send_Parameter m_PageSendParameter; + CSO7_Move_Location m_PageMoveLocation; + HICON m_hIcon; + CButton m_ExitButton; + afx_msg void OnCancel(); +// Implementation +public: + virtual ~CSo7_Motion_Pages(); +protected: + DECLARE_MESSAGE_MAP() + virtual BOOL OnInitDialog(); +}; + diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj index 9f3aa02..363c41b 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj @@ -346,6 +346,7 @@ + @@ -421,6 +422,7 @@ + diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj.filters b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj.filters index c09e041..ce5d84a 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj.filters +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj.filters @@ -175,6 +175,9 @@ Sources Files + + Sources Files + @@ -384,6 +387,9 @@ Header Files + + Header Files + diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h index 2e7d9f0..c2df142 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/resource.h @@ -5,7 +5,7 @@ #define IDSTOP 2 #define IDSTOP_AUTO_TEST 3 #define IDC_BUTTON_MOVE_W 4 -#define ID_OK_START 5 +#define IDC_BUTTON_MOVE_TO_XYZ 5 #define IDS_ABOUTBOX 7 #define IDSTOP_AUTO_TEST_MITUTOYO 8 #define IDM_ABOUTBOX 0x0010 @@ -254,6 +254,7 @@ #define IDC_BUTTON_INIT_SO7USB 1206 #define IDC_BUTTON_LOAD_SOCONFIG 1207 #define IDC_BUTTON_LOAD_SO7CONFIG 1207 +#define IDC_BUTTON_MOTION_PARAMETER 1207 #define IDC_BUTTON_SO7_MOVE_X 1208 #define IDC_BUTTON_SO7_MOVE_X_LEFT 1208 #define IDC_BUTTON_SO7_MOVE_Y 1209 @@ -326,12 +327,7 @@ #define IDC_RADIO_SELECT_X 1262 #define IDC_RADIO_SELECT_Y 1263 #define IDC_RADIO_SELECT_Z 1264 -#define IDC_BUTTON_SET_SECTION 1265 -#define IDC_BUTTON_CORRECTION_SCALE 1266 -#define IDC_BUTTON_FIXTURE_UPDOWN 1267 -#define IDC_BUTTON_FIXTURE_ONOFF 1268 -#define IDC_BUTTON_GET_LASER 1269 -#define IDC_BUTTON_PROBE_ONOFF 1270 +#define IDC_BUTTON_SET_OUT_PORT 1269 #define IDC_EDIT_SET_VER_NO 1271 #define IDC_EDIT_X_SCALE_COEFFICIENT 1272 #define IDC_EDIT_Y_SCALE_COEFFICIENT 1273 @@ -484,7 +480,7 @@ #define IDC_CHECK_REVERSE 1394 #define IDC_CHECK_AUTOZOOM_CONTINUE_READ 1394 #define IDC_CHECK_TEST_KEYENCE_LK_G_PROGRAM1 1394 -#define IDC_CHECK_SO7_TURN_ON_FFF_LASER 1394 +#define IDC_CHECK_SO7_OUT_PORT 1394 #define IDC_BUTTON_MANUAL_HOME 1395 #define IDC_CHECK_TEST_KEYENCE_LK_G_PROGRAM2 1395 #define IDC_CHECK_ 1396 @@ -776,7 +772,6 @@ #define IDC_MFCBUTTON_STATUS_IN_PORT4 1670 #define IDC_MFCBUTTON_STATUS_IN_PORT5 1671 #define IDC_RADIO_SPEED_GEAR5 1672 -#define IDC_EDIT_SO7_READ_IO_STATUS_ADDRESS 1673 #define IDC_RADIO_VIDEOCARD_SV4000E 1674 #define IDC_RADIO_SV4000E_RGB 1675 #define IDC_MFCBUTTON_STATUS_IN_PORT6 1676 @@ -881,6 +876,8 @@ #define IDC_STATIC_SPEED_PARA1 1816 #define IDC_STATIC_SPEED_PARA3 1817 #define IDC_STATIC_SPEED_PARA4 1818 +#define IDC_CHECK_SO7_MOTION_AUTO_SET_ZERO 1819 +#define IDC_BUTTON_DIY_EXIT_BUTTON 1820 // Next default values for new objects // @@ -888,7 +885,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 189 #define _APS_NEXT_COMMAND_VALUE 32771 -#define _APS_NEXT_CONTROL_VALUE 1819 +#define _APS_NEXT_CONTROL_VALUE 1820 #define _APS_NEXT_SYMED_VALUE 104 #endif #endif diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo index 485cd16..a6439c0 100644 Binary files a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo and b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo differ