Przeglądaj źródła

8月24日测试报告程序,修改移动到可以当前位置第二次不好用

CXS 4 lat temu
rodzic
commit
0493e3fde1

+ 1 - 1
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>

+ 2 - 2
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>

+ 2 - 2
Bin/x64/Debug/Config/SysData/OTSProgMgrParam.pmf

@@ -1,5 +1,5 @@
 <?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="BGGray" end="255" start="150" />
@@ -7,7 +7,7 @@
     <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="StageData" MinMag="60" scanFieldSize="1270" xAxisDir="1" yAxisDir="0">
     <Member RegName="XAxis" end="55000" start="-55000" />
     <Member RegName="YAxis" end="55000" start="-55000" />
   </Member>

+ 9 - 9
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;
@@ -175,11 +175,11 @@ 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_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();
             }
             else
             {
@@ -204,7 +204,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 +212,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 +229,7 @@ namespace OTSIncAReportGrids.OTSIncAReportGridsFuncation
             //}
             //m_cfun.FreeDll();
 
-            //m_SEMConnectionState = false;
+            m_SEMConnectionState = false;
         }
 
         #endregion

+ 3 - 0
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);
+
             if (Language.ReadDefaultLanguage() == "EN")
             {
                 cbB_order.Items.Add("Default");