Merge branch 'release2.1' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into release2.1

Bin/x64/Debug/Config/ProData/HardwareConfig.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XMLData PathName="HardwareConfig.xml" ID="1">
-  <Member RegName="SemControllerName" drive="OffLine" ImageInputSources="BSE" />
-  <Member RegName="EDSName" drive="OffLine" />
+  <Member RegName="SemControllerName" drive="Bruker" ImageInputSources="BSE" />
+  <Member RegName="EDSName" drive="Bruker" />
 </XMLData>

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

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData RunMode="ProfessionalMode" SysType="CleanlinessA">
-  <Member RegName="GenParam" DefaultArea="100" DefaultSampleName="Sample" DefaultShape="0" MeasParamFileFolderName=".\Config\ProData\" MeasSwitch="true" PartSTDLibFolderName=".\Config\SysData\" PropertyDisplayMode="0" StdLibFileName="Baohuzha" StdLibTypeIndex="0" SteelTechnology="0" UseSysSTD="true" />
-  <Member RegName="ImageProcParam" m_autoBGRemoveType="0" m_BGRemoveType="0">
+<XMLData RunMode="ProfessionalMode" SysType="IncA">
+  <Member RegName="GenParam" DefaultArea="100" DefaultSampleName="Sample" DefaultShape="0" MeasParamFileFolderName=".\Config\ProData\" MeasSwitch="true" PartSTDLibFolderName=".\Config\SysData\" PropertyDisplayMode="0" StdLibFileName="NoSTDDB" StdLibTypeIndex="0" SteelTechnology="0" UseSysSTD="true" />
+  <Member RegName="ImageProcParam" m_autoBGRemoveType="0" m_BGRemoveType="1">
     <Member RegName="BGGray" end="255" start="150" />
     <Member RegName="IncArea" end="100" start="5" />
     <Member RegName="ParticleGray" end="150" start="0" />
   </Member>
   <Member RegName="ImageScanParam" FieldAreaPercentage="0" FieldLargeParticlePercentage="0" FieldLargeParticles="0" FieldSmallParticlePercentage="0" FieldSmallParticles="0" FieldStopMode="0" ImagePixelSize="2" SatrtImageMode="0" ScanImageSpeed="0" StopMode="0" StopParamFields="200" StopParamMeasTime="360" StopParamParticles="5000" />
-  <Member RegName="StageData" MinMag="140" scanFieldSize="1970" xAxisDir="0" yAxisDir="1">
-    <Member RegName="XAxis" end="100000" start="-10000" />
-    <Member RegName="YAxis" end="100000" start="-10000" />
+  <Member RegName="StageData" MinMag="60" scanFieldSize="1270" xAxisDir="1" yAxisDir="0">
+    <Member RegName="XAxis" end="55000" start="-55000" />
+    <Member RegName="YAxis" end="55000" start="-55000" />
   </Member>
   <Member RegName="XrayParam" AnalyExpCount="10000" AnalySpeed="0" MidAnalyAQTime="1000" MidSearchAQTime="20" ScanMode="0" SearchSpeed="1" ShowExpCount="true" ShowScanMode="true" ShowSpeed="true" UsingXray="0" XRaySearchCount="5000" />
 </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="2">
+<XMLData Modify="true" PathName=".\Config\SysData\OTSStage.stg" WorkingStageId="1">
   <Collection RegName="Stagelist">
     <Member strName="圆形九圆孔50mm">
       <Member RegName="boundary" PolygonPoint="" rectDomian="0,0,50000,0" shape="0" />

OTSIncAReportApp/Control_Grids/OTSIncAReportGridsFuncation/OTSIncAReportGridsFun.cs

@@ -18,8 +18,8 @@ namespace OTSIncAReportGrids.OTSIncAReportGridsFuncation
         #endregion
 
         #region 定义变量
-       
-       
+        //电镜设置对象
+        public NSOTSController.COTSControlFunExport m_cfun = null;
 
         //为了加快颗粒列表抠图的速度，这里保存一个全局变量
         public List<Field> m_list_COTSFieldMgrClr = null;
@@ -32,7 +32,7 @@ namespace OTSIncAReportGrids.OTSIncAReportGridsFuncation
         Hashtable table;
 
         OTSIncAReportApp.frmReportApp m_frmReportApp = null;
-       public COTSControlFunExport m_cfun = null;
+       //public COTSControlFunExport m_cfun = null;
 
         #endregion
 

OTSIncAReportApp/Control_Grids/ParticlesGridDevidePage.cs

@@ -194,6 +194,9 @@ namespace OTSIncAReportGrids
             //str2 = table["str2"].ToString();
             //m_frm_userprogress.SetProgressValueAndText(1, str2);
             m_OTSIncAReportGridsFun = new OTSIncAReportGridsFun(m_ReportApp, this);
+            //初始化底层操作类
+            m_OTSIncAReportGridsFun = new OTSIncAReportGridsFun(m_ReportApp, this);
+
             if (Language.ReadDefaultLanguage() == "EN")
             {
                 cbB_order.Items.Add("Default");