Sfoglia il codice sorgente

更改配置文件操作

@wang_qi0307 5 anni fa
parent
commit
8c6e750f02

+ 5 - 0
HOZProject/App.config

@@ -3,4 +3,9 @@
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
     </startup>
+
+    <appSettings>
+      <add key="Firm" value="厂商A,厂商B,厂商C"/>
+      <add key="Sample_Type" value="类型A,类型B,类型C"/>
+    </appSettings>
 </configuration>

+ 521 - 221
HOZProject/FormUnitControl.Designer.cs

@@ -214,32 +214,56 @@
             this.label25 = new System.Windows.Forms.Label();
             this.btnPost1 = new System.Windows.Forms.Button();
             this.tabPage3 = new System.Windows.Forms.TabPage();
-            this.lblSampleName = new System.Windows.Forms.Label();
-            this.label34 = new System.Windows.Forms.Label();
-            this.lblTemplateFile = new System.Windows.Forms.Label();
-            this.label29 = new System.Windows.Forms.Label();
-            this.ckbPT = new System.Windows.Forms.CheckBox();
+            this.txtWFIBF = new System.Windows.Forms.TextBox();
+            this.txtWPTF = new System.Windows.Forms.TextBox();
+            this.label48 = new System.Windows.Forms.Label();
+            this.label56 = new System.Windows.Forms.Label();
+            this.label59 = new System.Windows.Forms.Label();
+            this.label61 = new System.Windows.Forms.Label();
+            this.chkWPT = new System.Windows.Forms.CheckBox();
+            this.label62 = new System.Windows.Forms.Label();
             this.btnReadConfig = new System.Windows.Forms.Button();
-            this.label26 = new System.Windows.Forms.Label();
             this.btnCreateConfig = new System.Windows.Forms.Button();
-            this.lblpixel = new System.Windows.Forms.Label();
+            this.chkWIsP = new System.Windows.Forms.CheckBox();
+            this.label32 = new System.Windows.Forms.Label();
+            this.label38 = new System.Windows.Forms.Label();
+            this.label42 = new System.Windows.Forms.Label();
+            this.label46 = new System.Windows.Forms.Label();
+            this.label50 = new System.Windows.Forms.Label();
+            this.label54 = new System.Windows.Forms.Label();
+            this.label58 = new System.Windows.Forms.Label();
+            this.label26 = new System.Windows.Forms.Label();
+            this.label29 = new System.Windows.Forms.Label();
+            this.label34 = new System.Windows.Forms.Label();
             this.label36 = new System.Windows.Forms.Label();
-            this.lblmag = new System.Windows.Forms.Label();
             this.label40 = new System.Windows.Forms.Label();
-            this.lblvoltage = new System.Windows.Forms.Label();
             this.label44 = new System.Windows.Forms.Label();
-            this.label48 = new System.Windows.Forms.Label();
+            this.chkRIsP = new System.Windows.Forms.CheckBox();
             this.label52 = new System.Windows.Forms.Label();
-            this.label56 = new System.Windows.Forms.Label();
-            this.label59 = new System.Windows.Forms.Label();
-            this.label61 = new System.Windows.Forms.Label();
-            this.chkpt0 = new System.Windows.Forms.CheckBox();
-            this.label62 = new System.Windows.Forms.Label();
-            this.txtTemplateFile = new System.Windows.Forms.TextBox();
-            this.txtSampleName = new System.Windows.Forms.TextBox();
-            this.txtpixel = new System.Windows.Forms.TextBox();
-            this.txtMag = new System.Windows.Forms.TextBox();
-            this.txtvoltage = new System.Windows.Forms.TextBox();
+            this.label60 = new System.Windows.Forms.Label();
+            this.label63 = new System.Windows.Forms.Label();
+            this.label64 = new System.Windows.Forms.Label();
+            this.label65 = new System.Windows.Forms.Label();
+            this.chkRPT = new System.Windows.Forms.CheckBox();
+            this.label66 = new System.Windows.Forms.Label();
+            this.txtRPZD = new System.Windows.Forms.TextBox();
+            this.txtRQGD = new System.Windows.Forms.TextBox();
+            this.txtRFIBF = new System.Windows.Forms.TextBox();
+            this.txtRPTF = new System.Windows.Forms.TextBox();
+            this.txtRQGF = new System.Windows.Forms.TextBox();
+            this.txtRPZF = new System.Windows.Forms.TextBox();
+            this.txtRCS = new System.Windows.Forms.TextBox();
+            this.txtRYP = new System.Windows.Forms.TextBox();
+            this.txtRXZ = new System.Windows.Forms.TextBox();
+            this.txtRLZ = new System.Windows.Forms.TextBox();
+            this.cbbWYP = new System.Windows.Forms.ComboBox();
+            this.cbbWCS = new System.Windows.Forms.ComboBox();
+            this.cbbWXZ = new System.Windows.Forms.ComboBox();
+            this.cbbWLZ = new System.Windows.Forms.ComboBox();
+            this.cbbWQGF = new System.Windows.Forms.ComboBox();
+            this.cbbWQGD = new System.Windows.Forms.ComboBox();
+            this.cbbWPZD = new System.Windows.Forms.ComboBox();
+            this.cbbWPZF = new System.Windows.Forms.ComboBox();
             this.panelControl.SuspendLayout();
             this.panelSEM.SuspendLayout();
             this.panelFIB.SuspendLayout();
@@ -2443,31 +2467,55 @@
             // 
             // tabPage3
             // 
