Build V7.08

PcDmis/Base/Interfac/Msi/Hsi/STIL/Common/src/cAcqEasy.cpp

@@ -6,7 +6,7 @@
 //--------------------------------------------------------------------
 cAcqEasy::cAcqEasy(MCHR_ID SensorID)
 {
-#ifdef _RELEASE_FULL_VERSION
+#ifdef _DEBUG
   
   DWORD dwThreadId = 0;
   int nIndex = 0, idx = 0, jdx = 0;
@@ -56,13 +56,13 @@ cAcqEasy::cAcqEasy(MCHR_ID SensorID)
   hThread = ::CreateThread(0, 0, ProcessThread, LPVOID(this), 0, &dwThreadId);
 #else
   UNREFERENCED_PARAMETER(SensorID);
-#endif //_RELEASE_FULL_VERSION
+#endif //_DEBUG
 
 }
 //--------------------------------------------------------------------
 cAcqEasy::~cAcqEasy()
 {
-#ifdef _RELEASE_FULL_VERSION
+#ifdef _DEBUG
 
   int nIndex = 0;
 
@@ -96,10 +96,10 @@ cAcqEasy::~cAcqEasy()
     }
   }
   _ReleaseAcqBuffer(m_acqEasyParam.NumberOfBuffers);
-#endif //_RELEASE_FULL_VERSION
+#endif //_DEBUG
 
 }
