Bläddra i källkod

adopt the old method to do focus.(new the method can't work)

gsp 4 år sedan
förälder
incheckning
03e0a4e6e2

+ 1 - 1
DBManager/MeasureDB.cs

@@ -42,7 +42,7 @@ namespace DBManager
             string savePath = m_measureFile.FilePath;
             //数据库名称
             string dbFileName = "MeasureDB.db";
-            path = savePath + dbFileName;
+            path = savePath + "//" + dbFileName;
 
             //if (File.Exists(path))
             //{

+ 71 - 0
MeasureThread/ClassDiagram1.cd

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ClassDiagram MajorVersion="1" MinorVersion="1">
+  <Class Name="MeasureThread.ThreadStatusEventArgs" Collapsed="true">
+    <Position X="0.75" Y="2.75" Width="2.25" />
+    <TypeIdentifier>
+      <HashCode>ABBAAAAAAAABBAAAAAAAAAAAQABAAAAMAAAALAAAQSA=</HashCode>
+      <FileName>Measure.cs</FileName>
+    </TypeIdentifier>
+  </Class>
+  <Class Name="MeasureThread.CutHolesStatusEventArgs" Collapsed="true">
+    <Position X="0.75" Y="1.75" Width="2.5" />
+    <TypeIdentifier>
+      <HashCode>AAAAAAAAAAABAAAAAAAAgAAAAAAAAAAAAAAABAAAQAA=</HashCode>
+      <FileName>Measure.cs</FileName>
+    </TypeIdentifier>
+  </Class>
+  <Class Name="MeasureThread.Measure" Collapsed="true">
+    <Position X="8.25" Y="4.5" Width="2.25" />
+    <TypeIdentifier>
+      <HashCode>gMBSUGZDISVB8LJIVKimHGh4i1IwKBYEgBAwA39lkXc=</HashCode>
+      <FileName>Measure.cs</FileName>
+    </TypeIdentifier>
+    <ShowAsAssociation>
+      <Field Name="iSEM" />
+      <Field Name="iExtender" />
+      <Property Name="MParam" />
+    </ShowAsAssociation>
+  </Class>
+  <Class Name="MeasureData.MeasureParam" Collapsed="true">
+    <Position X="12.5" Y="3.25" Width="1.5" />
+    <TypeIdentifier />
+    <ShowAsAssociation>
+      <Property Name="EDSParam" />
+      <Property Name="AutoFocus" />
+      <Property Name="AutoStigX" />
+      <Property Name="AutoStigY" />
+      <Property Name="FIBFocus" />
+    </ShowAsAssociation>
+  </Class>
+  <Class Name="MeasureData.EDSParam" Collapsed="true">
+    <Position X="16" Y="3.25" Width="1.5" />
+    <TypeIdentifier />
+  </Class>
+  <Class Name="MeasureData.FocusParam" Collapsed="true">
+    <Position X="16" Y="4.75" Width="1.5" />
+    <TypeIdentifier />
+  </Class>
+  <Interface Name="SmartSEMControl.ISEMControl" Collapsed="true">
+    <Position X="9.75" Y="2" Width="1.5" />
+    <TypeIdentifier />
+  </Interface>
+  <Interface Name="Extender.IExtenderControl" Collapsed="true">
+    <Position X="9.75" Y="1" Width="1.5" />
+    <TypeIdentifier />
+  </Interface>
+  <Delegate Name="MeasureThread.ThreadStatusHandler" Collapsed="true">
+    <Position X="4" Y="1" Width="3.25" />
+    <TypeIdentifier>
+      <HashCode>AAAAAAAAAAAAEAAAAAAAAAAQAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <FileName>Measure.cs</FileName>
+    </TypeIdentifier>
+  </Delegate>
+  <Delegate Name="MeasureThread.CutHolesStatusHandler" Collapsed="true">
+    <Position X="0.75" Y="1" Width="2.75" />
+    <TypeIdentifier>
+      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAQAAAAAAAAAAA=</HashCode>
+      <FileName>Measure.cs</FileName>
+    </TypeIdentifier>
+  </Delegate>
+  <Font Name="Microsoft YaHei UI" Size="9" />
+</ClassDiagram>

+ 2 - 2
MeasureThread/IMath.cs

@@ -10,11 +10,11 @@ namespace MeasureThread
 
         [XmlRpcMethod("autostigfocus")]//其中客户端的web方法名称即[ ]中的名称必须和服务端相同,否则会抛异常。
         [return: XmlRpcReturnValue(Description = "autostigfocus: 对焦;")]
-        string autofocusstig(int search_step, int iter_n, double wd_searh_factor, double stig_range, double iter_range_damping,bool normalized);
+        string autofocusstig(int search_step, int iter_n, double wd_searh_factor, double stig_range, double iter_range_damping);//,bool normalized
 
         [XmlRpcMethod("autofocus")]
         [return: XmlRpcReturnValue(Description = "autofocus: 对焦;")]//注释写什么都可以。
-        string autofocus(int search_step, double wd_searh_factor, double retry, bool refine,bool normalized);
+        string autofocus(int search_step, double wd_searh_factor, double retry, bool refine);//bool normalized
     }
 
 }

