Merge branch 'master' of http://192.168.1.123:10080/SDD1/HOZ

HOZProject/MeasureMsgDispose/MeasureMsgManage.cs

@@ -122,6 +122,14 @@ namespace HOZProject
             {
                 formHOZ.lblStateMessage.Text = "正在对焦中...请等待";
             }
+            else if (args.Message == "自动像散")
+            {
+                formHOZ.lblStateMessage.Text = "正在消像散中...请等待";
+            }
+            else if (args.Message == "FIB自动对焦")
+            {
+                formHOZ.lblStateMessage.Text = "正在FIB自动对焦中...请等待";
+            }
             else
             {
                 formHOZ.lblStateMessage.Text = "";

HOZProject/MeasureXML/MeasureStructXml.xml

@@ -4,24 +4,24 @@
     <Step Index="0"  Code="1-0" IsData="False" Type="Photo" IsShow="True" Title="拉直放大倍数" Details="测量样品初始拉直时的放大倍数"></Step>
     <Step Index="1"  Code="1-1" IsData="False" Type="FIB" IsShow="True" Title="角度补偿54度" Details="测量样品初始设置SEM进行角度补偿54度"></Step>
     
-    <Step Index="2"  Code="1-2" IsData="False" Type="Photo" IsShow="False" Title="移动样品台" Details="移动样品台到观测点"></Step>
-    <Step Index="3"  Code="1-3" IsData="True" Type="Photo" IsShow="True" Title="拉直-自动对焦" Details="拉直操作自动对焦"></Step>
-    <Step Index="4"  Code="1-4" IsData="True" Type="Photo" IsShow="True" Title="拉直-拍照" Details="拉直操作拍照"></Step>
-    <Step Index="5"  Code="1-5" IsData="False" Type="Photo" IsShow="False" Title="拉直-获取角度" Details="图像接口获取旋转角度"></Step>
-    <Step Index="6"  Code="1-6" IsData="False" Type="Photo" IsShow="True" Title="拉直操作" Details="图像接口获取旋转角度,拉直旋转R轴进行拉直"></Step>
-    
-    <Step Index="7"  Code="1-7" IsData="False" Type="Photo" IsShow="True" Title="拍照放大倍数" Details="测量样品的拍照放大倍数"></Step>
-    <Step Index="8"  Code="1-8" IsData="True" Type="Photo" IsShow="True" Title="拍照-自动对焦" Details="拍照自动对焦"></Step>
-    <Step Index="9"  Code="1-9" IsData="True" Type="Photo" IsShow="True" Title="SEM拍照" Details="控制SEM进行拍照"></Step>
-    <Step Index="10" Code="1-10" IsData="False" Type="FIB" IsShow="True" Title="切换到FIB模式" Details="电镜控制方式切换到FIB模式"></Step>
-    <Step Index="11" Code="1-11" IsData="False" Type="FIB" IsShow="True" Title="FIB放大倍数" Details="控制FIB模式下的放大倍数"></Step>
-    <Step Index="12" Code="1-12" IsData="True" Type="FIB" IsShow="True" Title="FIB拍照" Details="控制FIB进行拍照选取观测点"></Step>
-    <Step Index="13" Code="1-13" IsData="False" Type="FIB" IsShow="True" Title="观测点获取并移动" Details="图像接口返回观测点位置并移动样品台"></Step>
-    <Step Index="14" Code="1-14" IsData="False" Type="Pt" IsShow="True" Title="插入PT针" Details="插入PT针"></Step>
-    <Step Index="15" Code="1-15" IsData="False" Type="Pt" IsShow="True" Title="PT沉积" Details="PT进行沉积"></Step>
-    <Step Index="16" Code="1-16" IsData="False" Type="Pt" IsShow="True" Title="撤出PT针" Details="撤出PT针"></Step>
-    <Step Index="17" Code="1-17" IsData="False" Type="FIB" IsShow="True" Title="保存六轴位置" Details="保存六轴的位置到数据库中"></Step>
+    <Step Index="2"  Code="1-2" IsData="True" Type="Photo" IsShow="True" Title="拉直-自动对焦消像散" Details="拉直操作自动对焦、消像散"></Step>
+    <Step Index="3"  Code="1-3" IsData="True" Type="Photo" IsShow="True" Title="拉直-拍照" Details="拉直操作拍照"></Step>
+    <Step Index="4"  Code="1-4" IsData="False" Type="Photo" IsShow="True" Title="拉直操作" Details="图像接口获取旋转角度,拉直旋转R轴进行拉直"></Step>
     
+    <Step Index="5"  Code="1-5" IsData="False" Type="Photo" IsShow="True" Title="拍照放大倍数" Details="测量样品的拍照放大倍数"></Step>
+    <Step Index="6"  Code="1-6" IsData="True" Type="Photo" IsShow="True" Title="拍照-自动对焦消像散" Details="拍照自动对焦消像散"></Step>
+    <Step Index="7"  Code="1-7" IsData="True" Type="Photo" IsShow="True" Title="SEM拍照" Details="控制SEM进行拍照"></Step>
+    <Step Index="8" Code="1-8" IsData="False" Type="FIB" IsShow="True" Title="切换到FIB模式" Details="电镜控制方式切换到FIB模式"></Step>
+    <Step Index="9" Code="1-9" IsData="False" Type="FIB" IsShow="True" Title="FIB放大倍数" Details="控制FIB模式下的放大倍数"></Step>
+    <Step Index="10" Code="1-10" IsData="True" Type="FIB" IsShow="True" Title="FIB自动对焦" Details="FIB自动对焦"></Step>
+    <Step Index="11" Code="1-11" IsData="True" Type="FIB" IsShow="True" Title="FIB拍照" Details="控制FIB进行拍照选取观测点"></Step>
+    <Step Index="12" Code="1-12" IsData="False" Type="FIB" IsShow="True" Title="观测点获取并移动" Details="图像接口返回观测点位置并移动样品台"></Step>
+    <Step Index="13" Code="1-13" IsData="False" Type="Pt" IsShow="True" Title="插入PT针" Details="插入PT针"></Step>
+    <Step Index="14" Code="1-14" IsData="False" Type="Pt" IsShow="True" Title="PT沉积" Details="PT进行沉积"></Step>
+    <Step Index="15" Code="1-15" IsData="False" Type="Pt" IsShow="True" Title="撤出PT针" Details="撤出PT针"></Step>
+    <Step Index="16" Code="1-16" IsData="False" Type="FIB" IsShow="True" Title="保存六轴位置" Details="保存六轴的位置到数据库中"></Step>
+
+    <Step Index="17" Code="1-17" IsData="True" Type="FIB" IsShow="True" Title="FIB分析前自动对焦" Details="FIB分析前自动对焦"></Step>
     <Step Index="18" Code="1-18" IsData="True" Type="FIB" IsShow="True" Title="FIB分析前拍照" Details="FIB分析前拍照"></Step>
     <Step Index="19" Code="1-19" IsData="False" Type="FIB" IsShow="True" Title="FIB分析" Details="FIB分析"></Step>
     <Step Index="20" Code="1-20" IsData="True" Type="FIB" IsShow="True" Title="FIB分析后拍照" Details="FIB分析后拍照"></Step>
@@ -33,13 +33,14 @@
     <Step Index="25" Code="1-25" IsData="False" Type="FIB" IsShow="True" Title="中心点获取并移动" Details="图像接口返回梯形中心点坐标并移动样品台"></Step>
     
     <Step Index="26" Code="1-26" IsData="False" Type="Photo" IsShow="True" Title="定位放大倍数" Details="定位的放大倍数"></Step>
-    <Step Index="27" Code="1-27" IsData="True" Type="Photo" IsShow="True" Title="定位-自动对焦" Details="定位的高倍数对焦"></Step>
+    <Step Index="27" Code="1-27" IsData="True" Type="Photo" IsShow="True" Title="定位-自动对焦消像散" Details="定位的高倍数对焦消像散"></Step>
     <Step Index="28" Code="1-28" IsData="False" Type="FIB" IsShow="True" Title="设置观测时的角度补偿" Details="设置观测时的角度补偿"></Step>
     <Step Index="29" Code="1-29" IsData="True" Type="Photo" IsShow="True" Title="分析-SEM拍照" Details="拍照获取梯形偏移角度"></Step>
     <Step Index="30" Code="1-30" IsData="False" Type="FIB" IsShow="True" Title="获取观测形状的角度并补偿" Details="图像接口返回观测形状的角度并补偿"></Step>
-    <Step Index="31" Code="1-31" IsData="True" Type="FIB" IsShow="True" Title="分析-SEM拍照" Details="获取定位观测层高位置"></Step>
-    <Step Index="32" Code="1-32" IsData="False" Type="FIB" IsShow="false" Title="获取定位观测点并移动" Details="获取定位观测点位置并移动样品台"></Step>
-    <Step Index="33" Code="1-33" IsData="True" Type="FIB" IsShow="false" Title="分析层高拍照" Details="分析层高拍照"></Step>
+    <Step Index="31" Code="1-31" IsData="True" Type="FIB" IsShow="True" Title="分析-自动对焦消像散" Details="分析的高倍数对焦消像散"></Step>
+    <Step Index="32" Code="1-32" IsData="True" Type="FIB" IsShow="True" Title="分析-SEM拍照" Details="获取定位观测层高位置"></Step>
+    <Step Index="33" Code="1-33" IsData="False" Type="FIB" IsShow="false" Title="获取定位观测点并移动" Details="获取定位观测点位置并移动样品台"></Step>
+    <Step Index="36" Code="1-36" IsData="True" Type="FIB" IsShow="false" Title="分析层高拍照" Details="分析层高拍照"></Step>
     <Step Index="34" Code="1-34" IsData="False" Type="Photo" IsShow="True" Title="光束复位" Details="光束复位"></Step>
     
     <Step Index="35" Code="1-35" IsData="False" Type="FIB" IsShow="True" Title="自动层高分析" Details="自动进行层高分析"></Step>

MeasureThread/Measure.cs

@@ -1179,6 +1179,7 @@ namespace MeasureThread
             }
             return true;
         }
