更改配置文件的读写方式。

HOZProject/FormUnitControl.cs

@@ -1398,11 +1398,11 @@ namespace HOZProject
 
         private void btnCreateConfig_Click(object sender, EventArgs e)
         {
-            ConfigFile cfm = new ConfigFile();
+            MeasureParam cfm = new MeasureParam();
             cfm.Is_Photograph = chkWIsP.Checked;
-            cfm.PT_Depostion = chkWPT.Checked;
-            cfm.PT_ELYFile = txtWPTF.Text;
-            cfm.FIB_ELYFile = txtWFIBF.Text;
+            cfm.PT = chkWPT.Checked;
+            cfm.PTTemp = txtWPTF.Text;
+            cfm.FIBTemp = txtWFIBF.Text;
             cfm.Stretch_Magnification = Convert.ToDouble(cbbWLZ.Text);
             cfm.Location_Magnification = Convert.ToDouble(cbbWQGF.Text);
             cfm.Location_Voltage = Convert.ToDouble(cbbWQGD.Text);
@@ -1417,11 +1417,12 @@ namespace HOZProject
                 cfm.Correction_Angle = 54.0;
             }
             
-            cfm.Sample_Type = cbbWYP.Text;
+            cfm.SampleName = cbbWYP.Text;
             cfm.Firm = cbbWCS.Text;
 
+            ConfigFile cf = new ConfigFile(cfm);
             
-            cfm.Save(@"E:\test.cfg");
+            cf.Save(@"E:\test.cfg");
 
             List<String> _sT = sT.ToList();
             if(_sT.IndexOf(cbbWYP.Text)<0)
@@ -1456,19 +1457,20 @@ namespace HOZProject
 
         private void btnReadConfig_Click(object sender, EventArgs e)
         {
-            ConfigFile cfm = new ConfigFile();
-            cfm.Read(@"E:\test.cfg");
+            MeasureParam cfm = new MeasureParam();
+            ConfigFile cf = new ConfigFile(cfm);
+            cf.Read(@"E:\test.cfg");
             chkRIsP.Checked = cfm.Is_Photograph;
-            chkRPT.Checked = cfm.PT_Depostion;
-            txtRPTF.Text = cfm.PT_ELYFile;
-            txtRFIBF.Text = cfm.FIB_ELYFile;
+            chkRPT.Checked = cfm.PT;
+            txtRPTF.Text = cfm.PTTemp;
+            txtRFIBF.Text = cfm.FIBTemp;
             txtRLZ.Text = cfm.Stretch_Magnification.ToString();
             txtRQGF.Text = cfm.Location_Magnification.ToString();
             txtRQGD.Text = cfm.Location_Voltage.ToString();
             txtRPZF.Text = cfm.Photograph_Magnification.ToString();
             txtRPZD.Text = cfm.Photograph_Voltage.ToString();
             txtRXZ.Text = cfm.Correction_Angle.ToString();
-            txtRYP.Text = cfm.Sample_Type;
+            txtRYP.Text = cfm.SampleName;
             txtRCS.Text = cfm.Firm;
 
         }

MeasureData/ConfigFile.cs

