Build Version6.1

PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Mv_Util.rc

@@ -1206,8 +1206,8 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM
 CAPTION "About Utility"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    ICON            IDR_MAINFRAME,IDC_STATIC,16,11,21,20
-    LTEXT           "Version 6.0",IDC_STATIC,89,13,45,8,SS_NOPREFIX
+    ICON            IDR_MAINFRAME,IDC_STATIC,16,11,20,20
+    LTEXT           "Version 6.1",IDC_STATIC,89,13,45,8,SS_NOPREFIX
     LTEXT           "Hexagon Metrology, Copyright (C) 2013",IDC_STATIC,51,27,129,8
     DEFPUSHBUTTON   "OK",IDOK,141,46,50,14,WS_GROUP
 END
@@ -1828,8 +1828,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 6,0,0,0
- PRODUCTVERSION 6,0,0,0
+ FILEVERSION 6,1,0,0
+ PRODUCTVERSION 6,1,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -1846,12 +1846,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Hexagon Metrology"
             VALUE "FileDescription", "Utility for Hexagon Metrology"
-            VALUE "FileVersion", "6.0.0.0"
+            VALUE "FileVersion", "6.1.0.0"
             VALUE "InternalName", "Usb_Util.exe"
             VALUE "LegalCopyright", "Copyright 2013 Hexagon Metrology."
             VALUE "OriginalFilename", "Usb_Util.exe"
             VALUE "ProductName", "Utility"
-            VALUE "ProductVersion", "6.0.0.0"
+            VALUE "ProductVersion", "6.1.0.0"
         END
     END
     BLOCK "VarFileInfo"

PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Send_Parameter.cpp

@@ -169,6 +169,7 @@ BEGIN_MESSAGE_MAP(CSO7_Send_Parameter, CDialog)
   ON_EN_KILLFOCUS(IDC_EDIT_SAMPLE_TIME_SCURVE, &CSO7_Send_Parameter::OnEnKillfocusEditSampleTimeScurve)
   ON_BN_CLICKED(IDC_BUTTON_START_SAMPLE_SCURVE, &CSO7_Send_Parameter::OnBnClickedButtonStartSampleScurve)
   ON_BN_CLICKED(IDC_BUTTON_STOP_SAMPLE_SCURVE, &CSO7_Send_Parameter::OnBnClickedButtonStopSampleScurve)
+  ON_BN_CLICKED(IDCANCEL, &CSO7_Send_Parameter::OnBnClickedCancel)
 END_MESSAGE_MAP()
 
 
@@ -981,4 +982,12 @@ void CSO7_Send_Parameter::OutputWithScroll(const CString &strNewText,CEdit &edtO
   edtOutput.LineScroll(iLine, 0);
   edtOutput.SetSel(iCount, iCount);
   edtOutput.SetRedraw(TRUE);
-}
+}
+//=====================================================================================
+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();
+}

PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_Send_Parameter.h

@@ -106,4 +106,5 @@ public:
 
   //=============================================
   void OutputWithScroll(const CString &strNewText,CEdit &edtOutput);
+  afx_msg void OnBnClickedCancel();
 };

PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/SO7_UtilDlg.cpp

@@ -203,6 +203,7 @@ BOOL CSO7_UtilDlg::OnInitDialog()
   GetDlgItem(IDC_BUTTON_FIXTURE_UPDOWN)->EnableWindow(false);
   GetDlgItem(IDC_BUTTON_SO7_READ_IN_PORT_STATUS)->EnableWindow(false);
   GetDlgItem(IDC_CHECK_CONTINUOUS_READ_IO_STATUS)->EnableWindow(false);
+  GetDlgItem(IDC_BUTTON_SO7_TEST_Z_SIGNAL)->EnableWindow(false);
 
   GetDlgItem(IDC_EDIT_SET_VER_NO)->EnableWindow(false);
   GetDlgItem(IDC_BUTTON_SET_SECTION)->EnableWindow(false);
@@ -359,6 +360,7 @@ void CSO7_UtilDlg::OnBnClickedButtonStartSo7machine()
   GetDlgItem(IDC_BUTTON_FIXTURE_UPDOWN)->EnableWindow(true);
   GetDlgItem(IDC_BUTTON_SO7_READ_IN_PORT_STATUS)->EnableWindow(true);
   GetDlgItem(IDC_CHECK_CONTINUOUS_READ_IO_STATUS)->EnableWindow(true);
+  GetDlgItem(IDC_BUTTON_SO7_TEST_Z_SIGNAL)->EnableWindow(true);
   
 
   GetDlgItem(IDC_EDIT_SET_VER_NO)->EnableWindow(true);
@@ -425,6 +427,7 @@ void CSO7_UtilDlg::OnBnClickedButtonStopSo7machine()
   GetDlgItem(IDC_BUTTON_FIXTURE_UPDOWN)->EnableWindow(false);
   GetDlgItem(IDC_BUTTON_SO7_READ_IN_PORT_STATUS)->EnableWindow(false);
   GetDlgItem(IDC_CHECK_CONTINUOUS_READ_IO_STATUS)->EnableWindow(false);
+  GetDlgItem(IDC_BUTTON_SO7_TEST_Z_SIGNAL)->EnableWindow(false);
 
   GetDlgItem(IDC_EDIT_SET_VER_NO)->EnableWindow(false);
   GetDlgItem(IDC_BUTTON_SET_SECTION)->EnableWindow(false);