-            this.tabPage3.Controls.Add(this.txtvoltage);
-            this.tabPage3.Controls.Add(this.txtpixel);
-            this.tabPage3.Controls.Add(this.txtMag);
-            this.tabPage3.Controls.Add(this.txtSampleName);
-            this.tabPage3.Controls.Add(this.txtTemplateFile);
-            this.tabPage3.Controls.Add(this.label48);
+            this.tabPage3.Controls.Add(this.cbbWPZD);
+            this.tabPage3.Controls.Add(this.cbbWPZF);
+            this.tabPage3.Controls.Add(this.cbbWQGD);
+            this.tabPage3.Controls.Add(this.cbbWQGF);
+            this.tabPage3.Controls.Add(this.cbbWLZ);
+            this.tabPage3.Controls.Add(this.cbbWXZ);
+            this.tabPage3.Controls.Add(this.cbbWCS);
+            this.tabPage3.Controls.Add(this.cbbWYP);
+            this.tabPage3.Controls.Add(this.txtRXZ);
+            this.tabPage3.Controls.Add(this.label26);
+            this.tabPage3.Controls.Add(this.txtRPZD);
+            this.tabPage3.Controls.Add(this.label29);
+            this.tabPage3.Controls.Add(this.txtRPZF);
+            this.tabPage3.Controls.Add(this.label34);
+            this.tabPage3.Controls.Add(this.txtRQGD);
+            this.tabPage3.Controls.Add(this.label36);
+            this.tabPage3.Controls.Add(this.txtRQGF);
+            this.tabPage3.Controls.Add(this.label40);
+            this.tabPage3.Controls.Add(this.txtRLZ);
+            this.tabPage3.Controls.Add(this.label44);
+            this.tabPage3.Controls.Add(this.chkRIsP);
             this.tabPage3.Controls.Add(this.label52);
+            this.tabPage3.Controls.Add(this.txtRYP);
+            this.tabPage3.Controls.Add(this.txtRCS);
+            this.tabPage3.Controls.Add(this.txtRFIBF);
+            this.tabPage3.Controls.Add(this.txtRPTF);
+            this.tabPage3.Controls.Add(this.label60);
+            this.tabPage3.Controls.Add(this.label63);
+            this.tabPage3.Controls.Add(this.label64);
+            this.tabPage3.Controls.Add(this.label65);
+            this.tabPage3.Controls.Add(this.chkRPT);
+            this.tabPage3.Controls.Add(this.label66);
+            this.tabPage3.Controls.Add(this.label58);
+            this.tabPage3.Controls.Add(this.label50);
+            this.tabPage3.Controls.Add(this.label54);
+            this.tabPage3.Controls.Add(this.label46);
+            this.tabPage3.Controls.Add(this.label42);
+            this.tabPage3.Controls.Add(this.label38);
+            this.tabPage3.Controls.Add(this.chkWIsP);
+            this.tabPage3.Controls.Add(this.label32);
+            this.tabPage3.Controls.Add(this.txtWFIBF);
+            this.tabPage3.Controls.Add(this.txtWPTF);
+            this.tabPage3.Controls.Add(this.label48);
             this.tabPage3.Controls.Add(this.label56);
             this.tabPage3.Controls.Add(this.label59);
             this.tabPage3.Controls.Add(this.label61);
-            this.tabPage3.Controls.Add(this.chkpt0);
+            this.tabPage3.Controls.Add(this.chkWPT);
             this.tabPage3.Controls.Add(this.label62);
-            this.tabPage3.Controls.Add(this.lblvoltage);
-            this.tabPage3.Controls.Add(this.label44);
-            this.tabPage3.Controls.Add(this.lblpixel);
-            this.tabPage3.Controls.Add(this.label36);
-            this.tabPage3.Controls.Add(this.lblmag);
-            this.tabPage3.Controls.Add(this.label40);
-            this.tabPage3.Controls.Add(this.lblSampleName);
-            this.tabPage3.Controls.Add(this.label34);
-            this.tabPage3.Controls.Add(this.lblTemplateFile);
-            this.tabPage3.Controls.Add(this.label29);
-            this.tabPage3.Controls.Add(this.ckbPT);
             this.tabPage3.Controls.Add(this.btnReadConfig);
-            this.tabPage3.Controls.Add(this.label26);
             this.tabPage3.Controls.Add(this.btnCreateConfig);
             this.tabPage3.Location = new System.Drawing.Point(4, 25);
             this.tabPage3.Name = "tabPage3";
@@ -2476,54 +2524,79 @@
             this.tabPage3.Text = "参数文件设计";
             this.tabPage3.UseVisualStyleBackColor = true;
             // 
-            // lblSampleName
+            // txtWFIBF
             // 
-            this.lblSampleName.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblSampleName.Location = new System.Drawing.Point(859, 219);
-            this.lblSampleName.Name = "lblSampleName";
-            this.lblSampleName.Size = new System.Drawing.Size(145, 29);
-            this.lblSampleName.TabIndex = 7;
-            this.lblSampleName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.txtWFIBF.Location = new System.Drawing.Point(1098, 34);
+            this.txtWFIBF.Name = "txtWFIBF";
+            this.txtWFIBF.Size = new System.Drawing.Size(145, 25);
+            this.txtWFIBF.TabIndex = 26;
+            this.txtWFIBF.Text = "Sample001";
             // 
-            // label34
+            // txtWPTF
             // 
-            this.label34.AutoSize = true;
-            this.label34.Location = new System.Drawing.Point(771, 226);
-            this.label34.Name = "label34";
-            this.label34.Size = new System.Drawing.Size(82, 15);
-            this.label34.TabIndex = 6;
-            this.label34.Text = "样品名称:";
+            this.txtWPTF.Location = new System.Drawing.Point(800, 34);
+            this.txtWPTF.Name = "txtWPTF";
+            this.txtWPTF.Size = new System.Drawing.Size(145, 25);
+            this.txtWPTF.TabIndex = 25;
+            this.txtWPTF.Text = "HOZ001";
             // 
-            // lblTemplateFile
+            // label48
             // 
-            this.lblTemplateFile.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblTemplateFile.Location = new System.Drawing.Point(573, 219);
-            this.lblTemplateFile.Name = "lblTemplateFile";
-            this.lblTemplateFile.Size = new System.Drawing.Size(145, 29);
-            this.lblTemplateFile.TabIndex = 5;
-            this.lblTemplateFile.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.label48.AutoSize = true;
+            this.label48.Location = new System.Drawing.Point(280, 227);
+            this.label48.Name = "label48";
+            this.label48.Size = new System.Drawing.Size(82, 15);
+            this.label48.TabIndex = 24;
+            this.label48.Text = "样品类型:";
             // 
-            // label29
+            // label56
             // 
