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

MeasureData/CutHole.cs

@@ -29,9 +29,11 @@ namespace MeasureData
     //测试结果
     public enum State
     {
-        Unmeasured,
-        Failed,
-        Success
+        Ready,     //就绪
+        InProcess, //进行中
+        Waiting,   //等待，半自动化测试过程的状态
+        Failed,    //失败
+        Success    //成功
     }
 
     //切割孔
@@ -119,7 +121,7 @@ namespace MeasureData
         {
             //设定初始值
             m_opt = Operation.Init;
-            m_state = State.Unmeasured;
+            m_state = State.Ready;
             m_switch = false;
             Position = new SemPosition();
         }

MeasureThread/Measure.cs

@@ -587,7 +587,7 @@ namespace MeasureThread
                 }
 
                 //判断孔状态
-                if(m_cutHoles[i].STATE != State.Unmeasured)
+                if(m_cutHoles[i].STATE != State.Ready)
                 {
                     continue;
                 }
@@ -598,7 +598,9 @@ namespace MeasureThread
                     m_cutHoles[i].START = DateTime.Now;
                     //SendMsg("第一个切孔开始测量");
                     //切孔操作-开始
-                    SendCutHoleMsg(((int)ThreadState.InProcess).ToString(), m_cutHoles[i].HoleName);
+                    m_cutHoles[i].STATE = State.InProcess;
+                    //SendCutHoleMsg(((int)ThreadState.InProcess).ToString(), m_cutHoles[i].HoleName);
+                    SendCutHoleMsg(((int)m_cutHoles[i].STATE).ToString(), m_cutHoles[i].HoleName);
                     firstPosition = iSEM.GetStagePosition();
                     //第一个孔的测试
                     
@@ -618,7 +620,8 @@ namespace MeasureThread
                         m_measureFile.Save();
                     }
                     //切孔操作-完成
-                    SendCutHoleMsg(((int)ThreadState.Success).ToString(), m_cutHoles[i].HoleName);
+                    //SendCutHoleMsg(((int)ThreadState.Success).ToString(), m_cutHoles[i].HoleName);
+                    SendCutHoleMsg(((int)m_cutHoles[i].STATE).ToString(), m_cutHoles[i].HoleName);
                 }
                 else
                 {
@@ -626,7 +629,9 @@ namespace MeasureThread
                     //非第一个孔的测试
                     //SendMsg("第" + i.ToString() + "个切孔开始测量");
                     //切孔操作-开始
-                    SendCutHoleMsg(((int)ThreadState.InProcess).ToString(), m_cutHoles[i].HoleName);
+                    //SendCutHoleMsg(((int)ThreadState.InProcess).ToString(), m_cutHoles[i].HoleName);
+                    m_cutHoles[i].STATE = State.InProcess;
+                    SendCutHoleMsg(((int)m_cutHoles[i].STATE).ToString(), m_cutHoles[i].HoleName);
                     //其他孔的测试
                     //成功
                     if (OtherHole())
@@ -643,15 +648,16 @@ namespace MeasureThread
                         m_cutHoles[i].END = DateTime.Now;
                         m_measureFile.Save();
                     }
-                    
+
                     //切孔操作-完成
-                    SendCutHoleMsg(((int)ThreadState.Success).ToString(), m_cutHoles[i].HoleName);
+                    //SendCutHoleMsg(((int)ThreadState.Success).ToString(), m_cutHoles[i].HoleName);
+                    SendCutHoleMsg(((int)m_cutHoles[i].STATE).ToString(), m_cutHoles[i].HoleName);
                 }
 
                 if(key_stop)
                 {
                     m_cutHoles[i].END = DateTime.Now;
-                    m_cutHoles[i].STATE = State.Unmeasured;
+                    m_cutHoles[i].STATE = State.Ready;
                     m_measureFile.Save();
                     arg.Message = "用户停止测量";
                     SendMsg("0-0");