20200918

HOZProject/App.config

@@ -56,9 +56,9 @@
 
       <!--调节上限-->
       <add key="Focus_UP" value="3000"/>
-      <add key="Focus_Down" value="15000"/>
+      <add key="Focus_Down" value="4000"/>
       <add key="Focus_Step" value="1000"/>
-      <add key="Focus_Range" value="2000"/>
+      <add key="Focus_Range" value="50"/>
       <add key="Focus_FStep" value="50"/>
     </appSettings>
 </configuration>

HOZProject/FormUnitControl.cs

@@ -1322,8 +1322,8 @@ namespace HOZProject
 
         private void btnPost4_Click(object sender, EventArgs e)
         {
-            double offsetx = 0;
-            double offsety = 0;
+            float offsetx = 0;
+            float offsety = 0;
             int state = 0;
             wr.Img_Trapezoid_Top_Center_Position("D:/aaaa.jpg", out offsetx, out offsety, out state);
             lbltopcx.Text = offsetx.ToString("0.0");
@@ -1367,7 +1367,7 @@ namespace HOZProject
         private void btnPost8_Click(object sender, EventArgs e)
         {
             int state = 0;
-            wr.Img_Measure_Size("D:/aaaa.jpg", "1000", "0.005", out state);
+            wr.Img_Measure_Size("D:/aaaa.jpg", 1000, (float)0.005, out state);
             lblstate6.Text = state.ToString();
         }
 

MeasureThread/Measure.cs

@@ -1261,20 +1261,6 @@ namespace MeasureThread
                 return false;
             }
 
-            if (!iSEM.SetScanRotation(angle))
-            {
-                arg.Message = "调整角度失败";
-                SendMsg("1-22");
-                return false;
-            }
-            arg.Message = "调整角度成功";
-            SendMsg("1-22");
-            //判断是否停止进程
-            if (key_stop)
-            {
-                return false;
-            }
-
             //6.验证移动准确性：获取当前SEM中心位置坐标，与客户返回坐标对比，验证是否移动正确
             x0 = iSEM.GetStageAtX();
             y0 = iSEM.GetStageAtY();