Bläddra i källkod

add function of collect xray in feature mode manually.

beijing 1 år sedan
förälder
incheckning
d1be8f35d9

+ 10 - 1
OTSIncAMeasureApp/5-OTSMeasureStatuImageFun/OTSMeasureStatusWindow.cs

@@ -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;

+ 2 - 1
OTSIncAMeasureApp/OTSIncAMeasureApp.csproj

@@ -220,7 +220,8 @@
     </Reference>
     <Reference Include="OINA.Extender, Version=6.1.0.0, Culture=neutral, PublicKeyToken=5efad68c95e0364e, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>E:\OTSSoftWare\OTS2_MiningDev\OpenDll\OxfordApi50Dll\OINA.Extender.dll</HintPath>
+      <HintPath>..\OpenDll\OxfordApi61Dll\OINA.Extender.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="OpenCvSharp">
       <HintPath>..\OpenDll\OpenCvSharp\OpenCvSharp.dll</HintPath>