测试

MeasureThread/Measure.cs

@@ -328,7 +328,6 @@ namespace MeasureThread
 
         public ThreadStatusEventArgs(string a_State)
         {
-            this.m_state = a_State;
             picture_Information = new PictureInformation();
             image_Information = new ImageInformation();
         }
@@ -498,8 +497,7 @@ namespace MeasureThread
                     //取消电子束校正并初始化
                     break;
                 default:
-                    arg.Step_Code = "0-0";
-                    arg.Message = step_code;
+                    arg.State = "1";
                     break;
             }
             SendThreadStatus(this, arg);
@@ -724,27 +722,30 @@ namespace MeasureThread
         /// <returns></returns>
         public bool GetPoistion()
         {
-            SendMsg("自动定位");
+            //SendMsg("自动定位");
             //13.自动定位切割
             {
-                SendMsg("放大600倍");
                 //1.控制SEM放大600X
                 if (!iSEM.SetMagnification(600))
                 {
                     return false;
                 }
+                arg.Message = "放大600倍";
+                SendMsg("1-1");
 
                 //2.控制SEM自动对焦、亮度、对比度
                 // if (!MeasParam.FocusMode)
                 {
-                    if (DialogResult.Yes == MessageBox.Show("图像拍摄已完成？", "确认消息", MessageBoxButtons.YesNo))
+                    if (DialogResult.Yes == MessageBox.Show("图像自动对焦已完成？", "确认消息", MessageBoxButtons.YesNo))
                     {
-                        SendMsg("拍摄照片完成");
+                        arg.Message = "自动对焦完成";
+                        SendMsg("1-2");
                         //return true;
                     }
                     else
                     {
-                        SendMsg("拍摄照片失败");
+                        arg.Message = "自动对焦失败";
+                        SendMsg("1-2");
                         return false;
                     }
                     //弹出手动对焦的窗口
@@ -755,17 +756,17 @@ namespace MeasureThread
                 //}
 
                 //3.设置SEM进行角度补偿54度
-                SendMsg("设置校正54度");
-                if (!TiltCorrection(54))
-                {
-                    SendMsg("设置SEM进行角度补偿54度");
-                    return false;
-                }
-
-                Thread.Sleep(5000);
+                //if (!TiltCorrection(54))
+                //{
+                //    SendMsg("设置SEM进行角度补偿54度");
+                //    return false;
+                //}
+                //arg.Message = "设置校正54度";
+                //SendMsg("1-15");
+                //Thread.Sleep(5000);
 
                 //4.控制SEM拍照
-                SendMsg("SEM拍照");
+                
                 //5.保存照片
                 {
                     //1. 创建目录，已经完成
@@ -779,10 +780,11 @@ namespace MeasureThread
                         SendMsg("SEM拍照失败");
                         return false;
                     }
+                    arg.Message = "SEM拍照";
                     SendMsg("1-3");
                     Thread.Sleep(3000);
                 }
-
+                
                 //6.设置FIB拍照参数——扫描时间、束流等
                 //7.控制FIB自动亮度、对比度
                 SendMsg("切换FIB控制");