修改颗粒回溯bug

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

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XMLData PathName="BrukerDllVersion.xml" ID="1">
-  <Member RegName="BrukerDllVersion" Version="Bruker.API.Esprit2.1.dll" />
+  <Member RegName="BrukerDllVersion" Version="Bruker.API.Esprit2.2.dll" />
 </XMLData>

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/ProData/ReportTemplateConfig.xml

@@ -8,18 +8,18 @@
     <b_ck_jggk>True</b_ck_jggk>
   </M_SY>
   <M_YMYJ>
-    <str_tb_ymwb>夹杂物分析报告</str_tb_ymwb>
+    <str_tb_ymwb>hbbbbbbbb</str_tb_ymwb>
     <str_tb_KHH>Copi0000123012</str_tb_KHH>
     <b_ck_ym>True</b_ck_ym>
-    <str_tb_yjwb>OTS-IncA Report System</str_tb_yjwb>
+    <str_tb_yjwb>aaaaaaaaaaa</str_tb_yjwb>
   </M_YMYJ>
   <M_KLFXJG>
     <b_ck_klcc_xsmk>True</b_ck_klcc_xsmk>
-    <index_cb_klcc_jsfs>0</index_cb_klcc_jsfs>
-    <index_cb_klcc_ljb>0</index_cb_klcc_ljb>
-    <index_cb_klcc_klfw>0</index_cb_klcc_klfw>
+    <index_cb_klcc_jsfs>1</index_cb_klcc_jsfs>
+    <index_cb_klcc_ljb>1</index_cb_klcc_ljb>
+    <index_cb_klcc_klfw>1</index_cb_klcc_klfw>
     <b_cb_jzwfl_xsmk>True</b_cb_jzwfl_xsmk>
-    <index_cb_jzwfl_xstx>2</index_cb_jzwfl_xstx>
+    <index_cb_jzwfl_xstx>4</index_cb_jzwfl_xstx>
     <index_cb_jzwfl_jsfs>0</index_cb_jzwfl_jsfs>
     <index_cb_jzwfl_ljb>0</index_cb_jzwfl_ljb>
     <index_cb_jzwfl_klfw>0</index_cb_jzwfl_klfw>
@@ -44,17 +44,9 @@
     <index_cb_yscf_xstx>1</index_cb_yscf_xstx>
     <index_cb_yscf_jsfs>0</index_cb_yscf_jsfs>
     <index_cb_yscf_klfw>0</index_cb_yscf_klfw>
-    <str_tb_yscf_ysxx>O,Al,Mg,Ca,Ti,Si,S,Mn,N</str_tb_yscf_ysxx>
+    <str_tb_yscf_ysxx>H</str_tb_yscf_ysxx>
     <list_str_tb_yscf_ysxx>
-      <YS0>O</YS0>
-      <YS1>Al</YS1>
-      <YS2>Mg</YS2>
-      <YS3>Ca</YS3>
-      <YS4>Ti</YS4>
-      <YS5>Si</YS5>
-      <YS6>S</YS6>
-      <YS7>Mn</YS7>
-      <YS8>N</YS8>
+      <YS0>H</YS0>
     </list_str_tb_yscf_ysxx>
   </M_YSFXJG>
   <M_SYXT>

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

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData RunMode="" SysType="">
+<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="ImageProcParam" m_autoBGRemoveType="0" m_BGRemoveType="0">
     <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="45" scanFieldSize="1270" xAxisDir="1" yAxisDir="0">
-    <Member RegName="XAxis" end="55000" start="-55000" />
-    <Member RegName="YAxis" end="55000" start="-55000" />
+  <Member RegName="ImageScanParam" FieldAreaPercentage="0" FieldLargeParticlePercentage="0" FieldLargeParticles="0" FieldSmallParticlePercentage="0" FieldSmallParticles="0" FieldStopMode="0" ImagePixelSize="1" SatrtImageMode="0" ScanImageSpeed="0" StopMode="0" StopParamFields="200" StopParamMeasTime="360" StopParamParticles="5000" />
+  <Member RegName="StageData" MinMag="45" scanFieldSize="1970" xAxisDir="1" yAxisDir="0">
+    <Member RegName="XAxis" end="100000" start="-10000" />
+    <Member RegName="YAxis" end="100000" start="-10000" />
   </Member>
-  <Member RegName="XrayParam" AnalyExpCount="10000" AnalySpeed="0" MidAnalyAQTime="1000" MidSearchAQTime="20" ScanMode="0" SearchSpeed="1" ShowExpCount="false" ShowScanMode="false" ShowSpeed="false" UsingXray="0" XRaySearchCount="5000" />
+  <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/OTSReportMgrParam.rpf

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XMLData FileFolderRptTemp=".\Config\ProData\" FileFolderSTD="OTSParticleSTD.xml" FileFolderSize=".\Config\ProData\" FileFolderTrigTemp=".\Config\ProData\" FilePathRptTemp="" Scale="1000" Version="1.1.1">
   <Member RegName="DefaultComputedColName" strValue="Area,EquivalentCircleDiameter,MaxDiameter,MinDiameter,DiameterRatio,FerretDiameter,PERI,ELONG" />
