Merge branch 'OTSRelease3_2' of http://36.129.163.148:30080/gogsadmin/OTS into OTSRelease3_2

Bin/x64/Debug/Config/SysData/OTSProgMgrParam.pmf

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XMLData RunMode="ProfessionalMode" SysType="IncA">
   <Member RegName="GenParam" DefaultArea="100" DefaultSampleName="Sample" DefaultShape="1" EngineType="0:InclustionEngine" MeasParamFileFolderName=".\Config\ProData\" MeasSwitch="true" PartSTDLibFolderName=".\Config\SysData\" PropertyDisplayMode="0" StdLibFileName="MineralSpectrumSTDLib" SteelTechnology="0" />
-  <Member RegName="ImageProcParam" AutoBGRemoveType="0:MIDDLE" BGRemoveType="0:AUTO" MatrixStep="50" OverlapParam="0" ParticleSelectionCondition="">
+  <Member RegName="ImageProcParam" AutoBGRemoveType="0:MIDDLE" BGRemoveType="1:MANUAL" MatrixStep="50" OverlapParam="0" ParticleSelectionCondition="">
     <Member RegName="BGGray" end="50" start="0" />
     <Member RegName="IncArea" end="2000" start="3" />
     <Member RegName="ParticleGray" end="255" start="0" />
@@ -11,5 +11,5 @@
     <Member RegName="XAxis" end="55000" start="-55000" />
     <Member RegName="YAxis" end="55000" start="-55000" />
   </Member>
-  <Member RegName="XrayParam" AnalyExpCount="100" IfAutoId="true" KnownElements="C,N,O,F,Na,Mg,Al,Si,P,S,Ca,Ti,V,Cr,Mn,Fe,Zr,Nb,Mo,La,Ce" MidAnalyAQTime="100" QuantifyMinSize="1" ScanMode="0:PointMode" SmallPartAQTime="100" UseFilter="false" UsingXray="true" XrayLimit="999999999" />
+  <Member RegName="XrayParam" AnalyExpCount="100" IfAutoId="true" KnownElements="C,N,O,F,Na,Mg,Al,Si,P,S,Ca,Ti,V,Cr,Mn,Fe,Zr,Nb,Mo,La,Ce" MidAnalyAQTime="100" QuantifyMinSize="1" ScanMode="0:PointMode" SmallPartAQTime="100" UseFilter="false" UsingXray="true" XrayLimit="50" />
 </XMLData>

Bin/x64/Debug/Config/SysData/OTSStage.stg

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData Modify="true" PathName=".\Config\SysData\OTSStage.stg" WorkingStageId="5">
+<XMLData Modify="false" PathName=".\Config\SysData\OTSStage.stg" WorkingStageId="0">
   <Collection RegName="Stagelist">
     <Member strName="圆形九圆孔50mm">
       <Member RegName="boundary" PolygonPoint="" rectDomian="0,0,50000,0" shape="0:ROUND" />
@@ -78,7 +78,16 @@
         <Member HoleName="18" rectDomian="-14500,-24500,12000,0" shape="0" />
       </Collection>
     </Member>
-    <Member strName="Apreo2S四孔方形台">
+    <Member strName="Cleanness三孔样品台">
+      <Member RegName="boundary" PolygonPoint="" rectDomian="0,0,120000,120000" shape="1:RECTANGLE" />
+      <Member RegName="std" PolygonPoint="" rectDomian="0,0,2,2" shape="1:RECTANGLE" />
+      <Collection RegName="Holes">
+        <Member HoleName="1" rectDomian="0,27140,47000,0" shape="0" />
+        <Member HoleName="2" rectDomian="-23500,-13570,47000,0" shape="0" />
+        <Member HoleName="3" rectDomian="23500,-13570,47000,0" shape="0" />
+      </Collection>
+    </Member>
+    <Member strName="Cleanness四孔方形台">
       <Member RegName="boundary" PolygonPoint="" rectDomian="0,0,154000,154000" shape="1:RECTANGLE" />
       <Member RegName="std" PolygonPoint="" rectDomian="0,0,2,0" shape="0:ROUND" />
       <Collection RegName="Holes">

OxfordExtenderWrapper/ExtenderWrapper.cs

@@ -1114,7 +1114,7 @@ namespace OxfordExtenderWrapper
             ReadMicroscopeColumn();
             if (m_dWorkingDistance != 0)
             {
-                bool ifwdread = true;
+                 ifwdread = true;
             }
             return (float)m_dWorkingDistance;
         }