Browse Source

improve the AcquireClearParticleImage function

gsp 1 year ago
parent
commit
a934221619

+ 2 - 2
Bin/x64/Debug/Config/SysData/OTSReportMgrParam.rpf

@@ -2,8 +2,8 @@
 <XMLData systype="IncA">
   <Member RegName="Scale" strValue="1000" />
   <Member RegName="DefaultComputedColName" strValue="Area,EquivalentCircleDiameter,MaxDiameter,MinDiameter,DiameterRatio,FerretDiameter,PERP,PERI,INSCR,MEAN,ELONG,ASPECT_ELONG,Orientation" />
-  <Member RegName="ElementsColName" strValue="O,Fe" />
+  <Member RegName="ElementsColName" strValue="C,O,Al,Fe,F,Ti,Na,Mn,Mg" />
   <Member RegName="PartSizeFile" name="lj2.psf" />
   <Member RegName="TRIO_CHART_TYPE" strValue="CaO.SiO₂.Al₂O₃" />
-  <Member RegName="SIZE_CAL_METHOD_TYPE" strValue="FERET" />
+  <Member RegName="SIZE_CAL_METHOD_TYPE" strValue="DMAX" />
 </XMLData>

+ 10 - 5
OTSIncAMeasureApp/ServiceCenter/FEIAutoScript/FEIScanController.cs

@@ -39,11 +39,16 @@ namespace OTSMeasureApp.ServiceCenter
         {
             int fieldWidth = 3072;
             int fieldHeight = 2048;
-            Rectangle r = new Rectangle();
-            CBSEImgClr bse = new CBSEImgClr(r);
-            bse.InitImageData(imageWidth, imageHeight);
-            byte[] imgData = new byte[imageWidth * imageHeight];
-            double mag=0;
+            //Rectangle r = new Rectangle();
+            //double curwidth=0, curheight=0;
+            //ApiClass.GetCurrentResolution(ref curwidth, ref curheight);
+            double mag =0;
+
+
+            CBSEImgClr bse = new CBSEImgClr(rec);
+            //bse.InitImageDa/*t*/a(imageWidth, imageHeight);
+            byte[] imgData= new byte[0];
+            //double mag=0;
             if (!ApiClass.RunAcquireImageRect(fieldWidth, fieldHeight, rec,ref mag, 2, "", ref imgData))
             {
                 return null;

+ 1 - 1
OTSIncAMeasureApp/ServiceCenter/FileHelper.cs

@@ -197,7 +197,7 @@ namespace OTSModelSharp.ServiceCenter
                     if (name.Equals("AcquireClearParticleImage"))
                     {
 
-                        value = ((XmlElement)node).GetAttribute("value");
+                        value = ((XmlElement)node).GetAttribute("Value");
 
                         break;
                     }