Browse Source

测量线程增加孔名参数

@wang_qi0307 5 năm trước cách đây
mục cha
commit
2b81b6129f
3 tập tin đã thay đổi với 19 bổ sung0 xóa
  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)
         {
             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);
 
             if (isStoring)
@@ -117,6 +125,8 @@ namespace MeasureData
             else
             {
                 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.FIBTemp = @"";
             this.PTTemp = @"";
+            this.AutoFocus = new FocusParam();
         }
 
         //XML文件保存测量参数

+ 8 - 0
MeasureThread/Measure.cs

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