xhouse/EF3-Interface
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build V7.08

Browse Source
This commit is contained in:
TAO Cheng
2014-09-04 17:18:40 +08:00
parent 1d6bea2f38
commit d9932e709c
8 changed files with 69 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PcDmis/Base/Interfac/Msi/Hsi/STIL/Common/src/cAcqEasy.cpp
+6 -6
View File
@@ -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
+16 -16
View File
@@ -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