新增CCS-PRIMA使能参数设置。

This commit is contained in:
TAO Cheng
2014-06-04 14:35:27 +08:00
parent ff4f68d009
commit 59d5b292a2
10 changed files with 101 additions and 22 deletions
@@ -12,6 +12,8 @@
class cAcqEasy
{
private:
#ifdef _RELEASE_FULL_VERSION
HANDLE hThread;
static DWORD WINAPI ProcessThread (LPVOID lpArg);
DWORD ProcessThread(void);
@@ -41,10 +43,12 @@ private:
//try to determine and set the sensor mode and digital output
bool _SetSensorModeAndDigitalOutput(sAcqEasyParam *pAcqEasyParam);
#endif //_RELEASE_FULL_VERSION
public:
cAcqEasy(MCHR_ID SensorID);
~cAcqEasy();
#ifdef _RELEASE_FULL_VERSION
//start spectrum acquisition
bool StartSpectrumAcquisition(unsigned short **ppSpectrum, unsigned short *pFirstUsablePixel, unsigned short *pBufferSize);
@@ -81,6 +85,8 @@ public:
bool GetTransmittedData_DuoSawliDistance(PFLOAT pArrayDistance, PFLOAT pArrayQuality, PFLOAT pArrayIntensity, PFLOAT pArrayCounter, PFLOAT pArrayStatus, int* pDataCount);
bool GetTransmittedData_DuoSawliThickness(PFLOAT pArrayThickness1, PFLOAT pArrayThickness2, PFLOAT pArrayThickness3, PFLOAT pArrayQuality1, PFLOAT pArrayQuality2, PFLOAT pArrayQuality3, PFLOAT pArrayIntensity, PFLOAT pArrayNbThickness, PFLOAT pArrayCounter, PFLOAT pArrayStatus, int* pDataCount);
short GetStatusAcquisition(char *pMessage);
#endif //_RELEASE_FULL_VERSION
};
#endif //AFX_ACQUISITION_EASY_H_INCLUDED_
@@ -6,6 +6,8 @@
//--------------------------------------------------------------------
cAcqEasy::cAcqEasy(MCHR_ID SensorID)
{
#ifdef _RELEASE_FULL_VERSION
DWORD dwThreadId = 0;
int nIndex = 0, idx = 0, jdx = 0;
UNREFERENCED_PARAMETER(jdx);
@@ -52,10 +54,16 @@ cAcqEasy::cAcqEasy(MCHR_ID SensorID)
ZeroMemory(&m_acqParam, sizeof(MCHR_tyAcqParam));
//open process thread
hThread = ::CreateThread(0, 0, ProcessThread, LPVOID(this), 0, &dwThreadId);
#else
UNREFERENCED_PARAMETER(SensorID);
#endif //_RELEASE_FULL_VERSION
}
//--------------------------------------------------------------------
cAcqEasy::~cAcqEasy()
{
#ifdef _RELEASE_FULL_VERSION
int nIndex = 0;
//close process thread
@@ -88,7 +96,10 @@ cAcqEasy::~cAcqEasy()
}
}
_ReleaseAcqBuffer(m_acqEasyParam.NumberOfBuffers);
#endif //_RELEASE_FULL_VERSION
}
#ifdef _RELEASE_FULL_VERSION
//-------------------------------------------------------------------------------------------------
void cAcqEasy::_ReleaseAcqBuffer(int NumberOfBuffers)
{
@@ -2653,3 +2664,4 @@ bool cAcqEasy::GetSpectrumAcquisition(unsigned short *pSpectrum, unsigned short
return(ret);
}
//--------------------------------------------------------------------
#endif //_RELEASE_FULL_VERSION