@@ -13,111 +13,12 @@ namespace MeasureData
     public class ConfigFile : ISlo
     {
         #region 内容
-        //是否仅拍照
-        private Boolean is_Photograph;
-        public Boolean Is_Photograph
-        {
-            get { return this.is_Photograph; }
-            set { this.is_Photograph = value; }
-        }
-
-        //是否PT沉积
-        private Boolean pt_Depostion;
-        public Boolean PT_Depostion
-        {
-            get { return this.pt_Depostion; }
-            set { this.pt_Depostion = value; }
-        }
-
-        //PT使用的ELY文件
-        private String pt_ELYFile;
-        public String PT_ELYFile
-        {
-            get { return this.pt_ELYFile; }
-            set { this.pt_ELYFile = value; }
-        }
-
-        //FIB使用的ELY文件
-        private String fib_ELYFile;
-        public String FIB_ELYFile
-        {
-            get { return this.fib_ELYFile; }
-            set { this.fib_ELYFile = value; }
-        }
-
-        //拉直操作需要的放大位数
-        private double stretch_Magnification;
-        public double Stretch_Magnification
-        {
-            get { return this.stretch_Magnification; }
-            set { this.stretch_Magnification = value; }
-        }
-
-        //定位切割位置的放大倍数
-        private double location_Magnification;
-        public double Location_Magnification
-        {
-            get { return this.location_Magnification; }
-            set { this.location_Magnification = value; }
-        }
-
-        //定位切割位置的工作电压
-        private double location_Voltage;
-        public double Location_Voltage
-        {
-            get { return this.location_Voltage; }
-            set { this.location_Voltage = value; }
-        }
-
-        //拍照的放大倍数
-        private double photograph_Magnification;
-        public double Photograph_Magnification
-        {
-            get { return this.photograph_Magnification; }
-            set { this.photograph_Magnification = value; }
-        }
-
-        //拍照的工作电压
-        private double photograph_Voltage;
-        public double Photograph_Voltage
-        {
-            get { return this.photograph_Voltage; }
-            set { this.photograph_Voltage = value; }
-        }
-
-        //校正角度选择
-        private double correction_Angle;
-        public double Correction_Angle
-        {
-            get { return this.correction_Angle; }
-            set { this.correction_Angle = value; }
-        }
-
-        //样品类型
-        private String sample_Type;
-        public String Sample_Type
-        {
-            get { return this.sample_Type; }
-            set { this.sample_Type = value; }
-        }
-
-        //厂商
-        private String firm;
-        public String Firm
-        {
-            get { return this.firm; }
-            set { this.firm = value; }
-        }
-
-        //对焦参数
-
-        //能谱参数
-
+        public MeasureParam m_Config;
         #endregion
 
-        public ConfigFile()
+        public ConfigFile(MeasureParam mp)
         {
-            
+            this.m_Config = mp;
         }
 
 
@@ -194,15 +95,15 @@ namespace MeasureData
 
             xBool isPhotograph = new xBool();
             xBool ptDepostion = new xBool();
-            isPhotograph.AssignValue(this.is_Photograph);
-            ptDepostion.AssignValue(this.pt_Depostion);
+            isPhotograph.AssignValue(m_Config.Is_Photograph);
+            ptDepostion.AssignValue(m_Config.PT);
             sFile.Register("Is_Photograph", isPhotograph);
             sFile.Register("PT_Depostion", ptDepostion);
 
             xString ptELYFile = new xString();
             xString fibELYFile = new xString();
-            ptELYFile.AssignValue(this.pt_ELYFile);
-            fibELYFile.AssignValue(this.fib_ELYFile);
+            ptELYFile.AssignValue(m_Config.PTTemp);
+            fibELYFile.AssignValue(m_Config.FIBTemp);
             sFile.Register("PT_ELYFile", ptELYFile);
             sFile.Register("FIB_ELYFile", fibELYFile);
 
@@ -211,11 +112,11 @@ namespace MeasureData
             xDouble locationVoltage = new xDouble();
             xDouble photographMagnification = new xDouble();
             xDouble photographVoltage = new xDouble();
-            stretchMagnification.AssignValue(this.stretch_Magnification);
-            locationMagnification.AssignValue(this.location_Magnification);
-            locationVoltage.AssignValue(this.location_Voltage);
-            photographMagnification.AssignValue(this.photograph_Magnification);
-            photographVoltage.AssignValue(this.photograph_Voltage);
+            stretchMagnification.AssignValue(m_Config.Stretch_Magnification);
+            locationMagnification.AssignValue(m_Config.Location_Magnification);
+            locationVoltage.AssignValue(m_Config.Location_Voltage);
+            photographMagnification.AssignValue(m_Config.Photograph_Magnification);
+            photographVoltage.AssignValue(m_Config.Photograph_Voltage);
             sFile.Register("Strectch_Magnification", stretchMagnification);
             sFile.Register("Locatio_Magnification", locationMagnification);
             sFile.Register("Location_Voltage", locationVoltage);
@@ -223,13 +124,13 @@ namespace MeasureData
             sFile.Register("Photograph_Voltage", photographVoltage);
 
             xDouble correctionAngle = new xDouble();
-            correctionAngle.AssignValue(this.correction_Angle);
+            correctionAngle.AssignValue(m_Config.Correction_Angle);
             sFile.Register("Correction_Angle", correctionAngle);
 
             xString sampleType = new xString();
             xString _firm = new xString();
-            sampleType.AssignValue(this.sample_Type);
-            _firm.AssignValue(this.firm);
+            sampleType.AssignValue(m_Config.SampleName);
+            _firm.AssignValue(m_Config.Firm);
             sFile.Register("Sample_Type", sampleType);
             sFile.Register("Firm", _firm);
 
@@ -241,22 +142,22 @@ namespace MeasureData
             {
                 sFile.Serialize(false, xml, rootNode);
 
-                this.is_Photograph = isPhotograph.value();
-                this.pt_Depostion = ptDepostion.value();
+                m_Config.Is_Photograph = isPhotograph.value();
+                m_Config.PT = ptDepostion.value();
 
-                this.pt_ELYFile = ptELYFile.value();
-                this.fib_ELYFile = fibELYFile.value();
+                m_Config.PTTemp = ptELYFile.value();
+                m_Config.FIBTemp = fibELYFile.value();
 
-                this.stretch_Magnification = stretchMagnification.value();
-                this.location_Magnification = locationMagnification.value();
-                this.location_Voltage = locationVoltage.value();
-                this.photograph_Magnification = photographMagnification.value();
-                this.photograph_Voltage = photographVoltage.value();
+                m_Config.Stretch_Magnification = stretchMagnification.value();
+                m_Config.Location_Magnification = locationMagnification.value();
+                m_Config.Location_Voltage = locationVoltage.value();
+                m_Config.Photograph_Magnification = photographMagnification.value();
+                m_Config.Photograph_Voltage = photographVoltage.value();
 
-                this.correction_Angle = correctionAngle.value();
+                m_Config.Correction_Angle = correctionAngle.value();
 
-                this.sample_Type = sampleType.value();
-                this.firm = _firm.value();
+                m_Config.SampleName = sampleType.value();
+                m_Config.Firm = _firm.value();
             }
         }
     }

