浏览代码

测量线程增加孔名参数

@wang_qi0307 5 年之前
父节点
当前提交
2b81b6129f
共有 3 个文件被更改,包括 19 次插入0 次删除
  1. 10 0
      MeasureData/ConfigFile.cs
  2. 1 0
      MeasureData/MeasureParam.cs
  3. 8 0
      MeasureThread/Measure.cs

+ 10 - 0
MeasureData/ConfigFile.cs

@@ -108,6 +108,14 @@ namespace MeasureData
         public override void Serialize(bool isStoring, XmlDocument xml, XmlNode rootNode)
         public override void Serialize(bool isStoring, XmlDocument xml, XmlNode rootNode)
         {
         {
             Slo sFile = new Slo();
             Slo sFile = new Slo();
+
+            xString filename = new xString();
+            xString filepath = new xString();
+            filename.AssignValue(this.m_fileName);
+            filepath.AssignValue(this.m_filepath);
+            sFile.Register("FileName", filename);
+            sFile.Register("FilePath", filepath);
+
             sFile.Register("Param", this.m_Config);
             sFile.Register("Param", this.m_Config);
 
 
             if (isStoring)
             if (isStoring)
@@ -117,6 +125,8 @@ namespace MeasureData
             else
             else
             {
             {
                 sFile.Serialize(false, xml, rootNode);
                 sFile.Serialize(false, xml, rootNode);
+                this.m_fileName = filename.value();
+                this.m_filepath = filepath.value();
             }
             }
         }
         }
     }
     }

+ 1 - 0
MeasureData/MeasureParam.cs

@@ -147,6 +147,7 @@ namespace MeasureData
             this.PT = false;
             this.PT = false;
             this.FIBTemp = @"";
             this.FIBTemp = @"";
             this.PTTemp = @"";
             this.PTTemp = @"";
+            this.AutoFocus = new FocusParam();
         }
         }
 
 
         //XML文件保存测量参数
         //XML文件保存测量参数

+ 8 - 0
MeasureThread/Measure.cs

@@ -58,6 +58,14 @@ namespace MeasureThread
         }
         }
         private String message;
         private String message;
 
 
+        //孔名
+        public String HoleName
+        {
+            get { return this.holeName; }
+            set { this.holeName = value; }
+        }
+        private String holeName;
+
         //图片信息
         //图片信息
         public class PictureInformation
         public class PictureInformation
         {
         {