-            this.label29.AutoSize = true;
-            this.label29.Location = new System.Drawing.Point(485, 226);
-            this.label29.Name = "label29";
-            this.label29.Size = new System.Drawing.Size(82, 15);
-            this.label29.TabIndex = 4;
-            this.label29.Text = "模板文件:";
+            this.label56.AutoSize = true;
+            this.label56.Location = new System.Drawing.Point(633, 227);
+            this.label56.Name = "label56";
+            this.label56.Size = new System.Drawing.Size(52, 15);
+            this.label56.TabIndex = 20;
+            this.label56.Text = "厂商:";
             // 
-            // ckbPT
+            // label59
             // 
-            this.ckbPT.AutoSize = true;
-            this.ckbPT.Location = new System.Drawing.Point(386, 224);
-            this.ckbPT.Name = "ckbPT";
-            this.ckbPT.Size = new System.Drawing.Size(18, 17);
-            this.ckbPT.TabIndex = 3;
-            this.ckbPT.UseVisualStyleBackColor = true;
+            this.label59.AutoSize = true;
+            this.label59.Location = new System.Drawing.Point(992, 39);
+            this.label59.Name = "label59";
+            this.label59.Size = new System.Drawing.Size(100, 15);
+            this.label59.TabIndex = 18;
+            this.label59.Text = "FIBELY名称:";
+            // 
+            // label61
+            // 
+            this.label61.AutoSize = true;
+            this.label61.Location = new System.Drawing.Point(688, 39);
+            this.label61.Name = "label61";
+            this.label61.Size = new System.Drawing.Size(92, 15);
+            this.label61.TabIndex = 16;
+            this.label61.Text = "PTELY文件:";
+            // 
+            // chkWPT
+            // 
+            this.chkWPT.AutoSize = true;
+            this.chkWPT.Location = new System.Drawing.Point(591, 37);
+            this.chkWPT.Name = "chkWPT";
+            this.chkWPT.Size = new System.Drawing.Size(18, 17);
+            this.chkWPT.TabIndex = 15;
+            this.chkWPT.UseVisualStyleBackColor = true;
+            // 
+            // label62
+            // 
+            this.label62.AutoSize = true;
+            this.label62.Location = new System.Drawing.Point(485, 37);
+            this.label62.Name = "label62";
+            this.label62.Size = new System.Drawing.Size(68, 15);
+            this.label62.TabIndex = 14;
+            this.label62.Text = "是否PT:";
             // 
             // btnReadConfig
             // 
-            this.btnReadConfig.Location = new System.Drawing.Point(77, 208);
+            this.btnReadConfig.Location = new System.Drawing.Point(77, 288);
             this.btnReadConfig.Name = "btnReadConfig";
             this.btnReadConfig.Size = new System.Drawing.Size(155, 47);
             this.btnReadConfig.TabIndex = 2;
@@ -2531,18 +2604,9 @@
             this.btnReadConfig.UseVisualStyleBackColor = true;
             this.btnReadConfig.Click += new System.EventHandler(this.btnReadConfig_Click);
             // 
-            // label26
-            // 
-            this.label26.AutoSize = true;
-            this.label26.Location = new System.Drawing.Point(280, 224);
-            this.label26.Name = "label26";
-            this.label26.Size = new System.Drawing.Size(53, 15);
-            this.label26.TabIndex = 1;
-            this.label26.Text = "是否PT";
-            // 
             // btnCreateConfig
             // 
-            this.btnCreateConfig.Location = new System.Drawing.Point(77, 47);
+            this.btnCreateConfig.Location = new System.Drawing.Point(77, 21);
             this.btnCreateConfig.Name = "btnCreateConfig";
             this.btnCreateConfig.Size = new System.Drawing.Size(155, 47);
             this.btnCreateConfig.TabIndex = 0;
@@ -2550,162 +2614,373 @@
             this.btnCreateConfig.UseVisualStyleBackColor = true;
             this.btnCreateConfig.Click += new System.EventHandler(this.btnCreateConfig_Click);
             // 
-            // lblpixel
+            // chkWIsP
+            // 
+            this.chkWIsP.AutoSize = true;
+            this.chkWIsP.Location = new System.Drawing.Point(386, 37);
+            this.chkWIsP.Name = "chkWIsP";
+            this.chkWIsP.Size = new System.Drawing.Size(18, 17);
+            this.chkWIsP.TabIndex = 31;
+            this.chkWIsP.UseVisualStyleBackColor = true;
+            // 
+            // label32
+            // 
+            this.label32.AutoSize = true;
+            this.label32.Location = new System.Drawing.Point(280, 37);
+            this.label32.Name = "label32";
+            this.label32.Size = new System.Drawing.Size(97, 15);
+            this.label32.TabIndex = 30;
+            this.label32.Text = "是否仅拍照:";
+            // 
+            // label38
+            // 
+            this.label38.AutoSize = true;
+            this.label38.Location = new System.Drawing.Point(280, 100);
+            this.label38.Name = "label38";
+            this.label38.Size = new System.Drawing.Size(142, 15);
+            this.label38.TabIndex = 32;
+            this.label38.Text = "拉直操作放大位数:";
+            // 
+            // label42
+            // 
+            this.label42.AutoSize = true;
+            this.label42.Location = new System.Drawing.Point(632, 100);
+            this.label42.Name = "label42";
+            this.label42.Size = new System.Drawing.Size(142, 15);
+            this.label42.TabIndex = 34;
+            this.label42.Text = "定位切割放大位数:";
+            // 
+            // label46
+            // 
+            this.label46.AutoSize = true;
+            this.label46.Location = new System.Drawing.Point(980, 100);
+            this.label46.Name = "label46";
+            this.label46.Size = new System.Drawing.Size(112, 15);
+            this.label46.TabIndex = 36;
+            this.label46.Text = "定位切割电压:";
+            // 
+            // label50
+            // 
+            this.label50.AutoSize = true;
+            this.label50.Location = new System.Drawing.Point(980, 158);
+            this.label50.Name = "label50";
+            this.label50.Size = new System.Drawing.Size(82, 15);
+            this.label50.TabIndex = 40;
+            this.label50.Text = "拍照电压:";
+            // 
+            // label54
+            // 
+            this.label54.AutoSize = true;
+            this.label54.Location = new System.Drawing.Point(632, 158);
+            this.label54.Name = "label54";
+            this.label54.Size = new System.Drawing.Size(112, 15);
+            this.label54.TabIndex = 38;
+            this.label54.Text = "拍照放大位数:";
+            // 
+            // label58
+            // 
+            this.label58.AutoSize = true;
+            this.label58.Location = new System.Drawing.Point(281, 158);
+            this.label58.Name = "label58";
+            this.label58.Size = new System.Drawing.Size(82, 15);
+            this.label58.TabIndex = 42;
+            this.label58.Text = "校正角度:";
+            // 
+            // label26
+            // 
+            this.label26.AutoSize = true;
+            this.label26.Location = new System.Drawing.Point(281, 425);
+            this.label26.Name = "label26";
+            this.label26.Size = new System.Drawing.Size(82, 15);
+            this.label26.TabIndex = 66;
+            this.label26.Text = "校正角度:";
+            // 
+            // label29
             // 
