|
@@ -488,7 +488,6 @@ namespace OTSCLRINTERFACE
|
|
|
m_pEDS->SetQuantification(TRUE);
|
|
|
|
|
|
bool bRet = m_pEDS->GetXRayByPoints(listXRayPoints, a_nMilliseconds);
|
|
|
- //bool bRet = m_LpEDSBase->GetXRayByFeaturesFromMultiPoint(listXRayPoints, listFeatures, a_nMilliseconds);
|
|
|
|
|
|
DWORD* xrd;
|
|
|
|
|
@@ -533,7 +532,6 @@ namespace OTSCLRINTERFACE
|
|
|
m_pEDS->SetQuantification(FALSE);
|
|
|
|
|
|
bool bRet = m_pEDS->GetXRayByPoints(listXRayPoints, a_nMilliseconds);
|
|
|
- //bool bRet = m_LpEDSBase->GetXRayByFeaturesFromMultiPoint(listXRayPoints, listFeatures, a_nMilliseconds);
|
|
|
|
|
|
std::vector<CPosXrayPtr> listXRayPointsTemp;
|
|
|
CPosXrayPtr pXRayPointTemp = CPosXrayPtr(new CPosXray());
|
|
@@ -587,7 +585,10 @@ namespace OTSCLRINTERFACE
|
|
|
CBSEImgPtr pbseImg = nullptr;
|
|
|
|
|
|
pbseImg = m_pScan->AcquireBSEImage(a_nMatrixIndex, nReads, nDwell);
|
|
|
-
|
|
|
+ if (pbseImg == nullptr)
|
|
|
+ {
|
|
|
+ return bRet;
|
|
|
+ }
|
|
|
sz = pbseImg->GetImageSize();
|
|
|
height = sz.cx;
|
|
|
width = sz.cy;
|
|
@@ -606,11 +607,5 @@ namespace OTSCLRINTERFACE
|
|
|
// return 0;
|
|
|
|
|
|
}
|
|
|
- //void COTSControlFunExport::InitDevPoint()
|
|
|
- //{
|
|
|
- //
|
|
|
- //
|
|
|
- //
|
|
|
- //
|
|
|
- //}
|
|
|
+
|
|
|
}
|