-  <Member RegName="ElementsColName" strValue="Ar,Al,Si,B,P,C,S,N,Cl,O,F,Ne,He,Lr,Lu,Rn,Xe,Kr,Md,Tm,Po,Te,Se,Es,Ho,Pb,Sn,Ge,Np,Pm,Os,Ru,Fe,Bk,Tb,Hg,Cd,Zn,Pa,Pr,W,Mo,Cr,No,Yb,At,I,Br,Fm,Er,Bi,Sb,As,Hf,Zr,Ti,Am,Eu,Pt,Pd,Ni,U,Nd,Re,Tc,Mn,Cf,Dy,Tl,In,Ga,Ra,Ba,Sr,Ca,Cm,Gd,Au,Ag,Cu,Th,Ce,Ta,Pu,Nb,Sm,V,Ir,Rh,Co,Ac,La,Y,Sc,Fr,Cs,Rb,K,Na,Mg,Be,Li,H" />
+  <Member RegName="ElementsColName" strValue="Be,Li,H" />
   <Member RegName="PartSizeFile" FileMark="626" Name="lj.psf" Sizes="" Version="1.1.1" />
   <Member RegName="TriTempFile" Name="DefaultTriTemplateFile.tpf" Version="1.3.1">
     <Collection RegName="TemplateItem" />

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="0">
+<XMLData Modify="true" PathName=".\Config\SysData\OTSStage.stg" WorkingStageId="2">
   <Collection RegName="Stagelist">
     <Member strName="圆形九圆孔50mm">
       <Member RegName="boundary" PolygonPoint="" rectDomian="0,0,50000,0" shape="0" />
@@ -31,5 +31,15 @@
         <Member HoleName="9" rectDomian="0,0,12000,0" shape="0" />
       </Collection>
     </Member>
+    <Member strName="SquareWithFourHole100mm">
+      <Member RegName="boundary" PolygonPoint="" rectDomian="0,0,100000,100000" shape="1" />
+      <Member RegName="std" PolygonPoint="" rectDomian="0,0,6000,0" shape="0" />
+      <Collection RegName="Holes">
+        <Member HoleName="1" rectDomian="25000,-25000,40000,0" shape="0" />
+        <Member HoleName="2" rectDomian="25000,25000,40000,0" shape="0" />
+        <Member HoleName="3" rectDomian="-25000,25000,40000,0" shape="0" />
+        <Member HoleName="4" rectDomian="-25000,-25000,40000,0" shape="0" />
+      </Collection>
+    </Member>
   </Collection>
 </XMLData>

OTSIncAReportApp/Control_Graph/Controls/Control_DrawDistrbutionImageAndBSE.cs

@@ -1390,7 +1390,8 @@ namespace OTSIncAReportGraph.Controls
                 //第二步，移动到指定位置,先读取再设置
                 if (m_OTSIncAReportFun.m_SEMConnectionState == true)
                 {
-                    m_OTSIncAReportFun.MoveSemToPointXY_ForDrawDistrbutionImageAndBSE(sem_point.X, sem_point.Y);
+                    //m_OTSIncAReportFun.MoveSemToPointXY_ForDrawDistrbutionImageAndBSE(sem_point.X, sem_point.Y);
+                    bool MoveFlag=m_OTSIncAReportFun.m_cfun.SetSemPositionXY(sem_point.X, sem_point.Y, 0);
                 }
 
                 Thread.Sleep(500);

OTSIncAReportApp/Control_Graph/OTSIncAReportGraphFuncation/OTSIncAReportFun.cs

@@ -91,6 +91,7 @@ namespace OTSIncAReportGraph.OTSIncAReportGraphFuncation
         {
             m_Control_DrawDistrbutionImageAndBSE = in_Control_DrawDistrbutionImageAndBSE;
             resultFile = result;
+            m_cfun = new COTSControlFunExport();//重新new一下试试呢,不New并不好用  It's better to reinitialize, but it's not good to uninitialize
 
             table = lan.GetNameTable("OTSIncAReportFun");
         }
@@ -104,6 +105,7 @@ namespace OTSIncAReportGraph.OTSIncAReportGraphFuncation
         {
             m_Control_DrawdistrbutionsortImage = in_Control_DrawDistrbutionSortimage;
             resultFile = result;
+            m_cfun = new COTSControlFunExport();//重新new一下试试呢,不New并不好用  It's better to reinitialize, but it's not good to uninitialize
 
             table = lan.GetNameTable("OTSIncAReportFun");
         }