-            this.lblpixel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblpixel.Location = new System.Drawing.Point(859, 283);
-            this.lblpixel.Name = "lblpixel";
-            this.lblpixel.Size = new System.Drawing.Size(145, 29);
-            this.lblpixel.TabIndex = 11;
-            this.lblpixel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.label29.AutoSize = true;
+            this.label29.Location = new System.Drawing.Point(980, 425);
+            this.label29.Name = "label29";
+            this.label29.Size = new System.Drawing.Size(82, 15);
+            this.label29.TabIndex = 64;
+            this.label29.Text = "拍照电压:";
+            // 
+            // label34
+            // 
+            this.label34.AutoSize = true;
+            this.label34.Location = new System.Drawing.Point(632, 425);
+            this.label34.Name = "label34";
+            this.label34.Size = new System.Drawing.Size(112, 15);
+            this.label34.TabIndex = 62;
+            this.label34.Text = "拍照放大位数:";
             // 
             // label36
             // 
             this.label36.AutoSize = true;
-            this.label36.Location = new System.Drawing.Point(771, 290);
+            this.label36.Location = new System.Drawing.Point(980, 367);
             this.label36.Name = "label36";
-            this.label36.Size = new System.Drawing.Size(82, 15);
-            this.label36.TabIndex = 10;
-            this.label36.Text = "像素大小:";
-            // 
-            // lblmag
-            // 
-            this.lblmag.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblmag.Location = new System.Drawing.Point(573, 283);
-            this.lblmag.Name = "lblmag";
-            this.lblmag.Size = new System.Drawing.Size(145, 29);
-            this.lblmag.TabIndex = 9;
-            this.lblmag.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.label36.Size = new System.Drawing.Size(112, 15);
+            this.label36.TabIndex = 60;
+            this.label36.Text = "定位切割电压:";
             // 
             // label40
             // 
             this.label40.AutoSize = true;
-            this.label40.Location = new System.Drawing.Point(485, 290);
+            this.label40.Location = new System.Drawing.Point(632, 367);
             this.label40.Name = "label40";
-            this.label40.Size = new System.Drawing.Size(82, 15);
-            this.label40.TabIndex = 8;
-            this.label40.Text = "放大倍数:";
-            // 
-            // lblvoltage
-            // 
-            this.lblvoltage.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.lblvoltage.Location = new System.Drawing.Point(368, 283);
-            this.lblvoltage.Name = "lblvoltage";
-            this.lblvoltage.Size = new System.Drawing.Size(91, 29);
-            this.lblvoltage.TabIndex = 13;
-            this.lblvoltage.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.label40.Size = new System.Drawing.Size(142, 15);
+            this.label40.TabIndex = 58;
+            this.label40.Text = "定位切割放大位数:";
             // 
             // label44
             // 
             this.label44.AutoSize = true;
-            this.label44.Location = new System.Drawing.Point(280, 290);
+            this.label44.Location = new System.Drawing.Point(280, 367);
             this.label44.Name = "label44";
-            this.label44.Size = new System.Drawing.Size(52, 15);
-            this.label44.TabIndex = 12;
-            this.label44.Text = "电压:";
+            this.label44.Size = new System.Drawing.Size(142, 15);
+            this.label44.TabIndex = 56;
+            this.label44.Text = "拉直操作放大位数:";
             // 
-            // label48
+            // chkRIsP
             // 
-            this.label48.AutoSize = true;
-            this.label48.Location = new System.Drawing.Point(280, 101);
-            this.label48.Name = "label48";
-            this.label48.Size = new System.Drawing.Size(52, 15);
-            this.label48.TabIndex = 24;
-            this.label48.Text = "电压:";
+            this.chkRIsP.AutoSize = true;
+            this.chkRIsP.Location = new System.Drawing.Point(386, 304);
+            this.chkRIsP.Name = "chkRIsP";
+            this.chkRIsP.Size = new System.Drawing.Size(18, 17);
+            this.chkRIsP.TabIndex = 55;
+            this.chkRIsP.UseVisualStyleBackColor = true;
             // 
             // label52
             // 
             this.label52.AutoSize = true;
-            this.label52.Location = new System.Drawing.Point(771, 101);
+            this.label52.Location = new System.Drawing.Point(280, 304);
             this.label52.Name = "label52";
-            this.label52.Size = new System.Drawing.Size(82, 15);
-            this.label52.TabIndex = 22;
-            this.label52.Text = "像素大小:";
+            this.label52.Size = new System.Drawing.Size(97, 15);
+            this.label52.TabIndex = 54;
+            this.label52.Text = "是否仅拍照:";
             // 
-            // label56
+            // label60
             // 
