|
@@ -27,9 +27,9 @@ const long g_nMicrocopeConnectTimeOutMilliSeconds = 2000;
|
|
|
// Oxford single point delay time(ms)
|
|
|
const long g_nSinglePointCollectDelay = 3000;
|
|
|
const long g_nSingleFeatureCollectDelay = 5000;
|
|
|
-const long g_nXrayControllerConnectTimeOutMilliSeconds = 10000;
|
|
|
+const long g_nXrayControllerConnectTimeOutMilliSeconds =20000;
|
|
|
const long g_nImageTimeOutMilliSeconds = 40000;
|
|
|
-const long g_nStageTimeOutMilliSeconds = 15000;
|
|
|
+const long g_nStageTimeOutMilliSeconds = 40000;
|
|
|
|
|
|
|
|
|
|
|
@@ -1340,7 +1340,12 @@ void OxfordControllerWrapper::OnXrayAcquisitionFinished(Object^ sender, OINA::Ex
|
|
|
}
|
|
|
|
|
|
CString msg = Quant;
|
|
|
+ if (_oxfordControllerData.m_pXrayDataList == NULL)
|
|
|
+ {
|
|
|
+ return;
|
|
|
+ }
|
|
|
unsigned char* dst = _oxfordControllerData.m_pXrayDataList[_oxfordControllerData.m_nCollectedXrayCounts].m_strElementResult;
|
|
|
+
|
|
|
for (int i = 0; i < msg.GetLength(); i++)
|
|
|
{
|
|
|
dst[i] = (unsigned char)msg.GetAt(i);
|