@@ -385,8 +387,7 @@ namespace OTSIncAReportGraph.OTSIncAReportGraphFuncation
             log.Trace("(Connection_ForDrawDistrbutionImageAndBSE)" + str1);
             if (!m_SEMConnectionState)
             {
-                m_cfun = new COTSControlFunExport();//重新new一下试试呢,不New并不好用  It's better to reinitialize, but it's not good to uninitialize
-
+                
                 //和电镜建立通讯连接
                 m_SEMConnectionState = m_cfun.ConncetSem();
                 string str2 = "调用连接后状态";

OTSIncAReportApp/Control_Grids/OTSIncAReportGridsFuncation/OTSIncAReportGridsFun.cs

@@ -44,7 +44,7 @@ namespace OTSIncAReportGrids.OTSIncAReportGridsFuncation
 
         #region 定义变量
         //电镜设置对象
-        //public NSOTSController.COTSControlFunExport m_cfun = null;
+        public NSOTSController.COTSControlFunExport m_cfun = null;
 
         //为了加快颗粒列表抠图的速度，这里保存一个全局变量
         public List<Field> m_list_COTSFieldMgrClr = null;
@@ -74,6 +74,9 @@ namespace OTSIncAReportGrids.OTSIncAReportGridsFuncation
             table = lan.GetNameTable(form.Name);
 
             m_frmReportApp = in_frmReportApp;
+
+            m_cfun = new NSOTSController.COTSControlFunExport();//重新new一下试试呢,不new不好使   It's better to reinitialize, but it's not good to uninitialize
+
         }
 
         #endregion
@@ -175,11 +178,10 @@ namespace OTSIncAReportGrids.OTSIncAReportGridsFuncation
         {
             if (!m_SEMConnectionState)
             {
-                //m_cfun = new NSOTSController.COTSControlFunExport();//重新new一下试试呢,不new不好使   It's better to reinitialize, but it's not good to uninitialize
-                ////和电镜建立通讯连接
-                //m_SEMConnectionState = m_cfun.ConncetSem();
-                /////获取当前电镜的ID号
-                //m_SEM_ID = m_cfun.GetSemType();
+                //和电镜建立通讯连接
+                m_SEMConnectionState = m_cfun.ConncetSem();
+                ///获取当前电镜的ID号
+                m_SEM_ID = m_cfun.GetSemType();
             }
             else
             {
@@ -204,7 +206,7 @@ namespace OTSIncAReportGrids.OTSIncAReportGridsFuncation
 
             if (m_SEMConnectionState)
             {
-                //m_cfun.GetSemPositionXY(ref ls_PositionX, ref ls_PositionY, ref ls_PositionR);
+                m_cfun.GetSemPositionXY(ref ls_PositionX, ref ls_PositionY, ref ls_PositionR);
             }
             else
             {
@@ -212,7 +214,7 @@ namespace OTSIncAReportGrids.OTSIncAReportGridsFuncation
 
             if (m_SEMConnectionState)
             {
-                //m_cfun.MoveSEMToPoint(in_PositionX, in_PositionY, ls_PositionR);
+                m_cfun.MoveSEMToPoint(in_PositionX, in_PositionY, ls_PositionR);
             }
             else
             {
@@ -229,7 +231,7 @@ namespace OTSIncAReportGrids.OTSIncAReportGridsFuncation
             //}
             //m_cfun.FreeDll();
 
-            //m_SEMConnectionState = false;
+            m_SEMConnectionState = false;
         }
 
         #endregion

OTSIncAReportApp/Control_Grids/ParticlesGridDevidePage.cs

@@ -193,7 +193,7 @@ namespace OTSIncAReportGrids
             //string str2 = "加载颗粒列表，开始从底层加载数据....";
             //str2 = table["str2"].ToString();
             //m_frm_userprogress.SetProgressValueAndText(1, str2);
-
+            m_OTSIncAReportGridsFun = new OTSIncAReportGridsFun(m_ReportApp, this);
             if (Language.ReadDefaultLanguage() == "EN")
             {
                 cbB_order.Items.Add("Default");
@@ -1235,7 +1235,8 @@ namespace OTSIncAReportGrids
                 //第二步，移动到指定位置,先读取再设置
                 if (m_OTSIncAReportGridsFun.m_SEMConnectionState == true)
                 {
-                    m_OTSIncAReportGridsFun.MoveSemToPointXY_ForParticlesGrid(sem_point.X, sem_point.Y);
+                    //m_OTSIncAReportGridsFun.MoveSemToPointXY_ForParticlesGrid(sem_point.X, sem_point.Y);
+                    bool MoveFlag = m_OTSIncAReportGridsFun.m_cfun.SetSemPositionXY(sem_point.X, sem_point.Y, 0);
                 }
 
                 Thread.Sleep(500);