-            this.label56.AutoSize = true;
-            this.label56.Location = new System.Drawing.Point(485, 101);
-            this.label56.Name = "label56";
-            this.label56.Size = new System.Drawing.Size(82, 15);
-            this.label56.TabIndex = 20;
-            this.label56.Text = "放大倍数:";
-            // 
-            // label59
-            // 
-            this.label59.AutoSize = true;
-            this.label59.Location = new System.Drawing.Point(771, 37);
-            this.label59.Name = "label59";
-            this.label59.Size = new System.Drawing.Size(82, 15);
-            this.label59.TabIndex = 18;
-            this.label59.Text = "样品名称:";
-            // 
-            // label61
-            // 
-            this.label61.AutoSize = true;
-            this.label61.Location = new System.Drawing.Point(485, 37);
-            this.label61.Name = "label61";
-            this.label61.Size = new System.Drawing.Size(82, 15);
-            this.label61.TabIndex = 16;
-            this.label61.Text = "模板文件:";
-            // 
-            // chkpt0
+            this.label60.AutoSize = true;
+            this.label60.Location = new System.Drawing.Point(280, 494);
+            this.label60.Name = "label60";
+            this.label60.Size = new System.Drawing.Size(82, 15);
+            this.label60.TabIndex = 49;
+            this.label60.Text = "样品类型:";
             // 
-            this.chkpt0.AutoSize = true;
-            this.chkpt0.Location = new System.Drawing.Point(386, 35);
-            this.chkpt0.Name = "chkpt0";
-            this.chkpt0.Size = new System.Drawing.Size(18, 17);
-            this.chkpt0.TabIndex = 15;
-            this.chkpt0.UseVisualStyleBackColor = true;
+            // label63
             // 
-            // label62
-            // 
-            this.label62.AutoSize = true;
-            this.label62.Location = new System.Drawing.Point(280, 35);
-            this.label62.Name = "label62";
-            this.label62.Size = new System.Drawing.Size(53, 15);
-            this.label62.TabIndex = 14;
-            this.label62.Text = "是否PT";
+            this.label63.AutoSize = true;
+            this.label63.Location = new System.Drawing.Point(633, 494);
+            this.label63.Name = "label63";
+            this.label63.Size = new System.Drawing.Size(52, 15);
+            this.label63.TabIndex = 48;
+            this.label63.Text = "厂商:";
             // 
-            // txtTemplateFile
+            // label64
             // 
-            this.txtTemplateFile.Location = new System.Drawing.Point(573, 32);
-            this.txtTemplateFile.Name = "txtTemplateFile";
-            this.txtTemplateFile.Size = new System.Drawing.Size(145, 25);
-            this.txtTemplateFile.TabIndex = 25;
-            this.txtTemplateFile.Text = "HOZ001";
+            this.label64.AutoSize = true;
+            this.label64.Location = new System.Drawing.Point(992, 306);
+            this.label64.Name = "label64";
+            this.label64.Size = new System.Drawing.Size(100, 15);
+            this.label64.TabIndex = 47;
+            this.label64.Text = "FIBELY名称:";
             // 
-            // txtSampleName
+            // label65
             // 
-            this.txtSampleName.Location = new System.Drawing.Point(859, 32);
-            this.txtSampleName.Name = "txtSampleName";
-            this.txtSampleName.Size = new System.Drawing.Size(145, 25);
-            this.txtSampleName.TabIndex = 26;
-            this.txtSampleName.Text = "Sample001";
+            this.label65.AutoSize = true;
+            this.label65.Location = new System.Drawing.Point(688, 306);
+            this.label65.Name = "label65";
+            this.label65.Size = new System.Drawing.Size(92, 15);
+            this.label65.TabIndex = 46;
+            this.label65.Text = "PTELY文件:";
             // 
-            // txtpixel
+            // chkRPT
             // 
-            this.txtpixel.Location = new System.Drawing.Point(859, 98);
-            this.txtpixel.Name = "txtpixel";
-            this.txtpixel.Size = new System.Drawing.Size(145, 25);
-            this.txtpixel.TabIndex = 28;
-            this.txtpixel.Text = "0.000432";
+            this.chkRPT.AutoSize = true;
+            this.chkRPT.Location = new System.Drawing.Point(591, 304);
+            this.chkRPT.Name = "chkRPT";
+            this.chkRPT.Size = new System.Drawing.Size(18, 17);
+            this.chkRPT.TabIndex = 45;
+            this.chkRPT.UseVisualStyleBackColor = true;
             // 
-            // txtMag
+            // label66
             // 
-            this.txtMag.Location = new System.Drawing.Point(573, 98);
-            this.txtMag.Name = "txtMag";
-            this.txtMag.Size = new System.Drawing.Size(145, 25);
-            this.txtMag.TabIndex = 27;
-            this.txtMag.Text = "555.55";
+            this.label66.AutoSize = true;
+            this.label66.Location = new System.Drawing.Point(485, 304);
+            this.label66.Name = "label66";
+            this.label66.Size = new System.Drawing.Size(68, 15);
+            this.label66.TabIndex = 44;
+            this.label66.Text = "是否PT:";
             // 
-            // txtvoltage
+            // txtRPZD
             // 
