Jelajahi Sumber

restore several control time delay to fix the xray collecting fail problem.

gsp 1 tahun lalu
induk
melakukan
20314cf500

+ 1 - 1
OTSCPP/OTSControl/Oxford/OTSOxfordImpl.cpp

@@ -650,7 +650,7 @@
 			
 
 
-			if (!ManagedGlobals::oxfordController->CollectXrayArea(a_nXRayAQTime, features, nCollectCount, GENERALXRAYCHANNELS))
+			if (!ManagedGlobals::oxfordController->CollectXrayFeatures(a_nXRayAQTime, features, nCollectCount, GENERALXRAYCHANNELS))
 			{
 				LogTrace(__FILE__, __LINE__, _T("COTSOxfordImpl::GetXRayArea failed"));
 				return false;

+ 4 - 4
OTSCPP/OTSControl/Oxford/OxfordWrapper/OxfordControllerWrapper.cpp

@@ -372,7 +372,7 @@ void OxfordControllerWrapper::ControllerThreadFunction()
 					break;
 				}
 			}
-			//Thread::Sleep(500);
+			Thread::Sleep(500);
 
 			m_endControllerEvent->Set();
 		}
@@ -1511,7 +1511,7 @@ bool OxfordControllerWrapper::CollectXrayPoints(const long a_nAcTimeMilliseconds
 
 	
 
-	//Thread::Sleep(1000);
+	Thread::Sleep(300);
 
 	m_startControllerEvent->Set();
 	long nCollectedTime = 1000;
@@ -1554,7 +1554,7 @@ bool OxfordControllerWrapper::CollectXrayPoints(const long a_nAcTimeMilliseconds
 	return false;
 }
 
-bool OxfordControllerWrapper::CollectXrayArea(const long a_nAcTimeMilliseconds, OxfordXrayData* a_pXrayDataList, const long a_nXrayDataCount, DWORD a_nBufferSize)
+bool OxfordControllerWrapper::CollectXrayFeatures(const long a_nAcTimeMilliseconds, OxfordXrayData* a_pXrayDataList, const long a_nXrayDataCount, DWORD a_nBufferSize)
 {
 	_oxfordControllerData.m_nCommand = OxfordControllerCommand::COLLECT_XRAYCHOILDLIST;
 	_oxfordControllerData.m_nAcTime = a_nAcTimeMilliseconds;
@@ -1572,7 +1572,7 @@ bool OxfordControllerWrapper::CollectXrayArea(const long a_nAcTimeMilliseconds,
 	_oxfordControllerData.m_nPixelNum = a_pXrayDataList[_oxfordControllerData.m_nCollectedXrayCounts].m_nPixelNum;
 	_oxfordControllerData.m_nCollectedPixelCounts = 0;
 
-	//Thread::Sleep(1000);
+	Thread::Sleep(300);
 
 	m_startControllerEvent->Set();
 

+ 1 - 1
OTSCPP/OTSControl/Oxford/OxfordWrapper/OxfordControllerWrapper.h

@@ -171,7 +171,7 @@ public:
 	bool CollectXrayPoint(const long a_nAcTime, long* a_pSpectrumData, DWORD a_nBufferSize);
 
 	bool CollectXrayPoints(const long a_nAcTime, OxfordXrayData* a_pXrayDataList, const long a_nXrayDataCount, DWORD a_nBufferSize);
-	bool CollectXrayArea(const long a_nAcTimeMilliseconds, OxfordXrayData* a_pXrayDataList, const long a_nXrayDataCount, DWORD a_nBufferSize);
+	bool CollectXrayFeatures(const long a_nAcTimeMilliseconds, OxfordXrayData* a_pXrayDataList, const long a_nXrayDataCount, DWORD a_nBufferSize);
 	bool SetScanSpeed(const long a_nMilliseconds);
 	bool GetImageSize(long& a_nWidth, long& a_nHeight);
 	bool SetImageSize(const long a_nWidth, const long a_nHeight);