+ 2 - 2
MeasureThread/Measure.cs

@@ -3493,7 +3493,7 @@ namespace MeasureThread
                 // 调用方法;只对焦不消像散
                 if (Is_Stig)
                 {
-                    string focusstig = XmlRpcClient.autofocusstig(10, 3, 3, 3, 0.7, snumstr,normalized);
+                    string focusstig = XmlRpcClient.autofocusstig(10, 3, 3, 3, 0.7, snumstr);//,normalized
                     if (focusstig != "success")
                     {
                         log.Error("对焦失败" + focusstig, false);
@@ -3502,7 +3502,7 @@ namespace MeasureThread
                 }
                 else
                 {
-                    string onlyfocus = XmlRpcClient.autofocus(10, 3, 3, true, snumstr,normalized);
+                    string onlyfocus = XmlRpcClient.autofocus(10, 3, 3, true, snumstr);//,normalized
                     if (onlyfocus != "success")
                     {
                         return false;

+ 1 - 0
MeasureThread/MeasureThread.csproj

@@ -112,6 +112,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
+    <None Include="ClassDiagram1.cd" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup />

+ 4 - 4
MeasureThread/XmlRpcClient.cs

@@ -30,12 +30,12 @@ namespace MeasureThread
         /// 对焦
         /// </summary>
         /// <returns></returns>
-        public static string autofocusstig(int search_step, int iter_n, double wd_searh_factor, double stig_range, double iter_range_damping, string urlstr,bool normalized)
+        public static string autofocusstig(int search_step, int iter_n, double wd_searh_factor, double stig_range, double iter_range_damping, string urlstr)//,bool normalized
         {
             string xrs;
             //调取接口方法
             IMethod method = getInstance(urlstr);
-            xrs = method.autofocusstig( search_step, iter_n, wd_searh_factor, stig_range, iter_range_damping,normalized);
+            xrs = method.autofocusstig( search_step, iter_n, wd_searh_factor, stig_range, iter_range_damping);//,normalized
 
             return xrs;
         }
@@ -43,12 +43,12 @@ namespace MeasureThread
         /// 对焦
         /// </summary>
         /// <returns></returns>
-        public static string autofocus(int search_step, double wd_searh_factor, double retry, bool refine, string urlstr,bool normalized)
+        public static string autofocus(int search_step, double wd_searh_factor, double retry, bool refine, string urlstr)//,bool normalized
         {
             string xrs;
             //调取接口方法
             IMethod method = getInstance(urlstr);
-            xrs = method.autofocus( search_step,  wd_searh_factor,  retry,  refine,normalized);
+            xrs = method.autofocus( search_step,  wd_searh_factor,  retry,  refine);//,normalized
 
             return xrs;
         }