-            this.txtvoltage.Location = new System.Drawing.Point(368, 98);
-            this.txtvoltage.Name = "txtvoltage";
-            this.txtvoltage.Size = new System.Drawing.Size(91, 25);
-            this.txtvoltage.TabIndex = 29;
-            this.txtvoltage.Text = "2000.52";
+            this.txtRPZD.Location = new System.Drawing.Point(1098, 422);
+            this.txtRPZD.Name = "txtRPZD";
+            this.txtRPZD.Size = new System.Drawing.Size(145, 25);
+            this.txtRPZD.TabIndex = 65;
+            // 
+            // txtRQGD
+            // 
+            this.txtRQGD.Location = new System.Drawing.Point(1098, 364);
+            this.txtRQGD.Name = "txtRQGD";
+            this.txtRQGD.Size = new System.Drawing.Size(145, 25);
+            this.txtRQGD.TabIndex = 61;
+            // 
+            // txtRFIBF
+            // 
+            this.txtRFIBF.Location = new System.Drawing.Point(1098, 301);
+            this.txtRFIBF.Name = "txtRFIBF";
+            this.txtRFIBF.Size = new System.Drawing.Size(145, 25);
+            this.txtRFIBF.TabIndex = 51;
+            // 
+            // txtRPTF
+            // 
+            this.txtRPTF.Location = new System.Drawing.Point(800, 301);
+            this.txtRPTF.Name = "txtRPTF";
+            this.txtRPTF.Size = new System.Drawing.Size(145, 25);
+            this.txtRPTF.TabIndex = 50;
+            // 
+            // txtRQGF
+            // 
+            this.txtRQGF.Location = new System.Drawing.Point(780, 364);
+            this.txtRQGF.Name = "txtRQGF";
+            this.txtRQGF.Size = new System.Drawing.Size(145, 25);
+            this.txtRQGF.TabIndex = 59;
+            // 
+            // txtRPZF
+            // 
+            this.txtRPZF.Location = new System.Drawing.Point(780, 422);
+            this.txtRPZF.Name = "txtRPZF";
+            this.txtRPZF.Size = new System.Drawing.Size(145, 25);
+            this.txtRPZF.TabIndex = 63;
+            // 
+            // txtRCS
+            // 
+            this.txtRCS.Location = new System.Drawing.Point(721, 491);
+            this.txtRCS.Name = "txtRCS";
+            this.txtRCS.Size = new System.Drawing.Size(145, 25);
+            this.txtRCS.TabIndex = 52;
+            // 
+            // txtRYP
+            // 
+            this.txtRYP.Location = new System.Drawing.Point(428, 491);
+            this.txtRYP.Name = "txtRYP";
+            this.txtRYP.Size = new System.Drawing.Size(91, 25);
+            this.txtRYP.TabIndex = 53;
+            // 
+            // txtRXZ
+            // 
+            this.txtRXZ.Location = new System.Drawing.Point(428, 422);
+            this.txtRXZ.Name = "txtRXZ";
+            this.txtRXZ.Size = new System.Drawing.Size(91, 25);
+            this.txtRXZ.TabIndex = 67;
+            // 
+            // txtRLZ
+            // 
+            this.txtRLZ.Location = new System.Drawing.Point(428, 364);
+            this.txtRLZ.Name = "txtRLZ";
+            this.txtRLZ.Size = new System.Drawing.Size(145, 25);
+            this.txtRLZ.TabIndex = 57;
+            // 
+            // cbbWYP
+            // 
+            this.cbbWYP.FormattingEnabled = true;
+            this.cbbWYP.Location = new System.Drawing.Point(419, 224);
+            this.cbbWYP.Name = "cbbWYP";
+            this.cbbWYP.Size = new System.Drawing.Size(121, 23);
+            this.cbbWYP.TabIndex = 68;
+            // 
+            // cbbWCS
+            // 
+            this.cbbWCS.FormattingEnabled = true;
+            this.cbbWCS.Location = new System.Drawing.Point(721, 224);
+            this.cbbWCS.Name = "cbbWCS";
+            this.cbbWCS.Size = new System.Drawing.Size(121, 23);
+            this.cbbWCS.TabIndex = 69;
+            // 
+            // cbbWXZ
+            // 
+            this.cbbWXZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cbbWXZ.FormattingEnabled = true;
+            this.cbbWXZ.Items.AddRange(new object[] {
+            "截面观测",
+            "表面观测"});
+            this.cbbWXZ.Location = new System.Drawing.Point(419, 155);
+            this.cbbWXZ.Name = "cbbWXZ";
+            this.cbbWXZ.Size = new System.Drawing.Size(121, 23);
+            this.cbbWXZ.TabIndex = 70;
+            // 
+            // cbbWLZ
+            // 
+            this.cbbWLZ.FormattingEnabled = true;
+            this.cbbWLZ.Items.AddRange(new object[] {
+            "600",
+            "1000",
+            "2000",
+            "10000"});
+            this.cbbWLZ.Location = new System.Drawing.Point(419, 97);
+            this.cbbWLZ.Name = "cbbWLZ";
+            this.cbbWLZ.Size = new System.Drawing.Size(121, 23);
+            this.cbbWLZ.TabIndex = 71;
+            this.cbbWLZ.Text = "600";
+            // 
+            // cbbWQGF
+            // 
+            this.cbbWQGF.FormattingEnabled = true;
+            this.cbbWQGF.Items.AddRange(new object[] {
+            "600",
+            "1000",
+            "2000",
+            "10000"});
+            this.cbbWQGF.Location = new System.Drawing.Point(780, 97);
+            this.cbbWQGF.Name = "cbbWQGF";
+            this.cbbWQGF.Size = new System.Drawing.Size(121, 23);
+            this.cbbWQGF.TabIndex = 72;
+            this.cbbWQGF.Text = "600";
+            // 
+            // cbbWQGD
+            // 
+            this.cbbWQGD.FormattingEnabled = true;
+            this.cbbWQGD.Items.AddRange(new object[] {
+            "1000",
+            "1500",
+            "2000",
+            "2500",
+            "3000"});
+            this.cbbWQGD.Location = new System.Drawing.Point(1098, 97);
+            this.cbbWQGD.Name = "cbbWQGD";
+            this.cbbWQGD.Size = new System.Drawing.Size(121, 23);
+            this.cbbWQGD.TabIndex = 73;
+            this.cbbWQGD.Text = "2000";
+            // 
+            // cbbWPZD
+            // 
+            this.cbbWPZD.FormattingEnabled = true;
+            this.cbbWPZD.Items.AddRange(new object[] {
+            "1000",
+            "1500",
+            "2000",
+            "2500",
+            "3000"});
+            this.cbbWPZD.Location = new System.Drawing.Point(1098, 155);
+            this.cbbWPZD.Name = "cbbWPZD";
+            this.cbbWPZD.Size = new System.Drawing.Size(121, 23);
+            this.cbbWPZD.TabIndex = 75;
+            this.cbbWPZD.Text = "2000";
+            // 
+            // cbbWPZF
+            // 
+            this.cbbWPZF.FormattingEnabled = true;
+            this.cbbWPZF.Items.AddRange(new object[] {
+            "600",
+            "1000",
+            "2000",
+            "10000"});
+            this.cbbWPZF.Location = new System.Drawing.Point(780, 155);
+            this.cbbWPZF.Name = "cbbWPZF";
+            this.cbbWPZF.Size = new System.Drawing.Size(121, 23);
+            this.cbbWPZF.TabIndex = 74;
+            this.cbbWPZF.Text = "600";
             // 
             // FormUnitControl
             // 
