|
@@ -462,17 +462,17 @@ namespace OTSCLRINTERFACE
|
|
|
pXRayPoint->SetPosition(CPoint(a_BSEX, a_BSEY));
|
|
|
listXRayPoints.push_back(pXRayPoint);
|
|
|
|
|
|
- CPosXrayPtr pXRayPoint1 = CPosXrayPtr(new CPosXray());
|
|
|
+ /*CPosXrayPtr pXRayPoint1 = CPosXrayPtr(new CPosXray());
|
|
|
pXRayPoint1->SetPosition(CPoint(a_BSEX, a_BSEY));
|
|
|
- listXRayPoints.push_back(pXRayPoint1);
|
|
|
+ listXRayPoints.push_back(pXRayPoint1);*/
|
|
|
|
|
|
|
|
|
// set get quantify info flag
|
|
|
- m_pEDS->SetQuantification(FALSE);
|
|
|
-
|
|
|
+ //m_pEDS->SetQuantification(FALSE);
|
|
|
+ m_pEDS->SetQuantification(TRUE);
|
|
|
bool bRet = m_pEDS->GetXRayByPoints(listXRayPoints, a_nMilliseconds);
|
|
|
|
|
|
- std::vector<CPosXrayPtr> listXRayPointsTemp;
|
|
|
+ /*std::vector<CPosXrayPtr> listXRayPointsTemp;
|
|
|
CPosXrayPtr pXRayPointTemp = CPosXrayPtr(new CPosXray());
|
|
|
listXRayPointsTemp.push_back(pXRayPointTemp);
|
|
|
|
|
@@ -484,16 +484,16 @@ namespace OTSCLRINTERFACE
|
|
|
bool bRet = m_pEDS->GetXRayByPoints(listXRayPointsTemp, a_nMilliseconds);
|
|
|
|
|
|
listXRayPoints[i] = listXRayPointsTemp[0];
|
|
|
- }
|
|
|
+ }*/
|
|
|
|
|
|
DWORD* xrd;
|
|
|
|
|
|
- pXRayPoint = listXRayPoints[1];
|
|
|
+ pXRayPoint = listXRayPoints[0];
|
|
|
|
|
|
xrd = pXRayPoint->GetXrayData();
|
|
|
|
|
|
// element quantify data
|
|
|
- CElementChemistriesList& listElement = listXRayPoints[1]->GetElementQuantifyData();
|
|
|
+ CElementChemistriesList& listElement = listXRayPoints[0]->GetElementQuantifyData();
|
|
|
int nElementNum = (int)listElement.size();
|
|
|
CString strElementResult = _T("");
|
|
|
for (auto pElement : listElement)
|