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

MeasureData/ConfigFile.cs

@@ -13,6 +13,22 @@ namespace MeasureData
     public class ConfigFile : ISlo
     {
         #region 内容
+        //文件名
+        private string m_fileName;
+        public string FileName
+        {
+            get { return this.m_fileName; }
+            set { this.m_fileName = value; }
+        }
+
+        //文件路径
+        private string m_filepath;
+        public string FilePath
+        {
+            get { return this.m_filepath; }
+            set { this.m_filepath = value; }
+        }
+
         public MeasureParam m_Config;
         #endregion
 
@@ -92,47 +108,7 @@ namespace MeasureData
         public override void Serialize(bool isStoring, XmlDocument xml, XmlNode rootNode)
         {
             Slo sFile = new Slo();
-
-            xBool isPhotograph = new xBool();
-            xBool ptDepostion = new xBool();
-            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(m_Config.PTTemp);
-            fibELYFile.AssignValue(m_Config.FIBTemp);
-            sFile.Register("PT_ELYFile", ptELYFile);
-            sFile.Register("FIB_ELYFile", fibELYFile);
-
-            xDouble stretchMagnification = new xDouble();
-            xDouble locationMagnification = new xDouble();
-            xDouble locationVoltage = new xDouble();
-            xDouble photographMagnification = new xDouble();
-            xDouble photographVoltage = new xDouble();
-            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);
-            sFile.Register("Photograph_Magnification", photographMagnification);
-            sFile.Register("Photograph_Voltage", photographVoltage);
-
-            xDouble correctionAngle = new xDouble();
-            correctionAngle.AssignValue(m_Config.Correction_Angle);
-            sFile.Register("Correction_Angle", correctionAngle);
-
-            xString sampleType = new xString();
-            xString _firm = new xString();
-            sampleType.AssignValue(m_Config.SampleName);
-            _firm.AssignValue(m_Config.Firm);
-            sFile.Register("Sample_Type", sampleType);
-            sFile.Register("Firm", _firm);
+            sFile.Register("Param", this.m_Config);
 
             if (isStoring)
             {
@@ -141,23 +117,6 @@ namespace MeasureData
             else
             {
                 sFile.Serialize(false, xml, rootNode);
-
-                m_Config.Is_Photograph = isPhotograph.value();
-                m_Config.PT = ptDepostion.value();
-
-                m_Config.PTTemp = ptELYFile.value();
-                m_Config.FIBTemp = fibELYFile.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();
-
-                m_Config.Correction_Angle = correctionAngle.value();
-
-                m_Config.SampleName = sampleType.value();
-                m_Config.Firm = _firm.value();
             }
         }
     }

MeasureData/MeasureParam.cs

@@ -152,40 +152,88 @@ namespace MeasureData
         //XML文件保存测量参数
         public override void Serialize(bool isStoring, XmlDocument xml, XmlNode rootNode)
         {
-            Slo slo_msparam = new Slo();
-
-            xString sampleName = new xString();
-            xBool pt = new xBool();
-            xString FIBtemp = new xString();
-            xString PTtemp = new xString();
-            xBool FocMode = new xBool();
-
-            sampleName.AssignValue(this.SampleName);
-            pt.AssignValue(this.PT);
-            FIBtemp.AssignValue(this.FIBTemp);
-            PTtemp.AssignValue(this.PTTemp);
-            FocMode.AssignValue(this.FocusMode);
-
-            slo_msparam.Register("SampleName", sampleName);
-            slo_msparam.Register("PT", pt);
-            slo_msparam.Register("FIBTemp", FIBtemp);
-            slo_msparam.Register("PTTemp", PTtemp);
-            slo_msparam.Register("FocusMode", FocMode);
-            slo_msparam.Register("FocusParam", AutoFocus);
+            Slo sFile = new Slo();
+
+            //是否拍照和PT
+            xBool isPhotograph = new xBool();
+            xBool ptDepostion = new xBool();
+            isPhotograph.AssignValue(this.is_Photograph);
+            ptDepostion.AssignValue(this.m_pt);
+            sFile.Register("Is_Photograph", isPhotograph);
+            sFile.Register("PT_Depostion", ptDepostion);
+
+            //ELY文件
+            xString ptELYFile = new xString();
+            xString fibELYFile = new xString();
+            ptELYFile.AssignValue(this.m_ptTemp);
+            fibELYFile.AssignValue(this.m_fibTemp);
+            sFile.Register("PT_ELYFile", ptELYFile);
+            sFile.Register("FIB_ELYFile", fibELYFile);
+
+            //对焦方式
+            xBool focusmode = new xBool();
+            focusmode.AssignValue(this.m_fMode);
+            sFile.Register("FocusMode", focusmode);
+
+            //放大倍数和电压参数
+            xDouble stretchMagnification = new xDouble();
+            xDouble locationMagnification = new xDouble();
+            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);
+            sFile.Register("Strectch_Magnification", stretchMagnification);
+            sFile.Register("Locatio_Magnification", locationMagnification);
+            sFile.Register("Location_Voltage", locationVoltage);
+            sFile.Register("Photograph_Magnification", photographMagnification);
+            sFile.Register("Photograph_Voltage", photographVoltage);
+
+            //校正角度
+            xDouble correctionAngle = new xDouble();
+            correctionAngle.AssignValue(this.correction_Angle);
+            sFile.Register("Correction_Angle", correctionAngle);
+
+            //样品名称和厂商
+            xString sampleType = new xString();
+            xString _firm = new xString();
+            sampleType.AssignValue(this.m_SampleName);
+            _firm.AssignValue(this.firm);
+            sFile.Register("Sample_Type", sampleType);
+            sFile.Register("Firm", _firm);
+
+            //对焦参数
+            sFile.Register("Focus_Param", this.focusP);
 
             if (isStoring)
             {
-                slo_msparam.Serialize(true, xml, rootNode);
+                sFile.Serialize(true, xml, rootNode);
             }
             else
             {
-                slo_msparam.Serialize(false, xml, rootNode);
+                sFile.Serialize(false, xml, rootNode);
 
-                this.SampleName = sampleName.value();
-                this.PT = pt.value();
-                this.FIBTemp = FIBtemp.value();
-                this.PTTemp = PTtemp.value();
-                this.FocusMode = FocMode.value();
+                this.is_Photograph = isPhotograph.value();
+                this.m_pt = ptDepostion.value();
+
+                this.m_ptTemp = ptELYFile.value();
+                this.m_fibTemp = fibELYFile.value();
+
+                this.m_fMode = focusmode.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();
+
+                this.correction_Angle = correctionAngle.value();
+
+                this.m_SampleName = sampleType.value();
+                this.firm = _firm.value();
             }
         }