@@ -2716,6 +2991,7 @@
             this.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
             this.Name = "FormUnitControl";
             this.Text = "UnitControl";
+            this.Load += new System.EventHandler(this.FormUnitControl_Load);
             this.panelControl.ResumeLayout(false);
             this.panelSEM.ResumeLayout(false);
             this.panelSEM.PerformLayout();
@@ -2923,31 +3199,55 @@
         private System.Windows.Forms.Button btnExeEly3;
         private System.Windows.Forms.TabPage tabPage3;
         private System.Windows.Forms.Button btnCreateConfig;
-        private System.Windows.Forms.Label lblSampleName;
-        private System.Windows.Forms.Label label34;
-        private System.Windows.Forms.Label lblTemplateFile;
-        private System.Windows.Forms.Label label29;
-        private System.Windows.Forms.CheckBox ckbPT;
         private System.Windows.Forms.Button btnReadConfig;
-        private System.Windows.Forms.Label label26;
-        private System.Windows.Forms.TextBox txtpixel;
-        private System.Windows.Forms.TextBox txtMag;
-        private System.Windows.Forms.TextBox txtSampleName;
-        private System.Windows.Forms.TextBox txtTemplateFile;
+        private System.Windows.Forms.TextBox txtWFIBF;
+        private System.Windows.Forms.TextBox txtWPTF;
         private System.Windows.Forms.Label label48;
-        private System.Windows.Forms.Label label52;
         private System.Windows.Forms.Label label56;
         private System.Windows.Forms.Label label59;
         private System.Windows.Forms.Label label61;
-        private System.Windows.Forms.CheckBox chkpt0;
+        private System.Windows.Forms.CheckBox chkWPT;
         private System.Windows.Forms.Label label62;
-        private System.Windows.Forms.Label lblvoltage;
-        private System.Windows.Forms.Label label44;
-        private System.Windows.Forms.Label lblpixel;
+        private System.Windows.Forms.TextBox txtRXZ;
+        private System.Windows.Forms.Label label26;
+        private System.Windows.Forms.TextBox txtRPZD;
+        private System.Windows.Forms.Label label29;
+        private System.Windows.Forms.TextBox txtRPZF;
+        private System.Windows.Forms.Label label34;
+        private System.Windows.Forms.TextBox txtRQGD;
         private System.Windows.Forms.Label label36;
-        private System.Windows.Forms.Label lblmag;
+        private System.Windows.Forms.TextBox txtRQGF;
         private System.Windows.Forms.Label label40;
-        private System.Windows.Forms.TextBox txtvoltage;
+        private System.Windows.Forms.TextBox txtRLZ;
+        private System.Windows.Forms.Label label44;
+        private System.Windows.Forms.CheckBox chkRIsP;
+        private System.Windows.Forms.Label label52;
+        private System.Windows.Forms.TextBox txtRYP;
+        private System.Windows.Forms.TextBox txtRCS;
+        private System.Windows.Forms.TextBox txtRFIBF;
+        private System.Windows.Forms.TextBox txtRPTF;
+        private System.Windows.Forms.Label label60;
+        private System.Windows.Forms.Label label63;
+        private System.Windows.Forms.Label label64;
+        private System.Windows.Forms.Label label65;
+        private System.Windows.Forms.CheckBox chkRPT;
+        private System.Windows.Forms.Label label66;
+        private System.Windows.Forms.Label label58;
+        private System.Windows.Forms.Label label50;
+        private System.Windows.Forms.Label label54;
+        private System.Windows.Forms.Label label46;
+        private System.Windows.Forms.Label label42;
+        private System.Windows.Forms.Label label38;
+        private System.Windows.Forms.CheckBox chkWIsP;
+        private System.Windows.Forms.Label label32;
+        private System.Windows.Forms.ComboBox cbbWCS;
+        private System.Windows.Forms.ComboBox cbbWYP;
+        private System.Windows.Forms.ComboBox cbbWXZ;
+        private System.Windows.Forms.ComboBox cbbWPZD;
+        private System.Windows.Forms.ComboBox cbbWPZF;
+        private System.Windows.Forms.ComboBox cbbWQGD;
+        private System.Windows.Forms.ComboBox cbbWQGF;
+        private System.Windows.Forms.ComboBox cbbWLZ;
     }
 }
 

+ 55 - 13
HOZProject/FormUnitControl.cs

@@ -13,6 +13,7 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using System.Configuration;
 
 using System.IO;
 using SmartSEMControl;
@@ -1394,13 +1395,28 @@ namespace HOZProject
         private void btnCreateConfig_Click(object sender, EventArgs e)
         {
             ConfigFile cfm = new ConfigFile();
-            cfm.PT_Depostion = chkpt0.Checked;
-            cfm.Template_File = txtTemplateFile.Text;
-            cfm.Sample_Name = txtSampleName.Text;
-            //cfm.M_Config_Param.Voltage = Convert.ToDouble(txtvoltage.Text);
-            //cfm.M_Config_Param.Magnification = Convert.ToDouble(txtMag.Text);
-            //cfm.M_Config_Param.Pixel_Size = Convert.ToDouble(txtpixel.Text);
-            cfm.CreateXml(@"E:\test.cfg");
+            cfm.Is_Photograph = chkWIsP.Checked;
+            cfm.PT_Depostion = chkWPT.Checked;
+            cfm.PT_ELYFile = txtWPTF.Text;
+            cfm.FIB_ELYFile = txtWFIBF.Text;
+            cfm.Stretch_Magnification = Convert.ToDouble(cbbWLZ.Text);
+            cfm.Location_Magnification = Convert.ToDouble(cbbWQGF.Text);
+            cfm.Location_Voltage = Convert.ToDouble(cbbWQGD.Text);
+            cfm.Photograph_Magnification = Convert.ToDouble(cbbWPZF.Text);
+            cfm.Photograph_Voltage = Convert.ToDouble(cbbWPZD.Text);
+            if(cbbWXZ.SelectedIndex==0)
+            {
+                cfm.Correction_Angle = 36.0;
+            }
+            else
+            {
+                cfm.Correction_Angle = 54.0;
+            }
+            
+            cfm.Sample_Type = cbbWYP.Text;
+            cfm.Firm = cbbWCS.Text;
+
+            
             cfm.Save(@"E:\test.cfg");
         }
 
