更改测量线程

MeasureThread/Measure.cs

@@ -772,7 +772,8 @@ namespace MeasureThread
                 else     //客户自动
                 {
                     //后期和客户对接接口
-                    
+                    List<string> filenames = new List<string>();
+                    String retfilename = wr.Img_Auto_Focus(filenames);
                 }
 
                 //3.第一次不需要进行角度补偿，其他需要设置SEM进行角度补偿54度
@@ -789,24 +790,18 @@ namespace MeasureThread
                     Thread.Sleep(5000);
                 }
 
-                //4.控制SEM拍照
-                //5.保存照片
+                //4.控制SEM拍照,5保存照片
+                String fileName1 = WorkingFolder + "\\" + m_nWorkHoleNo.ToString() + "Hole" + ImageName1;
+                arg.Picture_Information.Picture_FullPath = fileName1;
+                if (!GetImage(ImageMode.SEM, fileName1))
                 {
-                    //1. 创建目录，已经完成
-                    //2. 设置图片名称
-                    //3. 保存图片1
-                    String fileName1 = WorkingFolder + "\\" + m_nWorkHoleNo.ToString() + "Hole" + ImageName1;
-                    arg.Picture_Information.Picture_FullPath = fileName1;
-                    if (!GetImage(ImageMode.SEM, fileName1))
-                    {
-                        arg.Message = "SEM拍照失败";
-                        SendMsg("1-3");
-                        return false;
-                    }
-                    arg.Message = "SEM拍照成功";
+                    arg.Message = "SEM拍照失败";
                     SendMsg("1-3");
-                    Thread.Sleep(3000);
+                    return false;
                 }
+                arg.Message = "SEM拍照成功";
+                SendMsg("1-3");
+                Thread.Sleep(3000);
                 
                 //6.设置FIB拍照参数——扫描时间、束流等
                 //7.控制FIB自动亮度、对比度
@@ -1155,15 +1150,18 @@ namespace MeasureThread
         public bool FirstHole()
         {
             MeasureData.CutHole firstHole = m_cutHoles[0];            
-            SendMsg("插入PT针");
+            
             //12.根据样品类型参数确定是否需要PT沉积，控制PT针插入
-            //if (firstHole.PT == true)
+            if (m_MsParam.PT == true)
             {
                 if (!InsertPT())
                 {
-                    SendMsg("插入PT针失败");
+                    arg.Message = "插入PT针失败";
+                    SendMsg("3-0");
                     return false;
                 }
+                arg.Message = "插入PT针成功";
+                SendMsg("3-0");
             }
 
             //13. 自动 定位功能
@@ -1201,15 +1199,17 @@ namespace MeasureThread
             //    //6.设置FIB解冻：先读取状态，如果冻结状态则进行解冻
             //}
             //15.根据样品类型决定是否撤出PT针
-            SendMsg("撤出PT针");
-            //if (firstHole.PT == false)
-            //{
+            if (m_MsParam.PT == true)
+            {
                 if (!RetractPT())
                 {
-                    SendMsg("撤出PT针失败");
+                    arg.Message = "撤出PT针失败";
+                    SendMsg("3-23");
                     return false;
                 }
-            //}
+                arg.Message = "撤出PT针成功";
+                SendMsg("3-23");
+            }
 
             // 16.找到切割位置
             SendMsg("找到切割位置");