|
@@ -1533,6 +1533,7 @@ namespace OTSMeasureApp
|
|
|
{
|
|
|
var expC = m_MeasureAppForm.m_ProjData.GetWorkingSample().GetMsrParams().GetXRayParam().GetAnalyExpCount();
|
|
|
var eds = EDSController.GetEDSController(m_iWidth,m_iHeight,expC);
|
|
|
+ var mode = m_MeasureAppForm.m_ProjData.GetWorkingSample().GetMsrParams().GetXRayParam().GetScanMode();
|
|
|
var part = new COTSParticleClr();
|
|
|
part.SetXRayPos(new Point(dMouseImgX, dMouseImgY));
|
|
|
var xray = part.GetXray();
|
|
@@ -1540,7 +1541,15 @@ namespace OTSMeasureApp
|
|
|
part.SetXray(xray);
|
|
|
var parts = new List<COTSParticleClr>();
|
|
|
parts.Add(part);
|
|
|
- eds.GetXRayByParts(parts, a_nXRayAQTime, true);
|
|
|
+ if (mode == otsdataconst.OTS_X_RAY_SCAN_MODE.PointMode)
|
|
|
+ {
|
|
|
+ eds.GetXRayByParts(parts, a_nXRayAQTime, true);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ eds.GetXRayByFeatures(parts, a_nXRayAQTime, true);
|
|
|
+ }
|
|
|
+
|
|
|
a_XrayData = parts[0].GetXray().GetXrayData();
|
|
|
a_strResult = parts[0].GetXray().GetQuantifiedElementsStr();
|
|
|
return true;
|