@@ -1408,12 +1424,38 @@ namespace HOZProject
         {
             ConfigFile cfm = new ConfigFile();
             cfm.Read(@"E:\test.cfg");
-            this.ckbPT.Checked = cfm.PT_Depostion;
-            this.lblTemplateFile.Text = cfm.Template_File;
-            this.lblSampleName.Text = cfm.Sample_Name;
-            //this.lblvoltage.Text = cfm.M_Config_Param.Voltage.ToString();
-            //this.lblmag.Text = cfm.M_Config_Param.Magnification.ToString();
-            //this.lblpixel.Text = cfm.M_Config_Param.Pixel_Size.ToString();
+            chkRIsP.Checked = cfm.Is_Photograph;
+            chkRPT.Checked = cfm.PT_Depostion;
+            txtRPTF.Text = cfm.PT_ELYFile;
+            txtRFIBF.Text = cfm.FIB_ELYFile;
+            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;
+            txtRCS.Text = cfm.Firm;
+
+        }
+
+        private void FormUnitControl_Load(object sender, EventArgs e)
+        {
+            String sample_Type = ConfigurationManager.AppSettings["Sample_Type"];
+            String firm = ConfigurationManager.AppSettings["Firm"];
+            String[] sT = sample_Type.Split(',');
+            for(int i=0;i<sT.Length;i++)
+            {
+                cbbWYP.Items.Add(sT[i]);
+            }
+            cbbWYP.SelectedIndex = 0;
+            String[] firms = firm.Split(',');
+            for (int i = 0; i < firms.Length; i++)
+            {
+                cbbWCS.Items.Add(firms[i]);
+            }
+            cbbWCS.SelectedIndex = 0;
+            cbbWXZ.SelectedIndex = 0;
         }
     }
 }

+ 2 - 2
HOZProject/Program.cs

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

+ 1 - 0
HOZProject/UnitControl.csproj

@@ -35,6 +35,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />

+ 141 - 29
MeasureData/ConfigFile.cs

@@ -13,6 +13,14 @@ 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
@@ -21,28 +29,95 @@ namespace MeasureData
             set { this.pt_Depostion = value; }
         }
 
-        //模板文件
-        private String template_File;
-        public String Template_File
+        //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.template_File; }
-            set { this.template_File = value; }
+            get { return this.correction_Angle; }
+            set { this.correction_Angle = value; }
         }
 
-        //样品名称
-        private String sample_Name;
-        public String Sample_Name
+        //样品类型
+        private String sample_Type;
+        public String Sample_Type
         {
-            get { return this.sample_Name; }
-            set { this.sample_Name = value; }
+            get { return this.sample_Type; }
+            set { this.sample_Type = value; }
         }
 
-       
+        //厂商
+        private String firm;
+        public String Firm
+        {
+            get { return this.firm; }
+            set { this.firm = value; }
+        }
+
+        //对焦参数
+
+        //能谱参数
+
         #endregion
 
         public ConfigFile()
         {
-            //this.m_Config_Param = new MeasureConfigParam();
+            
         }
 
 
@@ -74,6 +149,7 @@ namespace MeasureData
         //保存
         public bool Save(String filename)
         {
+            CreateXml(filename);
             XmlDocument doc = new XmlDocument();
             if (File.Exists(filename))
             {
@@ -107,7 +183,6 @@ namespace MeasureData
             XmlNode root = doc.SelectSingleNode("XMLData");
             Serialize(false, doc, root);
             //doc.Save(filename);
-
             return true;
         }
 
@@ -116,23 +191,47 @@ namespace MeasureData
         public override void Serialize(bool isStoring, XmlDocument xml, XmlNode rootNode)
         {
             Slo sFile = new Slo();
-            Slo sParam = new Slo();
 
+            xBool isPhotograph = new xBool();
+            xBool ptDepostion = new xBool();
+            isPhotograph.AssignValue(this.is_Photograph);
+            ptDepostion.AssignValue(this.pt_Depostion);
+            sFile.Register("Is_Photograph", isPhotograph);
+            sFile.Register("PT_Depostion", ptDepostion);
 
-            xBool pt_depostion = new xBool();
-            xString template_file = new xString();
-            xString sample_name = new xString();
+            xString ptELYFile = new xString();
+            xString fibELYFile = new xString();
+            ptELYFile.AssignValue(this.pt_ELYFile);
+            fibELYFile.AssignValue(this.fib_ELYFile);
+            sFile.Register("PT_ELYFile", ptELYFile);
+            sFile.Register("FIB_ELYFile", fibELYFile);
 
-            
-            
-            pt_depostion.AssignValue(this.pt_Depostion);
-            template_file.AssignValue(this.template_File);
-            sample_name.AssignValue(this.sample_Name);
-            sFile.Register("PT_Depostion", pt_depostion);
-            sFile.Register("Template_File", template_file);
-            sFile.Register("Sample_Name", sample_name);
-            //sFile.Register("MeasureConfigParam", m_Config_Param);
+            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.sample_Type);
+            _firm.AssignValue(this.firm);
+            sFile.Register("Sample_Type", sampleType);
+            sFile.Register("Firm", _firm);
 
             if (isStoring)
             {
@@ -142,9 +241,22 @@ namespace MeasureData
             {
                 sFile.Serialize(false, xml, rootNode);
 
-                this.pt_Depostion = pt_depostion.value();
-                this.template_File = template_file.value();
-                this.sample_Name = sample_name.value();
+                this.is_Photograph = isPhotograph.value();
+                this.pt_Depostion = ptDepostion.value();
+
+                this.pt_ELYFile = ptELYFile.value();
+                this.fib_ELYFile = 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();
+
+                this.correction_Angle = correctionAngle.value();
+
+                this.sample_Type = sampleType.value();
+                this.firm = _firm.value();
             }
         }
     }