完善测试功能。

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

@@ -3,6 +3,19 @@
 #include "STIL_CCS_PRIMA_Laser.h"
 
 CSTIL_CCS_PRIMA_Laser::CSTIL_CCS_PRIMA_Laser()
+{
+  ResetParam();
+}
+
+CSTIL_CCS_PRIMA_Laser::~CSTIL_CCS_PRIMA_Laser(void)
+{
+  if (m_SensorId != 0)
+  {
+    CloseCom ();
+  }
+}
+//================================================================
+void CSTIL_CCS_PRIMA_Laser::ResetParam()
 {
   m_SensorId = 0;
   m_ErrorCode = SPARKSHI_ERROR_NONE;
@@ -17,17 +30,11 @@ CSTIL_CCS_PRIMA_Laser::CSTIL_CCS_PRIMA_Laser()
   m_pIntensity2 = NULL;
 }
 
-CSTIL_CCS_PRIMA_Laser::~CSTIL_CCS_PRIMA_Laser(void)
-{
-  if (m_SensorId != 0)
-  {
-    CloseCom ();
-  }
-}
 //================================================================
 BOOL CSTIL_CCS_PRIMA_Laser::Init(int _Mode)
 {
   BOOL bStatus(FALSE);
+  ResetParam();
   switch(_Mode)
   {
   case 0:
@@ -67,10 +74,9 @@ BOOL CSTIL_CCS_PRIMA_Laser::SetMeasureMode(int _MeasureMode)
   {
   case 0:
     {
-      double refractiveIndex = 1.51;
+      double refractiveIndex = 1.5120;
       SetRefractiveIndex (refractiveIndex);
       int numberOfPointTRE(1);
-      numberOfPointTRE=5;
       InitAcquisition (eMCHR_GetThicknessMeasurement, MCHR_TYPE_TRE, numberOfPointTRE);
       break;
     }
@@ -92,7 +98,7 @@ BOOL CSTIL_CCS_PRIMA_Laser::GetDistance(double &_dDis1, double &_dDis2)
   _dDis2=dblDistance2;
   return bStatus;
 }
-
+//================================================================
 BOOL CSTIL_CCS_PRIMA_Laser::GetThicknessAllData(double &dbThickness, double &dblDistance1, double &dblDistance2, double &dblIntensity1, double &dblIntensity2)
 {
   BOOL bStatus(FALSE);
@@ -355,27 +361,28 @@ WORD CSTIL_CCS_PRIMA_Laser::GetLastError ()
 
 BOOL CSTIL_CCS_PRIMA_Laser::CloseCom ()
 {
+  BOOL bStatus(FALSE);
   m_ErrorCode = SPARKSHI_ERROR_NONE;
   if (m_SensorId != 0)
   {
     if (MCHR_CloseChr (m_SensorId) == MCHR_ERROR_NONE)
     {
       m_SensorId = 0;
-      return (TRUE);
+      bStatus= (TRUE);
     }
     else
     {
       m_ErrorCode = MCHR_GetLastError (m_SensorId);
-      return(FALSE);
+      bStatus=(FALSE);
     }
     MCHR_Release();
   }
   else
   {
     m_ErrorCode = SPARKSHI_ERROR_SENSOR_NOT_CONNECTED;
-    return(FALSE);
+    bStatus=(FALSE);
   }
-
+  return bStatus;
 }
 
 

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

@@ -27,6 +27,7 @@ public:
   BOOL GetDistance(double &dblDistance1, double &dblDistance2);
   BOOL GetThicknessAllData(double &dbThickness, double &dblDistance1, double &dblDistance2, double &dblIntensity1, double &dblIntensity2);
 private :
+  void ResetParam();
   BOOL InitChrLib();
 
   // Open connection on your controller with MCHR_SERIAL_CONNECTION or MCHR_USB_CONNECTION

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

@@ -140,8 +140,15 @@ void CSTIL_CCS_PRIMA_Dlg::OnTimer(UINT_PTR nIDEvent)
   {
   case 1:
     {
-      g_pSTIL_CCS_PRIMA->GetThicknessAllData(m_dThickness,m_dDis1,m_dDis2,m_dIntensity1,m_dIntensity2);
-      m_csMsg.Format(_T("Thick:%.4f,Dis1:%.4f,Dis2:%.4f,Int1:%.4f,Int2:%.4f\n"),m_dThickness,m_dDis1,m_dDis2,m_dIntensity1,m_dIntensity2);
+      BOOL bRet=g_pSTIL_CCS_PRIMA->GetThicknessAllData(m_dThickness,m_dDis1,m_dDis2,m_dIntensity1,m_dIntensity2);
+      if (bRet)
+      {
+        m_csMsg.Format(_T("Thick:%.4f,Dis1:%.4f,Dis2:%.4f,Int1:%.4f,Int2:%.4f\n"),m_dThickness,m_dDis1,m_dDis2,m_dIntensity1,m_dIntensity2);
+      } 
+      else
+      {
+        m_csMsg.Format(_T("Get data err:%d"),bRet);
+      }
       OutputWithScroll(m_csMsg,m_edMsg);
     }
     break;