+
         /// <summary>
         ///13. 自动 定位功能,沉积
         /// </summary>
@@ -1193,19 +1194,19 @@ namespace MeasureThread
             {
                 arg.Message = "电压设置" + m_MsParam.Location_Voltage.ToString("0.0") + "失败";
                 arg.State = false;
-                SendMsg("1-7");
+                SendMsg("1-5");
                 return false;
             }
             if (!iSEM.SetMagnification(m_measureFile.MParam.Location_Magnification))
             {
                 arg.Message = "放大" + m_measureFile.MParam.Location_Magnification.ToString("0.0") + "倍失败";
                 arg.State = false;
-                SendMsg("1-7");
+                SendMsg("1-5");
                 return false;
             }
             arg.State = true;
             arg.Message = "放大" + m_measureFile.MParam.Location_Magnification.ToString("0.0") + "倍成功";
-            SendMsg("1-7");
+            SendMsg("1-5");
             //判断是否停止进程
             if (key_stop)
             {
@@ -1214,18 +1215,18 @@ namespace MeasureThread
 
 
             //2.控制SEM自动对焦、亮度、对比度
-            if(ImageFocus("1-8"))
+            if(ImageFocus("1-6"))
             {
                 arg.Message = "自动对焦完成";
                 arg.State = true;
-                SendMsg("1-8");
+                SendMsg("1-6");
             }
             else
             {
                 LogManager.AddHardwareLog("设置观测点后，自动对焦失败。", true);
                 arg.Message = "自动对焦失败";
                 arg.State = false;
-                SendMsg("1-8");
+                SendMsg("1-6");
             }
             //判断是否停止进程
             if (key_stop)
@@ -1237,17 +1238,17 @@ namespace MeasureThread
             float dMag = iSEM.GetMagnification();
             if (dMag > 10000)//需要消像散
             {
-                if (!ImageStig("1-3"))
+                if (!ImageStig("1-6"))
                 {
                     LogManager.AddHardwareLog("拉直操作消像散失败，程序退出。", true);
                     arg.Message = "拉直操作自动消像散失败！";
                     arg.State = false;
-                    SendMsg("1-3");
+                    SendMsg("1-6");
                     return false;
                 }
                 arg.Message = "拉直操作自动消像散成功！";
                 arg.State = true;
-                SendMsg("1-3");
+                SendMsg("1-6");
             }
 
 
@@ -1266,12 +1267,12 @@ namespace MeasureThread
             {
                 arg.Message = "SEM拍照失败";
                 arg.State = false;
-                SendMsg("1-9");
+                SendMsg("1-7");
                 return false;
             }
             arg.State = true;
             arg.Message = "SEM拍照成功";
-            SendMsg("1-9");
+            SendMsg("1-7");
             iSEM.CmdFocusRate();
             cycle_time = iSEM.GetCycleTime();
             Thread.Sleep(Convert.ToInt32(cycle_time) + 1000);
@@ -1290,13 +1291,13 @@ namespace MeasureThread
                 {
                     arg.Message = "FIB模式切换失败";
                     arg.State = false;
-                    SendMsg("1-10");
+                    SendMsg("1-8");
                     return false;
                 }
                 arg.State = true;
                 arg.Picture_Information.Work_Status = "FIB";
                 arg.Message = "FIB模式切换成功";
-                SendMsg("1-10");
+                SendMsg("1-8");
                 Thread.Sleep(Convert.ToInt32(cycle_time) + 1000);
                 //判断是否停止进程
                 if (key_stop)
@@ -1319,12 +1320,12 @@ namespace MeasureThread
                 {
                     arg.Message = "FIB放大倍数设置失败";
                     arg.State = false;
-                    SendMsg("1-11");
+                    SendMsg("1-9");
                     return false;
                 }
                 arg.Message = "FIB放大倍数设置成功";
                 arg.State = true;
-                SendMsg("1-11");
+                SendMsg("1-9");
                 Thread.Sleep(1000);
 
                 //拍照前改变速度,延时
@@ -1334,18 +1335,18 @@ namespace MeasureThread
 
                 //增加FIB对焦
                 //2.控制SEM自动对焦、亮度、对比度
-                if (FIBFocus("1-8"))
+                if (FIBFocus("1-10"))
                 {
                     arg.Message = "自动FIB对焦完成";
                     arg.State = true;
-                    SendMsg("1-8");
+                    SendMsg("1-10");
                 }
                 else
                 {
                     LogManager.AddHardwareLog("设置观测点后，自动FIB对焦失败。", true);
                     arg.Message = "自动FIB对焦失败";
                     arg.State = false;
-                    SendMsg("1-8");
+                    SendMsg("1-10");
                 }
                 //判断是否停止进程
                 if (key_stop)
@@ -1358,12 +1359,12 @@ namespace MeasureThread
                 {
                     arg.Message = "FIB拍照失败";
                     arg.State = false;
-                    SendMsg("1-12");
+                    SendMsg("1-11");
                     return false;
                 }
                 arg.State = true;
                 arg.Message = "FIB拍照成功";
-                SendMsg("1-12");
+                SendMsg("1-11");
                 iSEM.CmdFocusRate();
                 cycle_time = iSEM.GetCycleTime();
                 Thread.Sleep(Convert.ToInt32(cycle_time) + 1000);
@@ -1391,12 +1392,12 @@ namespace MeasureThread
                     {
                         arg.Message = "移动到新(" + x1.ToString() + "," + y1.ToString() + ")位置失败";
                         arg.State = false;
-                        SendMsg("1-13");
+                        SendMsg("1-12");
                         return false;
                     }
                     arg.Message = "移动到新(" + x1.ToString() + "," + y1.ToString() + ")位置成功";
                     arg.State = true;
-                    SendMsg("1-13");
+                    SendMsg("1-12");
 
                     if (hand_intervene == 1)
                     {
@@ -1407,7 +1408,7 @@ namespace MeasureThread
                 {
                     arg.Message = "图像接口参数state返回值为零";
                     arg.State = false;
-                    SendMsg("1-13");
+                    SendMsg("1-12");
                     if(hand_intervene==1)
                     {
                         if (DialogResult.Yes != MessageBox.Show("网络参数State返回为0。\n是否继续操作？。", "确认消息", MessageBoxButtons.YesNo))
@@ -1457,12 +1458,12 @@ namespace MeasureThread
                         {
                             arg.Message = "插入PT针失败";
                             arg.State = false;
-                            SendMsg("1-14");
+                            SendMsg("1-13");
                             return false;
                         }
                         arg.State = true;
                         arg.Message = "插入PT针成功";
-                        SendMsg("1-14");
+                        SendMsg("1-13");
                     }
                     //判断是否停止进程
                     if (key_stop)
@@ -1475,12 +1476,12 @@ namespace MeasureThread
                     {
                         arg.Message = "PT沉积失败";
                         arg.State = false;
-                        SendMsg("1-15");
+                        SendMsg("1-14");
                         return false;
                     }
                     arg.State = true;
                     arg.Message = "PT沉积成功";
-                    SendMsg("1-15");
+                    SendMsg("1-14");
                     //判断是否停止进程
                     if (key_stop)
                     {
@@ -1494,12 +1495,12 @@ namespace MeasureThread
                         {
                             arg.Message = "撤出PT针失败";
                             arg.State = false;
-                            SendMsg("1-16");
+                            SendMsg("1-15");
                             return false;
                         }
                         arg.State = true;
                         arg.Message = "撤出PT针成功";
-                        SendMsg("1-16");
+                        SendMsg("1-15");
                     }
                     //判断是否停止进程
                     if (key_stop)
@@ -1529,7 +1530,7 @@ namespace MeasureThread
                 + firstPosition[4].ToString() + ","
                 + firstPosition[5].ToString() + ")";
             arg.State = true;
-            SendMsg("1-17");
+            SendMsg("1-16");
             //判断是否停止进程
             if (key_stop)
             {
@@ -1553,18 +1554,18 @@ namespace MeasureThread
             Thread.Sleep(Convert.ToInt32(cycle_time)+1000);
 
             //增加FIB对焦
-            if (FIBFocus("1-8"))
+            if (FIBFocus("1-17"))
             {
                 arg.Message = "FIB自动对焦完成";
                 arg.State = true;
-                SendMsg("1-8");
+                SendMsg("1-17");
             }
             else
             {
                 LogManager.AddHardwareLog("设置观测点后，自动对焦失败。", true);
                 arg.Message = "自动对焦失败";
                 arg.State = false;
-                SendMsg("1-8");
+                SendMsg("1-17");
             }
             //判断是否停止进程
             if (key_stop)
@@ -1940,17 +1941,17 @@ namespace MeasureThread
             float dMag = iSEM.GetMagnification();
             if (dMag > 10000)//需要消像散
             {
-                if (!ImageStig("1-3"))
+                if (!ImageStig("1-27"))
                 {
                     LogManager.AddHardwareLog("拉直操作消像散失败，程序退出。", true);
                     arg.Message = "拉直操作自动消像散失败！";
                     arg.State = false;
-                    SendMsg("1-3");
+                    SendMsg("1-27");
                     return false;
                 }
                 arg.Message = "拉直操作自动消像散成功！";
                 arg.State = true;
-                SendMsg("1-3");
+                SendMsg("1-27");
             }
 
             //3、设置SEM补偿角度
@@ -2056,17 +2057,17 @@ namespace MeasureThread
                 }
 
                 //11、自动对焦。与之前操作相同
-                if (ImageFocus("1-28"))
+                if (ImageFocus("1-31"))
                 {
                     arg.Message = "自动对焦完成";
                     arg.State = true;
-                    SendMsg("1-28");
+                    SendMsg("1-31");
                 }
                 else
                 {
                     arg.Message = "自动对焦失败";
                     arg.State = false;
-                    SendMsg("1-28");
+                    SendMsg("1-31");
                 }
                 //判断是否停止进程
                 if (key_stop)
@@ -2078,17 +2079,17 @@ namespace MeasureThread
                 dMag = iSEM.GetMagnification();
                 if (dMag > 10000)//需要消像散
                 {
-                    if (!ImageStig("1-3"))
+                    if (!ImageStig("1-31"))
                     {
                         LogManager.AddHardwareLog("拉直操作消像散失败，程序退出。", true);
                         arg.Message = "拉直操作自动消像散失败！";
                         arg.State = false;
-                        SendMsg("1-3");
+                        SendMsg("1-31");
                         return false;
                     }
                     arg.Message = "拉直操作自动消像散成功！";
                     arg.State = true;
-                    SendMsg("1-3");
+                    SendMsg("1-31");
                 }
 
                 //12拍照
@@ -2109,13 +2110,13 @@ namespace MeasureThread
                 {
                     arg.Message = "SEM拍照失败";
                     arg.State = false;
-                    SendMsg("1-31");
+                    SendMsg("1-32");
                     return false;
                 }
                 arg.State = true;
                 image18 = fileName6;
                 arg.Message = "SEM拍照成功";
-                SendMsg("1-31");
+                SendMsg("1-32");
                 iSEM.CmdFocusRate();
                 cycle_time = iSEM.GetCycleTime();
                 Thread.Sleep(Convert.ToInt32(cycle_time) + 1000);
@@ -2629,25 +2630,6 @@ namespace MeasureThread
             #region 1. 初始化
             if (m_MsParam.Is_Photograph == false)
             {
-                //if (DialogResult.Yes == MessageBox.Show("样品台T轴可以旋转恢复到水平吗？", "确认消息", MessageBoxButtons.YesNo))
-                //{
-                //    //SendMsg("样品台恢复到水平");
-                //    //return true;
-                //    LogManager.AddHardwareLog("样品台T轴旋转恢复到水平位置", true);
-                //}
-                //else
-                //{
-                //    //SendMsg("禁止样品台恢复到水平");
-                //    return false;
-                //}
-                ////判断是否停止进程
-                //if (key_stop)
-                //{
-                //    return false;
-                //}
-
-                //2. 调节样品1号孔的样品台6轴坐标
-                //3. 将样品1号孔坐标2存入数据库
                 //4. 控制样品台T轴归0，R轴变为坐标1、Z/M轴作为坐标2保存不变
                 if (!iSEM.SetStageGotoT(0))
                 {
@@ -2715,17 +2697,6 @@ namespace MeasureThread
             //7. 控制样品台，调整T轴54度、M/Z/R轴不变
             if (m_MsParam.Is_Photograph == false)
             {
-                //if (DialogResult.Yes == MessageBox.Show("样品台T轴可以倾斜吗？", "确认消息", MessageBoxButtons.YesNo))
-                //{
-                //    //SendMsg("样品台旋转");
-                //    //return true;
-                //}
-                //else
-                //{
-                //    //SendMsg("禁止样品台旋转");
-                //    return false;
-                //}
-
                 if (!iSEM.SetStageGotoT(54))
                 {
                     return false;
@@ -2755,17 +2726,17 @@ namespace MeasureThread
         public bool Straighten_Handle()
         {
             //1、自动对焦
-            if (!ImageFocus("1-3"))
+            if (!ImageFocus("1-2"))
             {
                 LogManager.AddHardwareLog("拉直操作自动对焦失败，程序退出。", true);
                 arg.Message = "拉直操作自动对焦失败！";
                 arg.State = false;
-                SendMsg("1-3");
+                SendMsg("1-2");
                 return false;
             }
             arg.Message = "拉直操作自动对焦成功！";
             arg.State = true;
-            SendMsg("1-3");
+            SendMsg("1-2");
 
             //判断是否停止进程
             if (key_stop)
@@ -2777,17 +2748,17 @@ namespace MeasureThread
             float dMag = iSEM.GetMagnification();
             if (dMag > 10000)//需要消像散
             {
-                if (!ImageStig("1-3"))
+                if (!ImageStig("1-2"))
                 {
                     LogManager.AddHardwareLog("拉直操作消像散失败，程序退出。", true);
                     arg.Message = "拉直操作自动消像散失败！";
                     arg.State = false;
-                    SendMsg("1-3");
+                    SendMsg("1-2");
                     return false;
                 }
                 arg.Message = "拉直操作自动消像散成功！";
                 arg.State = true;
-                SendMsg("1-3");
+                SendMsg("1-2");
             }
 
             //2、拍张照片
@@ -2800,12 +2771,12 @@ namespace MeasureThread
             {
                 arg.Message = "拉直拍照成功";
                 arg.State = false;
-                SendMsg("1-4");
+                SendMsg("1-3");
                 return false;
             }
             arg.Message = "拉直拍照成功！";
             arg.State = true;
-            SendMsg("1-4");
+            SendMsg("1-3");
             iSEM.CmdFocusRate();
             cycle_time = iSEM.GetCycleTime();
             Thread.Sleep(Convert.ToInt32(cycle_time) + 1000);
@@ -2820,7 +2791,7 @@ namespace MeasureThread
             {
                 arg.Message = "华为接口参数state返回为零";
                 arg.State = false;
-                SendMsg("1-6");
+                SendMsg("1-4");
                 if (hand_intervene == 1)
                 {
                     if (DialogResult.Yes != MessageBox.Show("网络参数State返回为0。\n是否继续操作？。", "确认消息", MessageBoxButtons.YesNo))
@@ -2884,7 +2855,7 @@ namespace MeasureThread
             }
             arg.Message = "拉直操作完成";
             arg.State = true;
-            SendMsg("1-6");
+            SendMsg("1-4");
             //华为接口，去掉人工干预
             //MessageBox.Show("拉直操作完成，如果不正确请手动进行拉直然后点击OK按钮。", "确认消息", MessageBoxButtons.OK);
 
@@ -3151,7 +3122,7 @@ namespace MeasureThread
                     return false;
                 }
                 arg.State = true;
-                arg.Message = "自动对焦";
+                arg.Message = "自动像散";
                 SendMsg(step_code);
 
                 //判断是否停止进程
@@ -3214,7 +3185,7 @@ namespace MeasureThread
                     return false;
                 }
                 arg.State = true;
-                arg.Message = "自动对焦";
+                arg.Message = "自动像散";
                 SendMsg(step_code);
 
                 //判断是否停止进程
@@ -3318,7 +3289,7 @@ namespace MeasureThread
                     return false;
                 }
                 arg.State = true;
-                arg.Message = "自动对焦";
+                arg.Message = "FIB自动对焦";
                 SendMsg(step_code);
 
                 //判断是否停止进程
@@ -3377,7 +3348,7 @@ namespace MeasureThread
                     return false;
                 }
                 arg.State = true;
-                arg.Message = "自动对焦";
+                arg.Message = "FIB自动对焦";
                 SendMsg(step_code);
 
                 //判断是否停止进程