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 2d697ae..ce61929 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Debug/UtilityDebug.Log @@ -1241,3 +1241,51 @@ 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. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. +Construct Cso7_Proto. +Destruct Cso7_Proto. +Construct Cso7_Proto. +Init:Open device succeed . +_start_machine +Exit: Exit_SO7Usb +Destruct Cso7_Proto. diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Release/UtilityDebug.Log b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Release/UtilityDebug.Log index 7c71cae..6163d02 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Release/UtilityDebug.Log +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/Release/UtilityDebug.Log @@ -34,3 +34,13 @@ Construct Cso7_Proto. Destruct Cso7_Proto. Construct Cso7_Proto. 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. diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/DrawGraph.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/DrawGraph.cpp index 68a8010..bb7e185 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/DrawGraph.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/DrawGraph.cpp @@ -132,6 +132,12 @@ void CDrawGraph::SetResolution(double dbResolutionX, double dbResolutionY, BOOL Invalidate(); } //======================================================== +void CDrawGraph::RedrawGraph(BOOL bIsRedraw) +{ + if(bIsRedraw) + Invalidate(); +}; +//======================================================== void CDrawGraph::LoadGraphyXAxisData(DataBuff& dataShow) { double dbData; @@ -261,6 +267,7 @@ void CDrawGraph::DrawActualCurve(CDC *pDC, CRect rectCoord) double dbDataX(0.0),dbDataY(0.0); int nOffsetX(0), nOffsetY(0),nOriginX(0),nOriginY(0); + dbDataX = m_dataGraphX.ElementAt(0); dbDataY = m_dataGraphY.ElementAt(0); nOriginX = rectCoord.left; nOriginY = rectCoord.bottom;; diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/DrawGraph.h b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/DrawGraph.h index f6da1a5..28eb86a 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/DrawGraph.h +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/DrawGraph.h @@ -36,6 +36,7 @@ public: void LoadGraphyYAxisData(DataBuff& dataShow); void LoadGraphyXAxisData(DataBuff& dataShow); void AddGraphyData(double _data); + void RedrawGraph(BOOL bIsRedraw=TRUE); void SetCoordinateLabel(const CString& _XAxis,const CString& _YAxis); void RemoveGraphyData(BOOL bIsRedraw=TRUE); void DrawCoordinate(CDC* pDC, CRect rectCoord); 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 661243c..0bc570b 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 @@ -149,83 +149,83 @@ BEGIN CONTROL "Z",IDC_RADIO_SAMPLE_Z,"Button",BS_AUTORADIOBUTTON,391,439,20,10 GROUPBOX "曲线类型",IDC_STATIC,308,398,66,57 CONTROL "速度-时间",IDC_RADIO_CANVAS_SPEED_TIME,"Button",BS_AUTORADIOBUTTON | WS_GROUP,315,413,51,10 - CONTROL "位移-速度",IDC_RADIO_CANVAS_SPEED_POSTION,"Button",BS_AUTORADIOBUTTON,315,426,51,10 + CONTROL "速度-位移",IDC_RADIO_CANVAS_SPEED_POSTION,"Button",BS_AUTORADIOBUTTON,315,426,51,10 CONTROL "位移-时间",IDC_RADIO_CANVAS_POSTION_TIME,"Button",BS_AUTORADIOBUTTON,315,439,51,10 EDITTEXT IDC_EDIT_BASESPEED_X1,43,55,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_MAXSPEED_X1,93,55,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_STARTSPEED_X1,143,55,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_FRESHSPEED_X1,193,55,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_SLOWDIS_X1,243,55,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_MAXSPEED_X1,107,55,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_STARTSPEED_X1,177,55,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_FRESHSPEED_X1,244,55,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_SLOWDIS_X1,243,55,40,12,ES_AUTOHSCROLL | NOT WS_VISIBLE EDITTEXT IDC_EDIT_BASESPEED_X2,43,69,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_MAXSPEED_X2,93,69,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_STARTSPEED_X2,143,69,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_FRESHSPEED_X2,193,69,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_SLOWDIS_X2,243,69,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_MAXSPEED_X2,107,69,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_STARTSPEED_X2,177,69,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_FRESHSPEED_X2,244,69,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_SLOWDIS_X2,243,69,40,12,ES_AUTOHSCROLL | NOT WS_VISIBLE EDITTEXT IDC_EDIT_BASESPEED_X3,43,83,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_MAXSPEED_X3,93,83,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_STARTSPEED_X3,143,83,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_FRESHSPEED_X3,193,83,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_SLOWDIS_X3,243,83,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_MAXSPEED_X3,107,83,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_STARTSPEED_X3,177,83,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_FRESHSPEED_X3,244,83,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_SLOWDIS_X3,243,83,40,12,ES_AUTOHSCROLL | NOT WS_VISIBLE EDITTEXT IDC_EDIT_BASESPEED_X4,43,97,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_MAXSPEED_X4,93,97,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_STARTSPEED_X4,143,97,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_FRESHSPEED_X4,193,97,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_SLOWDIS_X4,243,97,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_MAXSPEED_X4,107,97,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_STARTSPEED_X4,177,97,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_FRESHSPEED_X4,244,97,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_SLOWDIS_X4,243,97,40,12,ES_AUTOHSCROLL | NOT WS_VISIBLE EDITTEXT IDC_EDIT_BASESPEED_X5,43,111,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_MAXSPEED_X5,93,111,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_STARTSPEED_X5,143,111,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_FRESHSPEED_X5,193,111,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_SLOWDIS_X5,243,111,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_MAXSPEED_X5,107,111,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_STARTSPEED_X5,177,111,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_FRESHSPEED_X5,244,111,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_SLOWDIS_X5,243,111,40,12,ES_AUTOHSCROLL | NOT WS_VISIBLE EDITTEXT IDC_EDIT_BASESPEED_Y1,43,129,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_MAXSPEED_Y1,93,129,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_STARTSPEED_Y1,143,129,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_FRESHSPEED_Y1,193,129,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_SLOWDIS_Y1,243,129,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_MAXSPEED_Y1,107,129,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_STARTSPEED_Y1,177,129,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_FRESHSPEED_Y1,244,129,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_SLOWDIS_Y1,243,129,40,12,ES_AUTOHSCROLL | NOT WS_VISIBLE EDITTEXT IDC_EDIT_BASESPEED_Y2,43,143,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_MAXSPEED_Y2,93,143,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_STARTSPEED_Y2,143,143,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_FRESHSPEED_Y2,193,143,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_SLOWDIS_Y2,243,143,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_MAXSPEED_Y2,107,143,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_STARTSPEED_Y2,177,143,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_FRESHSPEED_Y2,244,143,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_SLOWDIS_Y2,243,143,40,12,ES_AUTOHSCROLL | NOT WS_VISIBLE EDITTEXT IDC_EDIT_BASESPEED_Y3,43,156,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_MAXSPEED_Y3,93,156,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_STARTSPEED_Y3,143,156,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_FRESHSPEED_Y3,193,156,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_SLOWDIS_Y3,243,156,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_MAXSPEED_Y3,107,156,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_STARTSPEED_Y3,177,156,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_FRESHSPEED_Y3,244,156,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_SLOWDIS_Y3,243,156,40,12,ES_AUTOHSCROLL | NOT WS_VISIBLE EDITTEXT IDC_EDIT_BASESPEED_Y4,43,170,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_MAXSPEED_Y4,93,170,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_STARTSPEED_Y4,143,170,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_FRESHSPEED_Y4,193,170,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_SLOWDIS_Y4,243,170,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_MAXSPEED_Y4,107,170,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_STARTSPEED_Y4,177,170,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_FRESHSPEED_Y4,244,170,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_SLOWDIS_Y4,243,170,40,12,ES_AUTOHSCROLL | NOT WS_VISIBLE EDITTEXT IDC_EDIT_BASESPEED_Y5,43,184,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_MAXSPEED_Y5,93,184,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_STARTSPEED_Y5,143,184,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_FRESHSPEED_Y5,193,184,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_SLOWDIS_Y5,243,184,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_MAXSPEED_Y5,107,184,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_STARTSPEED_Y5,177,184,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_FRESHSPEED_Y5,244,184,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_SLOWDIS_Y5,243,184,40,12,ES_AUTOHSCROLL | NOT WS_VISIBLE EDITTEXT IDC_EDIT_BASESPEED_Z1,43,203,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_MAXSPEED_Z1,93,203,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_STARTSPEED_Z1,143,203,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_FRESHSPEED_Z1,193,203,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_SLOWDIS_Z1,243,203,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_MAXSPEED_Z1,107,203,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_STARTSPEED_Z1,177,203,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_FRESHSPEED_Z1,244,203,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_SLOWDIS_Z1,243,203,40,12,ES_AUTOHSCROLL | NOT WS_VISIBLE EDITTEXT IDC_EDIT_BASESPEED_Z2,43,217,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_MAXSPEED_Z2,93,217,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_STARTSPEED_Z2,143,217,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_FRESHSPEED_Z2,193,217,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_SLOWDIS_Z2,243,217,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_MAXSPEED_Z2,107,217,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_STARTSPEED_Z2,177,217,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_FRESHSPEED_Z2,244,217,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_SLOWDIS_Z2,243,217,40,12,ES_AUTOHSCROLL | NOT WS_VISIBLE EDITTEXT IDC_EDIT_BASESPEED_Z3,43,231,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_MAXSPEED_Z3,93,231,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_STARTSPEED_Z3,143,231,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_FRESHSPEED_Z3,193,231,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_SLOWDIS_Z3,243,231,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_MAXSPEED_Z3,107,231,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_STARTSPEED_Z3,177,231,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_FRESHSPEED_Z3,244,231,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_SLOWDIS_Z3,243,231,40,12,ES_AUTOHSCROLL | NOT WS_VISIBLE EDITTEXT IDC_EDIT_BASESPEED_Z4,43,245,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_MAXSPEED_Z4,93,245,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_STARTSPEED_Z4,143,245,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_FRESHSPEED_Z4,193,245,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_SLOWDIS_Z4,243,245,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_MAXSPEED_Z4,107,245,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_STARTSPEED_Z4,177,245,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_FRESHSPEED_Z4,244,245,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_SLOWDIS_Z4,243,245,40,12,ES_AUTOHSCROLL | NOT WS_VISIBLE EDITTEXT IDC_EDIT_BASESPEED_Z5,43,259,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_MAXSPEED_Z5,93,259,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_STARTSPEED_Z5,143,259,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_FRESHSPEED_Z5,193,259,40,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_SLOWDIS_Z5,243,259,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_MAXSPEED_Z5,107,259,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_STARTSPEED_Z5,177,259,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_FRESHSPEED_Z5,244,259,40,12,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_SLOWDIS_Z5,243,259,40,12,ES_AUTOHSCROLL | NOT WS_VISIBLE EDITTEXT IDC_EDIT_WHEELBASE_X,43,293,40,12,ES_AUTOHSCROLL EDITTEXT IDC_EDIT_WHEELBASE_Y,104,293,40,12,ES_AUTOHSCROLL EDITTEXT IDC_EDIT_WHEELBASE_Z,167,293,40,12,ES_AUTOHSCROLL @@ -248,14 +248,14 @@ BEGIN 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 - GROUPBOX "速度参数",IDC_STATIC,15,31,275,246 + GROUPBOX "速度参数",IDC_STATIC,17,29,273,248 LTEXT "X-1",IDC_STATIC,27,57,12,8 LTEXT "X-2",IDC_STATIC,27,72,12,8 - LTEXT "基本速率",IDC_STATIC,48,41,33,8 - LTEXT "最大速率",IDC_STATIC,98,41,33,8 - CONTROL "起始速率",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,146,41,33,8 - LTEXT "刷新速率",IDC_STATIC,197,41,33,8 - LTEXT "减速距离",IDC_STATIC,247,41,33,8 + LTEXT "加速度",IDC_STATIC,48,41,25,8 + LTEXT "最大速率（高8位）",IDC_STATIC,98,41,69,8 + CONTROL "最低速率（低8位）",IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,168,41,69,8 + LTEXT "刷新周期",IDC_STATIC,248,41,33,8 + LTEXT "减速距离",IDC_STATIC,247,41,33,8,NOT WS_VISIBLE LTEXT "X-3",IDC_STATIC,27,85,12,8 LTEXT "X-4",IDC_STATIC,27,99,12,8 LTEXT "X-5",IDC_STATIC,27,113,12,8 @@ -285,14 +285,16 @@ BEGIN LTEXT "POS WORKING LIMIT",IDC_STATIC,20,382,69,8 LTEXT "X=",IDC_STATIC,104,381,10,8 LTEXT "Y=",IDC_STATIC,166,381,10,8 - EDITTEXT IDC_EDIT_SAMPLE_SCURVE_DIS,473,405,40,14,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT_SAMPLE_TIME_SCURVE,564,405,40,14,ES_AUTOHSCROLL - PUSHBUTTON "开始",IDC_BUTTON_START_SAMPLE_SCURVE,628,407,50,14 + EDITTEXT IDC_EDIT_SAMPLE_SCURVE_DIS,473,405,28,14,ES_AUTOHSCROLL + EDITTEXT IDC_EDIT_SAMPLE_TIME_SCURVE,564,405,28,14,ES_AUTOHSCROLL + PUSHBUTTON "Start",IDC_BUTTON_START_SAMPLE_SCURVE,628,407,50,14 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 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 END IDD_SO7_UTIL_AUTO_ZOOM DIALOGEX 0, 0, 426, 460 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 cf52fc6..91bc8ba 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 @@ -550,22 +550,26 @@ void CSO7_Send_Parameter::OnEnKillfocusEditSampleTimeScurve() //================================================================================================ void CSO7_Send_Parameter::OnBnClickedButtonStartSampleScurve() { + m_pSO7_Proto->_send_cmd_SO7_CMD_READ_AXIS_XYZ(); m_pSO7_Proto->g_machine.x._pos_fixed._long_=0; m_pSO7_Proto->g_machine.y._pos_fixed._long_=0; m_pSO7_Proto->g_machine.z._pos_fixed._long_=0; if(((CButton *)GetDlgItem(IDC_RADIO_SAMPLE_X))->GetCheck()) { m_pSO7_Proto->g_machine.x._pos_fixed._long_=m_pSO7_Proto->MMtoScale(m_dMoveDis,m_pSO7_Proto->g_machine.s_machine_config.x_axis._scale_resolution); + m_pSO7_Proto->g_machine.x._d_cur_pos_ = m_pSO7_Proto->ScaleToMM(m_pSO7_Proto->g_machine.x._scale_pos._long_, m_pSO7_Proto->g_machine.s_machine_config.x_axis._scale_resolution); m_dPos=m_pSO7_Proto->g_machine.x._d_cur_pos_; } else if(((CButton *)GetDlgItem(IDC_RADIO_SAMPLE_Y))->GetCheck()) { m_pSO7_Proto->g_machine.y._pos_fixed._long_=m_pSO7_Proto->MMtoScale(m_dMoveDis,m_pSO7_Proto->g_machine.s_machine_config.y_axis._scale_resolution); + m_pSO7_Proto->g_machine.y._d_cur_pos_ = m_pSO7_Proto->ScaleToMM(m_pSO7_Proto->g_machine.y._scale_pos._long_, m_pSO7_Proto->g_machine.s_machine_config.y_axis._scale_resolution); m_dPos=m_pSO7_Proto->g_machine.y._d_cur_pos_; } else if(((CButton *)GetDlgItem(IDC_RADIO_SAMPLE_Z))->GetCheck()) { m_pSO7_Proto->g_machine.z._pos_fixed._long_=m_pSO7_Proto->MMtoScale(m_dMoveDis,m_pSO7_Proto->g_machine.s_machine_config.z_axis._scale_resolution); + m_pSO7_Proto->g_machine.z._d_cur_pos_ = m_pSO7_Proto->ScaleToMM(m_pSO7_Proto->g_machine.z._scale_pos._long_, m_pSO7_Proto->g_machine.s_machine_config.z_axis._scale_resolution); m_dPos=m_pSO7_Proto->g_machine.z._d_cur_pos_; } @@ -592,7 +596,7 @@ void CSO7_Send_Parameter::OnBnClickedButtonStartSampleScurve() //m_dbResolutionX=static_cast(m_TimerInterval/(m_dbEndX*1000.0));//每一次采样所需时间对应X坐标的长度 m_DrawGraph.SetCoordinateLabel(_T("位置(mm)"),_T("速度(mm/s)")); } - + ((CButton*)GetDlgItem(IDC_BUTTON_START_SAMPLE_SCURVE))->EnableWindow(FALSE); nCount=0; m_DataXAxis=0.0; m_dataGraphX.RemoveAll(); @@ -610,6 +614,8 @@ void CSO7_Send_Parameter::OnBnClickedButtonStartSampleScurve() void CSO7_Send_Parameter::OnBnClickedButtonStopSampleScurve() { m_TimerCnt=0; + m_DrawGraph.RedrawGraph();//refresh + m_pSO7_Proto->_send_cmd_SO7_CMD_STOP_MOVE_XYZ(); } //================================================================================================ void CSO7_Send_Parameter::Sample_Speed_Time_Curve() @@ -820,7 +826,7 @@ void CSO7_Send_Parameter::OnTimer(UINT_PTR nIDEvent) if((m_dbStartY-dbData)>0.0 &&(m_dbStartY-dbData)(1.0/(m_dbEndY-m_dbStartY)); @@ -829,6 +835,7 @@ void CSO7_Send_Parameter::OnTimer(UINT_PTR nIDEvent) m_DrawGraph.SetResolution(m_dbResolutionX,m_dbResolutionY); m_DrawGraph.LoadGraphyXAxisData(m_dataGraphX); m_DrawGraph.LoadGraphyYAxisData(m_dataGraphY); + ((CButton*)GetDlgItem(IDC_BUTTON_START_SAMPLE_SCURVE))->EnableWindow(TRUE); } nCount++; diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Manual_Machine.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Manual_Machine.cpp index 705af16..9d88bab 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Manual_Machine.cpp +++ b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/So7_Manual_Machine.cpp @@ -158,7 +158,7 @@ void CSo7_Manual_Machine::OnBnClickedButtonSo7ManualMachineStopMachine() //=================================================== void CSo7_Manual_Machine::OnBnClickedRadioSo7ManualMachineCommonCmd1() { - GetDlgItem(IDC_EDIT_SO7_MANUAL_MACHINE_DATA)->SetWindowTextW(_T("A6 30 30 31 47 0D")); + GetDlgItem(IDC_EDIT_SO7_MANUAL_MACHINE_DATA)->SetWindowTextW(_T("4D 30 2C 2D 30 30 2E 32 33 35 32 0D 00 00 00 00 00 00 00 00")); } //=================================================== @@ -350,15 +350,18 @@ BOOL CSo7_Manual_Machine::_Send_Common_CMD(const char* _SendData,DWORD _SendDa //=================================================== void CSo7_Manual_Machine::_Send_CMD_InitController() { - BYTE bSendData1[6]={0xA6,0x30,0x30,0x31,0x47,0x0D}; - _Send_Common_CMD((const char*)bSendData1,6); + BYTE bSendData[20]={0x4D,0x30,0x2C,0x2D,0x30,0x30,0x2E,0x32,0x33,0x35,0x32,0x0D,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}; + _Send_Common_CMD((const char*)bSendData,12); BYTE bSendData2[6]={0xA4,0x30,0x30,0x31,0x45,0x0D}; _Send_Common_CMD((const char*)bSendData2,6); BYTE bSendData3[6]={0xA5,0x30,0x30,0x31,0x46,0x0D}; _Send_Common_CMD((const char*)bSendData3,6); BYTE bSendData4[6]={0xA6,0x30,0x30,0x31,0x47,0x0D}; _Send_Common_CMD((const char*)bSendData4,6); - + + _Send_Common_CMD((const char*)bSendData2,6); + _Send_Common_CMD((const char*)bSendData3,6); + _Send_Common_CMD((const char*)bSendData4,6); }; //=================================================== void CSo7_Manual_Machine::_Send_CMD_ReadPositionX() 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 96dcace..79ee1ae 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