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

MeasureThread/Measure.cs

@@ -29,26 +29,34 @@ namespace MeasureThread
 
     public class ThreadStatusEventArgs
     {
+        //状态
         public string State
         {
             get { return m_state; }
             set { m_state = value; }
         }
         private string m_state;
-
+        //时间
         public DateTime Time
         {
             get { return m_time; }
             set { m_time = value; }
         }
         private DateTime m_time;
-
+        //步骤代码
         public String Step_Code
         {
             get { return step_Code; }
             set { step_Code = value; }
         }
         private String step_Code;
+        //其他消息
+        public String Message
+        {
+            get { return this.message; }
+            set { this.message = value; }
+        }
+        private String message;
 
         //图片信息
         public class PictureInformation
@@ -457,14 +465,22 @@ namespace MeasureThread
             {
                 //拍照
                 case "1-3":
+                case "1-9":
                     //电压、放大倍数、工作距离、位置信息、图片路径
                     arg.Picture_Information.Work_Voltage = iSEM.GetSEMVoltage();
                     arg.Picture_Information.Work_Status = "SEM";
                     arg.Picture_Information.Work_Distance = iSEM.GetWorkingDistance();
                     arg.Picture_Information.Magnification = iSEM.GetMagnification();
                     break;
-                case "1-1":
-
+                case "1-10":
+                    //获取偏移信息
+                    break;
+                case "1-12":
+                    //验证移动准备性
+                    break;
+                default:
+                    arg.Step_Code = "0-0";
+                    arg.Message = step_code;
                     break;
             }
             SendThreadStatus(this, arg);