update Serialize.cs

FileManager/Serialize.cs

@@ -109,7 +109,7 @@ namespace FileManager
             bool value = false;
             string sHelp = m_sValue;
             //transform(sHelp.GetEnumerator(), sHelp.end(), sHelp.GetEnumerator(), toupper);
-            sHelp.ToUpper();
+            sHelp=sHelp.ToUpper();
             if (sHelp == "TRUE")
                 return true;
             return value;

HOZProject/FormUnitControl.cs

@@ -617,12 +617,12 @@ namespace HOZProject
             MeasureFile mf = new MeasureFile();
 
             XmlDocument doc = new XmlDocument();
-            doc.Load("test.xml");//载入xml文件
+            doc.Load("test_opton.msf");//载入xml文件
             XmlNode root = doc.SelectSingleNode("XMLData");
 
             mf.Serialize(false, doc, root);
 
-            doc.Save("test.xml");
+            doc.Save("test_opton.msf");
         }
         #endregion
 
@@ -631,7 +631,7 @@ namespace HOZProject
         {
             MeasureFile mf = new MeasureFile();
 
-            mf.FileName = "test_opton.msf";
+            mf.FileName = path + "\\test_opton.msf";
             mf.FilePath = path;
 
             CutHole ch = new CutHole();
@@ -672,6 +672,15 @@ namespace HOZProject
 
             mf.ListCutHole.Add(ch);
 
+            MeasureParam md = new MeasureParam();
+            md.SampleName = "aaaaaa";
+            md.PT = true;
+            md.PTTemp = "bbbbb";
+            md.FIBTemp = "cccc";
+            md.FocusMode = false;
+
+            mf.MParam = md;
+
             mf.New();
             //XmlDocument doc = new XmlDocument();
             //doc.Load(mf.FilePath+"\\" + mf.FileName);//载入xml文件

HOZProject/Program.cs

@@ -17,8 +17,8 @@ namespace HOZProject
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
             //Application.Run(new FormUCMain());
-            //Application.Run(new FormUnitControl());
-            Application.Run(new FormMeasureTest());
+            Application.Run(new FormUnitControl());
+            //Application.Run(new FormMeasureTest());
         }
     }
 }

MeasureData/MeasureFile.cs

@@ -72,6 +72,7 @@ namespace MeasureData
             }
             else
             {
+                XmlManager.CreateXmlFile(this.FileName);
                 return 2;
             }
         }
@@ -80,6 +81,8 @@ namespace MeasureData
         //样品孔存储xml文档
         public override void Serialize(bool isStoring, XmlDocument xml, XmlNode rootNode)
         {
+            CreateXml();
+            //定义根结点
             Slo<MeasureFile> slo_msf = new Slo<MeasureFile>();
 
             Slo<CutHole> slo_cuthole = new Slo<CutHole>();
@@ -97,8 +100,12 @@ namespace MeasureData
             slo_cuthole.Register("FileName", FileName);
             slo_cuthole.Register("FilePath", FilePath);
 
+            
+
             slo_cuthole.Register("ListCutHole", cot_cuthole);
 
+            slo_cuthole.Register("MParam", this.MParam);
+
             slo_msf.Register("MeasureFile", slo_cuthole);
 
             if (isStoring)
@@ -137,18 +144,18 @@ namespace MeasureData
         //新建
         public bool New()
         {
-            //int ret = CreateXml();
-            //if(ret>0)
-            //{
-            //    XmlDocument doc = new XmlDocument();
-            //    doc.Load(this.FilePath + "\\" + this.FileName);//载入xml文件
+            int ret = CreateXml();
+            if (ret > 0)
+            {
+                XmlDocument doc = new XmlDocument();
+                doc.Load(this.FileName);//载入xml文件
 
-            //    XmlNode root = doc.SelectSingleNode("XMLData");
+                XmlNode root = doc.SelectSingleNode("XMLData");
 
-            //    Serialize(true, doc, root);
+                Serialize(true, doc, root);
 
-            //    doc.Save(this.FilePath + "\\" + this.FileName);
-            //}
+                doc.Save(this.FileName);
+            }
 
             // 设置路径为初始默认路径
             this.FileName = UNTITLED_FILE_NAME;