From ff4f68d009f59f3b454818f11ae006dcebab1f51 Mon Sep 17 00:00:00 2001 From: TAO Cheng Date: Thu, 29 May 2014 21:23:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=B5=8B=E8=AF=95=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Msi/Hsi/STIL/STIL_CCS_PRIMA_Laser.cpp | 35 +++++++++++------- .../Msi/Hsi/STIL/STIL_CCS_PRIMA_Laser.h | 1 + .../UsbUtility/UsbUtil/STIL_CCS_PRIMA_Dlg.cpp | 11 +++++- .../Hsi/Tools/UsbUtility/UsbUtil_VS2010.suo | Bin 150016 -> 150016 bytes 4 files changed, 31 insertions(+), 16 deletions(-) diff --git a/PcDmis/Base/Interfac/Msi/Hsi/STIL/STIL_CCS_PRIMA_Laser.cpp b/PcDmis/Base/Interfac/Msi/Hsi/STIL/STIL_CCS_PRIMA_Laser.cpp index 49e9449..7c51ef7 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/STIL/STIL_CCS_PRIMA_Laser.cpp +++ b/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; } diff --git a/PcDmis/Base/Interfac/Msi/Hsi/STIL/STIL_CCS_PRIMA_Laser.h b/PcDmis/Base/Interfac/Msi/Hsi/STIL/STIL_CCS_PRIMA_Laser.h index b3ae696..b7e0c54 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/STIL/STIL_CCS_PRIMA_Laser.h +++ b/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 diff --git a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/STIL_CCS_PRIMA_Dlg.cpp b/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/STIL_CCS_PRIMA_Dlg.cpp index e1d09d3..4648ad1 100644 --- a/PcDmis/Base/Interfac/Msi/Hsi/Tools/UsbUtility/UsbUtil/STIL_CCS_PRIMA_Dlg.cpp +++ b/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; 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 534a1068522462a5845f47cbd26266f628faa909..c408d0c7807cde0c4f0be637458cd52dfdaabfb3 100644 GIT binary patch delta 1440 zcmZWpe@s(X6n^LS72bo#Z>SWjMP!Uj!dhaMsK83-lucL2G{j`;2>WA<5$)hz~Q5^&*G33^s6077P^M);G+SFd>QtXdRpD&|zc9vSiL^QW7^*c3;_(EW61`@BQv~ zzIV=dZtCe0Jzb)|i8qFnHNTfD@AGef2t3De8(3f{4+@p2v6>elg`M-BVRAw!Ua+#` zfDTbPy_$~mb{bvzRpgAIF$T!y8a_>v+x99Q&n}}Ld!-1;3`^G;O4MF0iXgCa$1_acwpW5NOgjl% zl{;1YdGXq=A+_&|vyT6Kj}BWlDJIwGTKFGKk2ac2TbQ1{s@TTN!a2C2n$Y+)ff>De z#dT0Ln6wU8*6uNV=lm|lr-eIDX`0k3XDPMKGel@JzHZsHc+!F2x4_HP^Nx$T;8dO* zz7#KsdNQ|rOc_5`X7T#N7td9utXTQw9^SwR{|<(oVx|trLjX7E;o&nhtvU-G_d%rM zk(ZRBkspaS5bpnqV6X%1)b{3Ev{gw|TGTcP_cntSt<5mnKS2`RoSVt6Wzj>A7jC3B zQ?1t|;DukoLYuF)qiqgc)HN@`1Xft!5WO35D2_=(s>tQD9IsvymBT?=X|yZyFReV* zmy%lJ^X!ht;|Jggc20qy)ZJ+(X$#yd+*WQMw}(5#9ppab_R)tCyJEYWNdybyf28Xv z@WC876jDst6|+M13Z~5`X1^M> zLXbU7-mXU91xZlD%}@x`5s*+i0aMNFO{UwC+lF_Zm{5me0dw@bv=;_+Vm#u!Ch}t+sF#B;I!( z2z_wNp*p6Z7%*=JA~2+ho}rQHT(N<%wWhz(pf*f4ue^bM%xc?5BYu=qn_z}^fW*op7(=AEx*Z1Qo~`bvjg1%3JVYt-)1jRdxPm{ zo`q>PUA?O=8o5=c*3H3n0(1E36bw`U^#W`zB~H~Dfo~0JcmWDiaQi)QqdS{41fmc! zpmQEcpbgirLuzyhisH;kz;OvIQdm4?_j)X=TL{^hivC_G zp^n=oqxMf2Gh+a4Mk3%)9|(!XoaR#j3xCWfnjDgRnS{qyGueh2X7VR}AWQUPmq~ri iOadgZp3H$dw~qKkZ*Dd%$!!P}lF3|tXtk;;BEdf}1?*h_ delta 1556 zcmYLJeQZ-z6u-aQ*R5}~UH1taV_y_$Cef~nhEF?J1Px&mjX{I*B?gp~!X8AT#11hi zj4`;l189bfWok&u^g*8};siuuWbM?DZ7yL<{t_@jiV??$_m!31VD;*W0w+&*ZDGvG;-bE`K`aVd#htl+y|3uc z921e|kU9BV#DCtWRXC-cHBzIpMx0VA^+aWjsxq65??~HWlQt=>&4ssvEggj^{d+7>2{NTYU!8Xo>BDWzUoXB*)osp7QjB^pveB_n;PmB((1EHsRUZBfQV$>3JPFmewPjKiMzOnk_zA@FMw} zkuCalH+eU~Mt2)AN3V_c*jrC?T6zI3qe3hs3yzg?n!cF9e@LGw%|W(Yl$CB1g9Cou zf7aqsQ6!_gqzu#Qi6tAX^)@K03r(*BUq#_hBE+bMZpaaw83w z==*MLqoy`ID*R{N5}T_ZxbczI`j^b=7F9!a)}_+ADUJ>8P%=`Lgm!EAZQOb@7bndt zi)c2g<%v}i^Hd5)S}|gx`m-l!Qwgff%NmIi#N<;m$sSI@jKoUVZ6bWCM9e;QOmqeu zhGQ+pqFsZNJay=aZh{BRLAVX~X7sC+6~Rmqf5}00?_xW}dNIlv)rfJRaFdB?LVvob zEGnmGb|4zvBXisLK_Pwt#dM_w`Ly{4vMJJqBUF0;3dR|CTL4RY8@Py1*i0QZKHcd2 z8Gc0Dak|W=N}_oqWPgNRiFP3fM3UVT1LsPuE9AaPZ^ZBi2JiJW-U=U`xD7XjenlE} zcB6}UH%{Pda`fR4t#WfGd4IzdviIR9QrhGoh0j%_GiJWtGiFmiq<9M|D11}qfBZXM zZC;6TYU@CeG4ni5f;@ZCBTAo5qv-^j;p{;nqW!3_V2`Nxj2GVg7k1^_M8laPOCOs> ztFthflopI>9?c&xX11CY)=uXEBQSvD7V`AUMqh#_Gnzo$Vp8=+|3$!JekMp8Lai+# zd3B8RVF;7b3Y=gpLrSI;hm|dc86nzp9V@7zfKQ`oWBAqfLe3{mp5pUW`>K4tjq(6<`Cs!Vb?Ci& zI>hr+ QR5>KmlLK!g=5Ray2hg4U-v9sr