Browse Source

测量线程将样品台初始和测量线程分离开,让孔的信息实时性更高。

@wang_qi0307 4 năm trước cách đây
mục cha
commit
ad49e60012
1 tập tin đã thay đổi với 13 bổ sung3 xóa
  1. 13 3
      MeasureThread/Measure.cs

+ 13 - 3
MeasureThread/Measure.cs

@@ -640,6 +640,15 @@ namespace MeasureThread
                 }
                 else
                 {
+                    //其他孔测量之前的初始化
+                    if (!OtherHole_Init())
+                    {
+                        arg.Message = "当前测量点位置初始失败!";
+                        SendMsg("0-1");
+                        continue;
+                    }
+
+                    //其他孔的测量
                     m_cutHoles[i].START = DateTime.Now;
                     //非第一个孔的测试
                     //SendMsg("第" + i.ToString() + "个切孔开始测量");
@@ -648,6 +657,7 @@ namespace MeasureThread
                     m_cutHoles[i].STATE = State.InProcess;
                     SendCutHoleMsg(((int)m_cutHoles[i].STATE).ToString(), m_cutHoles[i].HoleName);
                     //其他孔的测试
+                    
                     //成功
                     if (OtherHole())
                     {
@@ -1979,7 +1989,7 @@ namespace MeasureThread
         }
 
         //非第一个孔的测试过程
-        public bool CommonWork()
+        public bool OtherHole()
         {
             //首先默认为SEM模式
             arg.Picture_Information.Work_Status = "SEM";
@@ -2140,7 +2150,7 @@ namespace MeasureThread
 
         //测试完第一个孔后的样品台初始化操作。
         //再调用CommonWork执行非第一个孔的测试过程
-        public bool OtherHole()
+        public bool OtherHole_Init()
         {
             //SendMsg("当前切孔号为"+ m_nWorkHoleNo.ToString());
             CutHole currentHole = m_cutHoles[m_nWorkHoleNo];
@@ -2252,7 +2262,7 @@ namespace MeasureThread
             #endregion
 
             //其他操作与第一个孔相同
-            if (!CommonWork())
+            if (!OtherHole())
             {
                 return false;
             }