-#ifdef _RELEASE_FULL_VERSION
+#ifdef _DEBUG
 //-------------------------------------------------------------------------------------------------
 void cAcqEasy::_ReleaseAcqBuffer(int NumberOfBuffers)
 {
@@ -2664,4 +2664,4 @@ bool cAcqEasy::GetSpectrumAcquisition(unsigned short *pSpectrum, unsigned short
   return(ret);
 }
 //--------------------------------------------------------------------
-#endif //_RELEASE_FULL_VERSION
+#endif //_DEBUG

PcDmis/Base/Interfac/Msi/Hsi/STIL/STIL_CCS_PRIMA_Laser.cpp

@@ -4,26 +4,26 @@
 
 CSTIL_CCS_PRIMA_Laser::CSTIL_CCS_PRIMA_Laser()
 {
-#ifdef _RELEASE_FULL_VERSION
+#ifdef _DEBUG
   ResetParam();
-#endif //_RELEASE_FULL_VERSION
+#endif //_DEBUG
 }
 
 CSTIL_CCS_PRIMA_Laser::~CSTIL_CCS_PRIMA_Laser(void)
 {
-#ifdef _RELEASE_FULL_VERSION
+#ifdef _DEBUG
   if (m_SensorId != 0)
   {
     CloseCom ();
   }
-#endif //_RELEASE_FULL_VERSION
+#endif //_DEBUG
 }
 
 //================================================================
 BOOL CSTIL_CCS_PRIMA_Laser::Init(int _Mode)
 {
   BOOL bStatus(FALSE);
-#ifdef _RELEASE_FULL_VERSION
+#ifdef _DEBUG
   ResetParam();
   switch(_Mode)
   {
@@ -45,20 +45,20 @@ BOOL CSTIL_CCS_PRIMA_Laser::Init(int _Mode)
   }
 #else
   UNREFERENCED_PARAMETER(_Mode);
-#endif //_RELEASE_FULL_VERSION
+#endif //_DEBUG
   return bStatus;
 }
 //================================================================
 BOOL CSTIL_CCS_PRIMA_Laser::Exit()
 {
   BOOL bStatus(FALSE);
-#ifdef _RELEASE_FULL_VERSION
+#ifdef _DEBUG
   bStatus=ReleaseAcquisition();
   if (m_SensorId != 0)
   {
     CloseCom ();
   }
-#endif //_RELEASE_FULL_VERSION
+#endif //_DEBUG
   return bStatus;
 }
 //================================================================
@@ -69,12 +69,12 @@ BOOL CSTIL_CCS_PRIMA_Laser::SetMeasureMode(int _MeasureMode)
   {
   case 0:
     {
-#ifdef _RELEASE_FULL_VERSION
+#ifdef _DEBUG
       double refractiveIndex = 1.5120;
       SetRefractiveIndex (refractiveIndex);
       int numberOfPointTRE(1);
       InitAcquisition (eMCHR_GetThicknessMeasurement, MCHR_TYPE_TRE, numberOfPointTRE);
-#endif //_RELEASE_FULL_VERSION
+#endif //_DEBUG
       break;
     }
   default:
@@ -88,7 +88,7 @@ BOOL CSTIL_CCS_PRIMA_Laser::SetMeasureMode(int _MeasureMode)
 BOOL CSTIL_CCS_PRIMA_Laser::GetDistance(double &_dDis1, double &_dDis2)
 {
   BOOL bStatus(FALSE);
-#ifdef _RELEASE_FULL_VERSION
+#ifdef _DEBUG
   double dbThickness(0.0),dblDistance1(0.0),dblDistance2(0.0),dblIntensity1(0.0),dblIntensity2(0.0);
   bool bSoftTrigger(true);
   bStatus=GetThicknessValue(dbThickness,dblDistance1,dblDistance2,dblIntensity1,dblIntensity2,bSoftTrigger);
@@ -97,14 +97,14 @@ BOOL CSTIL_CCS_PRIMA_Laser::GetDistance(double &_dDis1, double &_dDis2)
 #else
   UNREFERENCED_PARAMETER(_dDis1);
   UNREFERENCED_PARAMETER(_dDis2);
-#endif //_RELEASE_FULL_VERSION
+#endif //_DEBUG
   return bStatus;
 }
 //================================================================
 BOOL CSTIL_CCS_PRIMA_Laser::GetThicknessAllData(double &dbThickness, double &dblDistance1, double &dblDistance2, double &dblIntensity1, double &dblIntensity2)
 {
   BOOL bStatus(FALSE);
-#ifdef _RELEASE_FULL_VERSION
+#ifdef _DEBUG
   bool bSoftTrigger(true);
   bStatus=GetThicknessValue(dbThickness,dblDistance1,dblDistance2,dblIntensity1,dblIntensity2,bSoftTrigger);
 #else
@@ -113,10 +113,10 @@ BOOL CSTIL_CCS_PRIMA_Laser::GetThicknessAllData(double &dbThickness, double &dbl
   UNREFERENCED_PARAMETER(dblDistance2);
   UNREFERENCED_PARAMETER(dblIntensity1);
   UNREFERENCED_PARAMETER(dblIntensity2);
-#endif //_RELEASE_FULL_VERSION
+#endif //_DEBUG
   return bStatus;
 }
-#ifdef _RELEASE_FULL_VERSION
+#ifdef _DEBUG
 //================================================================
 void CSTIL_CCS_PRIMA_Laser::ResetParam()
 {
@@ -622,4 +622,4 @@ BOOL CSTIL_CCS_PRIMA_Laser::GetRefractiveIndex (double &indice)
   }
 
 }
-#endif //_RELEASE_FULL_VERSION
+#endif //_DEBUG

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

@@ -16,7 +16,7 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// 中文(简体，中国) resources
+// Chinese (Simplified, PRC) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS)
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
@@ -39,7 +39,7 @@ BEGIN
     EDITTEXT        IDC_EDIT_STATUS,247,270,199,117,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL
     GROUPBOX        "CMD",IDC_STATIC,102,12,193,116
     CONTROL         "连续读取",IDC_CHECK_CONTINUOUS_READ_IO_STATUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,380,144,47,10
-    PUSHBUTTON      "读取IO状态",IDC_BUTTON_SO7_READ_IN_PORT_STATUS,378,156,61,14
+    PUSHBUTTON      "点击读取",IDC_BUTTON_SO7_READ_IN_PORT_STATUS,378,156,61,14
     COMBOBOX        IDC_COMBO_OUTPORT_NUMBER,304,189,39,75,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     CONTROL         "开启",IDC_CHECK_SO7_OUT_PORT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,348,191,27,10
     PUSHBUTTON      "设置输出状态",IDC_BUTTON_SET_OUT_PORT,378,188,61,14
@@ -145,10 +145,10 @@ BEGIN
     PUSHBUTTON      "CNC Program",IDC_BUTTON_SO7_CNC_PROGRAM,104,144,60,18
     GROUPBOX        "Config",IDC_STATIC,17,73,81,99
     EDITTEXT        IDC_EDIT_RWDATA_DATA,353,244,44,13,ES_AUTOHSCROLL
-    PUSHBUTTON      "Write",IDC_BUTTON_SO7_SENDDATATOFPGA,406,218,34,19
+    PUSHBUTTON      "写",IDC_BUTTON_SO7_SENDDATATOFPGA,406,218,34,19
-    PUSHBUTTON      "Read",IDC_BUTTON_SO7_READDATAFROMFPGA,406,241,34,19
+    PUSHBUTTON      "读",IDC_BUTTON_SO7_READDATAFROMFPGA,406,241,34,19
-    LTEXT           "Addr",IDC_STATIC,333,225,16,8
+    LTEXT           "地址",IDC_STATIC,333,225,17,8
-    LTEXT           "Data",IDC_STATIC,333,246,16,8
+    LTEXT           "数据",IDC_STATIC,333,246,17,8
     COMBOBOX        IDC_COMBO_RWDATA_ADDR,353,221,45,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_COMBO_SO7_HOMEMODE,267,231,27,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "◥",IDC_BUTTON_SO7_MOVE_XR_YF,122,207,25,12
@@ -170,8 +170,8 @@ BEGIN
     PUSHBUTTON      "Set Ver NO.",IDC_BUTTON_SO7_SET_VER_NUMBER,230,45,60,15,BS_MULTILINE
     PUSHBUTTON      "确定",IDC_BUTTON_SET_SCALE_COEFFICIENT,202,285,34,19
     GROUPBOX        "光栅尺分辨率(μm)",IDC_STATIC,18,277,223,31
-    PUSHBUTTON      "General IO",IDC_BUTTON_S07_SET_IO_PURPOSE,104,65,60,15
+    PUSHBUTTON      "IO用途",IDC_BUTTON_S07_SET_IO_PURPOSE,104,65,60,15
-    PUSHBUTTON      "External Trig",IDC_BUTTON_SO7_EXTERNAL_TRIG,230,144,60,18
+    PUSHBUTTON      "外触发测试",IDC_BUTTON_SO7_EXTERNAL_TRIG,230,144,60,18
 END
 
 IDD_SO7_UTIL_SEND_PARAMETER DIALOGEX 0, 0, 750, 480
@@ -1636,12 +1636,24 @@ IDB_BITMAP_Z_DOWN       BITMAP                  "res\\bmp\\Z_DOWN.bmp"
 IDB_BITMAP_Z_UP         BITMAP                  "res\\bmp\\Z_UP.bmp"
 IDB_BITMAP_X_LEFT       BITMAP                  "res\\bmp\\X_LEFT.BMP"
 IDB_BITMAP_X_RIGHT      BITMAP                  "res\\bmp\\X_RIGHT.bmp"
-#endif    // 中文(简体，中国) resources
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// String Table
+//
+
+STRINGTABLE
+BEGIN
+    IDS_STRING_GERERAL_IO   "通用IO"
+    IDS_STRING_TRIG_IO      "触发IO"
+END
+
+#endif    // Chinese (Simplified, PRC) resources
 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
-// 英语(美国) resources
+// English (United States) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
@@ -2568,8 +2580,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 7,0,1,0
+ FILEVERSION 7,0,8,0
- PRODUCTVERSION 7,0,1,0
+ PRODUCTVERSION 7,0,8,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -2586,12 +2598,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Hexagon Metrology"
             VALUE "FileDescription", "Utility for Hexagon Metrology"
-            VALUE "FileVersion", "7.0.1.0"
+            VALUE "FileVersion", "7.0.8.0"
             VALUE "InternalName", "Usb_Util.exe"
             VALUE "LegalCopyright", "Copyright 2014 Hexagon Metrology."
             VALUE "OriginalFilename", "Usb_Util.exe"
             VALUE "ProductName", "Utility"
-            VALUE "ProductVersion", "7.0.1.0"
+            VALUE "ProductVersion", "7.0.8.0"
         END
     END
     BLOCK "VarFileInfo"
@@ -2600,6 +2612,16 @@ BEGIN
     END
 END
 
+#endif    // English (United States) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// English (United Kingdom) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
+#pragma code_page(1252)
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -2616,7 +2638,7 @@ BEGIN
     IDS_SO7_ABOUTBOX        "&About Utility for SO7..."
 END
 
-#endif    // 英语(美国) resources
+#endif    // English (United Kingdom) resources
 /////////////////////////////////////////////////////////////////////////////
 
 

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

@@ -627,13 +627,14 @@ void CSO7_UtilDlg::OnBnClickedButtonS07SetIoPurpose()
   {
     m_bETrigIO=TRUE;
     m_pSO7_Proto->_send_cmd_SO7_CMD_IO_PURPOSE(m_bETrigIO);
-    GetDlgItem(IDC_BUTTON_S07_SET_IO_PURPOSE)->SetWindowText(_T("Trigger IO"));
+   GetDlgItem(IDC_BUTTON_S07_SET_IO_PURPOSE)->SetWindowText(_T("触发IO"));
   }
   else
   {
     m_bETrigIO=FALSE;
     m_pSO7_Proto->_send_cmd_SO7_CMD_IO_PURPOSE(m_bETrigIO);
-    GetDlgItem(IDC_BUTTON_S07_SET_IO_PURPOSE)->SetWindowText(_T("General IO"));    
+    m_csString.LoadString(IDS_STRING_GERERAL_IO);
+    GetDlgItem(IDC_BUTTON_S07_SET_IO_PURPOSE)->SetWindowText(_T("通用IO"));    
   }
 }
 void CSO7_UtilDlg::OnBnClickedButtonSo7ReadAxisV()
@@ -1273,18 +1274,18 @@ void CSO7_UtilDlg::OnBnClickedButtonSo7ReadInPortStatus()
     if (m_BeginReadIO)
     {
       m_BeginReadIO=FALSE;
-      ((CButton*)GetDlgItem(IDC_BUTTON_SO7_READ_IN_PORT_STATUS))->SetWindowTextW(_T("¶ÁÈ¡IO״̬"));
+      ((CButton*)GetDlgItem(IDC_BUTTON_SO7_READ_IN_PORT_STATUS))->SetWindowTextW(_T("点击读取"));
     } 
     else
     {
       m_BeginReadIO=TRUE;
-      ((CButton*)GetDlgItem(IDC_BUTTON_SO7_READ_IN_PORT_STATUS))->SetWindowTextW(_T("Í£Ö¹"));
+      ((CButton*)GetDlgItem(IDC_BUTTON_SO7_READ_IN_PORT_STATUS))->SetWindowTextW(_T("点击停止"));
     }   
   }
   else
   {
     m_BeginReadIO=FALSE;
-    ((CButton*)GetDlgItem(IDC_BUTTON_SO7_READ_IN_PORT_STATUS))->SetWindowTextW(_T("¶ÁÈ¡IO״̬"));
+    ((CButton*)GetDlgItem(IDC_BUTTON_SO7_READ_IN_PORT_STATUS))->SetWindowTextW(_T("点击读取"));
     UpdateIOStatus();
     m_OutMessage.Format(_T("[Addr %d]:Data=%d"),m_ReadIOStatusAddr,(BYTE)m_pSO7_Proto->g_machine.InPortStatus);
     OutputWithScroll(m_OutMessage,m_edMSG);

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

@@ -20,6 +20,7 @@ protected:
 	DECLARE_MESSAGE_MAP()
   void UpdateCtrlsStatus(bool _bEnable);
 public:
+  CString m_csString;
 	CString m_OutMessage;
 	CString m_X_Pos;
 	CString m_Y_Pos;

PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/Usb_Util.vcxproj

@@ -206,7 +206,7 @@
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <TargetMachine>MachineX86</TargetMachine>
-      <AdditionalDependencies>..\..\..\..\..\..\..\ThirdParty\UsbSupport\LibUsb_Win\Lib\Msvc\libusb.lib;..\..\..\Videocard\SDK3000\sdk3000_7130.lib;..\..\..\Videocard\TC4000\Sa7134Capture.lib;..\..\..\Videocard\SV4000E\dataAcq.lib;..\..\..\Videocard\SV4000E\DXMediaCap.lib;..\..\..\ART\PCI8622_32.lib;..\..\..\STIL\Dll_chr.lib;..\..\..\Videocard\MV900\Convert.lib;..\..\..\Videocard\MV900\MVSDK.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>..\..\..\..\..\..\..\ThirdParty\UsbSupport\LibUsb_Win\Lib\Msvc\libusb.lib;..\..\..\Videocard\SDK3000\sdk3000_7130.lib;..\..\..\Videocard\TC4000\Sa7134Capture.lib;..\..\..\Videocard\SV4000E\dataAcq.lib;..\..\..\Videocard\SV4000E\DXMediaCap.lib;..\..\..\ART\PCI8622_32.lib;..\..\..\Videocard\MV900\Convert.lib;..\..\..\Videocard\MV900\MVSDK.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSO7|Win32'">

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

@@ -8,6 +8,8 @@
 #define IDC_BUTTON_MOVE_TO_XYZ          5
 #define IDS_ABOUTBOX                    7
 #define IDSTOP_AUTO_TEST_MITUTOYO       8
+#define IDS_STRING_GERERAL_IO           8
+#define IDS_STRING_TRIG_IO              9
 #define IDM_ABOUTBOX                    0x0010
 #define IDD_ABOUTBOX                    100
 #define IDD_MV_UTIL_DIALOG              101