MeasureData/MeasureParam.cs

@@ -19,7 +19,7 @@ namespace MeasureData
         #region 内容
         //工作条件，一次测量的全部切孔都是一类的
 
-        // 样品名
+        // 样品类型
         private string m_SampleName;
         public string SampleName
         {
@@ -27,6 +27,14 @@ namespace MeasureData
             set { this.m_SampleName = value; }
         }
 
+        //是否仅拍照
+        private Boolean is_Photograph;
+        public Boolean Is_Photograph
+        {
+            get { return this.is_Photograph; }
+            set { this.is_Photograph = value; }
+        }
+
         //是否有pt工序
         private Boolean m_pt;
         public Boolean PT
@@ -58,6 +66,67 @@ namespace MeasureData
             get { return m_fMode; }
             set { m_fMode = value; }
         }
+
+        //拉直操作需要的放大位数
+        private double stretch_Magnification;
+        public double Stretch_Magnification
+        {
+            get { return this.stretch_Magnification; }
+            set { this.stretch_Magnification = value; }
+        }
+
+        //定位切割位置的放大倍数
+        private double location_Magnification;
+        public double Location_Magnification
+        {
+            get { return this.location_Magnification; }
+            set { this.location_Magnification = value; }
+        }
+
+        //定位切割位置的工作电压
+        private double location_Voltage;
+        public double Location_Voltage
+        {
+            get { return this.location_Voltage; }
+            set { this.location_Voltage = value; }
+        }
+
+        //拍照的放大倍数
+        private double photograph_Magnification;
+        public double Photograph_Magnification
+        {
+            get { return this.photograph_Magnification; }
+            set { this.photograph_Magnification = value; }
+        }
+
+        //拍照的工作电压
+        private double photograph_Voltage;
+        public double Photograph_Voltage
+        {
+            get { return this.photograph_Voltage; }
+            set { this.photograph_Voltage = value; }
+        }
+
+        //校正角度选择
+        private double correction_Angle;
+        public double Correction_Angle
+        {
+            get { return this.correction_Angle; }
+            set { this.correction_Angle = value; }
+        }
+
+        //厂商
+        private String firm;
+        public String Firm
+        {
+            get { return this.firm; }
+            set { this.firm = value; }
+        }
+
+        //对焦参数
+
+        //能谱参数
+
         #endregion
 
         //构造函数