add the number 4、5 kind of sample support.

DBManager/MeasureDB.cs

@@ -42,7 +42,7 @@ namespace DBManager
             string savePath = m_measureFile.FilePath;
             //数据库名称
             string dbFileName = "MeasureDB.db";
-            path = savePath +"//"+ dbFileName;
+            path = savePath + dbFileName;
 
             //if (File.Exists(path))
             //{

HOZProject.exe.config

@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
+    </startup>
+    <appSettings>
+        <add key="Firm" value="Noah-BOE,LG,SDC,Ocean-BOE,N-BOE" />
+        <add key="Sample_Type" value="0,1,2,3,4,5" />
+        <add key="WPZD" value="100,200,300,2500,2000,5000" />
+        <add key="WPZF" value="100,200,300,2000,5000" />
+        <add key="WQGD" value="100,200,300,2000,5000" />
+        <add key="WQGF" value="100,200,300,1500,500" />
+        <add key="WLZ" value="100,200,300,1500,500" />
+        <add key="WFIB" value="100,200,300,1500" />
+        <add key="TemplateFilePath" value="D:\HOZ1.0\TemplateFilePath" />
+        <add key="PT_ELYFile" value="\\192.168.1.101\fib auto\FIB Recipe\AA Hole\1-01waigelizhu-pt.ely" />
+        <add key="FIB_ELYFile" value="\\192.168.1.101\fib auto\FIB Recipe\pad Bending\4-pad bending.ely" />
+        <add key="Stretch_Magnification" value="200" />
+        <add key="Location_Magnification" value="200" />
+        <add key="Location_Voltage" value="2000" />
+        <add key="Photograph_Magnification" value="2000" />
+        <add key="Photograph_Voltage" value="2000" />
+        <add key="Correction_Angle" value="36" />
+        <add key="SampleName" value="2" />
+        <add key="Firms" value="Noah-BOE" />
+        <add key="Is_Title" value="True" />
+        <add key="Is_Photograph" value="False" />
+        <add key="PT_Depostion" value="False" />
+        <add key="Is_EDS" value="True" />
+        <add key="EDS_Z" value="37.241" />
+        <add key="EDS_V" value="7000" />
+        <add key="EDS_A" value="0.5" />
+        <add key="EDS_XrayMode" value="0" />
+        <add key="FIB_Magnification" value="0" />
+        <add key="ZDistance" value="5" />
+        <add key="FH_Magnification" value="1500" />
+        <add key="FH_Voltage" value="3000" />
+        <add key="Is_FIBDo" value="True" />
+        <add key="Is_FIBAutoBc" value="True" />
+        <add key="FIBB" value="50" />
+        <add key="FIBC" value="50" />
+        <add key="MagComp" value="True" />
+        <add key="MagRange1" value="0" />
+        <add key="MagRange2" value="0" />
+        <add key="MagRange3" value="3" />
+        <add key="MagCompX1" value="11" />
+        <add key="MagCompX2" value="12" />
+        <add key="MagCompX3" value="13" />
+        <add key="MagCompY1" value="21" />
+        <add key="MagCompY2" value="22" />
+        <add key="MagCompY3" value="23" />
+        <add key="ScanRotCur" value="1" />
+        <add key="PixelSize_Y_Cur" value="1.236" />
+        <add key="Focus_Mode" value="2" />
+        <add key="Hand_Intervene" value="2" />
+        <add key="WebServerIP" value="127.0.0.1" />
+        <add key="WebServerPort" value="8009" />
+        <add key="WebServerUrl" value="FIB_degree_recognize,FIB_cal_cut_location,FIB_verify,FIB_cut_center_location,FIB_sharpness,FIB_sharpness,FIB_degree_recognize_trap,FIB_measure_location,FIB_measure_parameter,FIB_EDS_points,FIB_EDS_lines,FIB_EDS_areas" />
+        <add key="Focus_UP" value="3000" />
+        <add key="Focus_Down" value="4000" />
+        <add key="Focus_Step" value="1000" />
+        <add key="Focus_Range" value="50" />
+        <add key="Focus_FStep" value="50" />
+        <add key="FIB_UP" value="300" />
+        <add key="FIB_Down" value="300" />
+        <add key="FIB_Step" value="100" />
+        <add key="FIB_Range" value="150" />
+        <add key="FIB_FStep" value="50" />
+        <add key="StigX_UP" value="-1000" />
+        <add key="StigX_Down" value="1000" />
+        <add key="StigX_Step" value="1000" />
+        <add key="StigX_Range" value="1000" />
+        <add key="StigX_FStep" value="50" />
+        <add key="StigY_UP" value="-1000" />
+        <add key="StigY_Down" value="1000" />
+        <add key="StigY_Step" value="1000" />
+        <add key="StigY_Range" value="1000" />
+        <add key="StigY_FStep" value="50" />
+        <add key="distance" value="30" />
+        <add key="rag" value="4" />
+        <add key="X_min" value="0" />
+        <add key="X_max" value="0.13" />
+        <add key="Y_min" value="0" />
+        <add key="Y_max" value="0.13" />
+        <add key="Z_min" value="0" />
+        <add key="Z_max" value="0.05" />
+        <add key="T_min" value="-4" />
+        <add key="T_max" value="70" />
+        <add key="R_min" value="-380" />
+        <add key="R_max" value="380" />
+        <add key="M_min" value="0" />
+        <add key="M_max" value="0.012" />
+        <add key="RemoteELYPath" value="\\192.168.1.101\Carl Zeiss\SmartFIB\API\Drop\" />
+        <add key="RemoteMLFPath" value="\\192.168.1.101\Carl Zeiss\SmartSEM\User\Service\" />
+        <add key="ScanSpeedNormal_0" value="CMD_SCANRATE4" />
+        <add key="ScanSpeedFocus_0" value="CMD_SCANRATE5" />
+        <add key="ScanSpeedHigh_0" value="CMD_SCANRATE7" />
+        <add key="ScanSpeedNormal_1" value="CMD_SCANRATE4" />
+        <add key="ScanSpeedFocus_1" value="CMD_SCANRATE5" />
+        <add key="ScanSpeedHigh_1" value="CMD_SCANRATE7" />
+        <add key="ScanSpeedNormal_2" value="CMD_SCANRATE4" />
+        <add key="ScanSpeedFocus_2" value="CMD_SCANRATE5" />
+        <add key="ScanSpeedHigh_2" value="CMD_SCANRATE7" />
+        <add key="ScanSpeedNormal_3" value="CMD_SCANRATE4" />
+        <add key="ScanSpeedFocus_3" value="CMD_SCANRATE5" />
+        <add key="ScanSpeedHigh_3" value="CMD_SCANRATE7" />
+		
+		<add key="ScanSpeedNormal_4" value="CMD_SCANRATE4" />
+        <add key="ScanSpeedFocus_4" value="CMD_SCANRATE5" />
+        <add key="ScanSpeedHigh_4" value="CMD_SCANRATE7" />
+		<add key="ScanSpeedNormal_5" value="CMD_SCANRATE4" />
+        <add key="ScanSpeedFocus_5" value="CMD_SCANRATE5" />
+        <add key="ScanSpeedHigh_5" value="CMD_SCANRATE7" />
+		
+        <add key="IsCutingForDebug" value="true" />
+        <add key="IsonlyEDSForDebug" value="true" />
+        <add key="VendorType0" value="Ocean-BOE" />
+        <add key="VendorType1" value="Ocean-BOE" />
+        <add key="VendorType2" value="Ocean-BOE" />
+        <add key="VendorType3" value="Noah-BOE" />		
+		 <add key="VendorType4" value="Ocean-BOE" />
+        <add key="VendorType5" value="Noah-BOE" />
+		
+        <add key="CorrectionType0" value="截面观测" />
+        <add key="CorrectionType1" value="截面观测" />
+        <add key="CorrectionType2" value="截面观测" />
+        <add key="CorrectionType3" value="截面观测" />
+		<add key="CorrectionType4" value="截面观测" />
+        <add key="CorrectionType5" value="截面观测" />
+		
+        <add key="StraightenTimesType0" value="1500" />
+        <add key="StraightenTimesType1" value="300" />
+        <add key="StraightenTimesType2" value="200" />
+        <add key="StraightenTimesType3" value="500" />
+		<add key="StraightenTimesType4" value="500" />
+        <add key="StraightenTimesType5" value="500" />
+		
+        <add key="PositioningVoltageeType0" value="2000" />
+        <add key="PositioningVoltageeType1" value="2000" />
+        <add key="PositioningVoltageeType2" value="2000" />
+        <add key="PositioningVoltageeType3" value="5000" />
+		<add key="PositioningVoltageeType4" value="5000" />
+        <add key="PositioningVoltageeType5" value="5000" />
+		
+        <add key="PositioningTimesType0" value="1500" />
+        <add key="PositioningTimesType1" value="300" />
+        <add key="PositioningTimesType2" value="200" />
+        <add key="PositioningTimesType3" value="500" />
+		<add key="PositioningTimesType4" value="500" />
+        <add key="PositioningTimesType5" value="500" />
+		
+        <add key="PhotoVoltageeType0" value="2000" />
+        <add key="PhotoVoltageeType1" value="2000" />
+        <add key="PhotoVoltageeType2" value="2000" />
+        <add key="PhotoVoltageeType3" value="5000" />
+		<add key="PhotoVoltageeType4" value="5000" />
+        <add key="PhotoVoltageeType5" value="5000" />
+		
+        <add key="PhotoTimesType0" value="2000" />
+        <add key="PhotoTimesType1" value="2000" />
+        <add key="PhotoTimesType2" value="2000" />
+        <add key="PhotoTimesType3" value="5000" />
+		<add key="PhotoTimesType4" value="5000" />
+        <add key="PhotoTimesType5" value="5000" />
+		
+        <add key="ScanRotateType0" value="1" />
+        <add key="ScanRotateType1" value="1" />
+        <add key="ScanRotateType2" value="1" />
+        <add key="ScanRotateType3" value="1" />
+		<add key="ScanRotateType4" value="1" />
+        <add key="ScanRotateType5" value="1" />
+		
+        <add key="PixelSizeType0" value="1.236" />
+        <add key="PixelSizeType1" value="1.236" />
+        <add key="PixelSizeType2" value="1.236" />
+        <add key="PixelSizeType3" value="1.236" />
+		<add key="PixelSizeType4" value="1.236" />
+        <add key="PixelSizeType5" value="1.236" />
+		
+        <add key="SEMAxis_ZType0" value="37.241" />
+        <add key="SEMAxis_ZType1" value="37.241" />
+        <add key="SEMAxis_ZType2" value="37.241" />
+        <add key="SEMAxis_ZType3" value="37.241" />
+		<add key="SEMAxis_ZType4" value="37.241" />
+        <add key="SEMAxis_ZType5" value="37.241" />
+		
+        <add key="SEMVoltageeType0" value="7000" />
+        <add key="SEMVoltageeType1" value="7000" />
+        <add key="SEMVoltageeType2" value="7000" />
+        <add key="SEMVoltageeType3" value="7000" />
+		<add key="SEMVoltageeType4" value="5000" />
+        <add key="SEMVoltageeType5" value="5000" />
+		
+        <add key="SEMCurrentType0" value="0.5" />
+        <add key="SEMCurrentType1" value="0.5" />
+        <add key="SEMCurrentType2" value="0.5" />
+        <add key="SEMCurrentType3" value="0.5" />
+		<add key="SEMCurrentType4" value="0.2" />
+        <add key="SEMCurrentType5" value="0.2" />
+    </appSettings>
+  <runtime>
+    <assemblyBinding xmlns=" urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" />
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="10.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

HOZProject/FormHOZMain.Designer.cs

@@ -89,10 +89,9 @@
             this.plMain.Controls.Add(this.plFill);
             this.plMain.Controls.Add(this.plLeft);
             this.plMain.Controls.Add(this.plTop);
-            this.plMain.Location = new System.Drawing.Point(16, 15);
-            this.plMain.Margin = new System.Windows.Forms.Padding(4);
+            this.plMain.Location = new System.Drawing.Point(12, 12);
             this.plMain.Name = "plMain";
-            this.plMain.Size = new System.Drawing.Size(1401, 895);
+            this.plMain.Size = new System.Drawing.Size(1051, 716);
             this.plMain.TabIndex = 1;
             // 
             // plFill
@@ -106,10 +105,9 @@
             this.plFill.Controls.Add(this.listmsg);
             this.plFill.Controls.Add(this.pbImage);
             this.plFill.Controls.Add(this.plSEM);
-            this.plFill.Location = new System.Drawing.Point(203, 108);
-            this.plFill.Margin = new System.Windows.Forms.Padding(4);
+            this.plFill.Location = new System.Drawing.Point(152, 86);
             this.plFill.Name = "plFill";
-            this.plFill.Size = new System.Drawing.Size(1192, 788);
+            this.plFill.Size = new System.Drawing.Size(894, 630);
             this.plFill.TabIndex = 5;
             // 
             // groupBox1
@@ -120,11 +118,9 @@
             this.groupBox1.Controls.Add(this.comboBox1);
             this.groupBox1.Controls.Add(this.textBox2);
             this.groupBox1.ForeColor = System.Drawing.Color.White;
-            this.groupBox1.Location = new System.Drawing.Point(909, 4);
-            this.groupBox1.Margin = new System.Windows.Forms.Padding(4);
+            this.groupBox1.Location = new System.Drawing.Point(682, 3);
             this.groupBox1.Name = "groupBox1";
-            this.groupBox1.Padding = new System.Windows.Forms.Padding(4);
-            this.groupBox1.Size = new System.Drawing.Size(267, 125);
+            this.groupBox1.Size = new System.Drawing.Size(200, 100);
             this.groupBox1.TabIndex = 26;
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "测试设置状态";
@@ -132,20 +128,18 @@
             // 
             // textBox1
             // 
-            this.textBox1.Location = new System.Drawing.Point(8, 25);
-            this.textBox1.Margin = new System.Windows.Forms.Padding(4);
+            this.textBox1.Location = new System.Drawing.Point(6, 20);
             this.textBox1.Name = "textBox1";
-            this.textBox1.Size = new System.Drawing.Size(132, 25);
+            this.textBox1.Size = new System.Drawing.Size(100, 21);
             this.textBox1.TabIndex = 21;
             this.textBox1.Text = "分析点名称";
             // 
             // button1
             // 
             this.button1.ForeColor = System.Drawing.Color.Black;
-            this.button1.Location = new System.Drawing.Point(159, 25);
-            this.button1.Margin = new System.Windows.Forms.Padding(4);
+            this.button1.Location = new System.Drawing.Point(119, 20);
             this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(100, 91);
+            this.button1.Size = new System.Drawing.Size(75, 73);
             this.button1.TabIndex = 24;
             this.button1.Text = "测试";
             this.button1.UseVisualStyleBackColor = true;
@@ -157,18 +151,16 @@
             this.comboBox1.Items.AddRange(new object[] {
             "True",
             "False"});
-            this.comboBox1.Location = new System.Drawing.Point(8, 91);
-            this.comboBox1.Margin = new System.Windows.Forms.Padding(4);
+            this.comboBox1.Location = new System.Drawing.Point(6, 73);
             this.comboBox1.Name = "comboBox1";
-            this.comboBox1.Size = new System.Drawing.Size(132, 23);
+            this.comboBox1.Size = new System.Drawing.Size(100, 20);
             this.comboBox1.TabIndex = 25;
             // 
             // textBox2
             // 
-            this.textBox2.Location = new System.Drawing.Point(8, 59);
-            this.textBox2.Margin = new System.Windows.Forms.Padding(4);
+            this.textBox2.Location = new System.Drawing.Point(6, 47);
             this.textBox2.Name = "textBox2";
-            this.textBox2.Size = new System.Drawing.Size(132, 25);
+            this.textBox2.Size = new System.Drawing.Size(100, 21);
             this.textBox2.TabIndex = 22;
             this.textBox2.Text = "编号";
             // 
@@ -177,9 +169,8 @@
             this.plPrarInfo.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240)))));
             this.plPrarInfo.ForeColor = System.Drawing.Color.Transparent;
             this.plPrarInfo.Location = new System.Drawing.Point(0, 0);
-            this.plPrarInfo.Margin = new System.Windows.Forms.Padding(4);
             this.plPrarInfo.Name = "plPrarInfo";
-            this.plPrarInfo.Size = new System.Drawing.Size(291, 125);
+            this.plPrarInfo.Size = new System.Drawing.Size(218, 100);
             this.plPrarInfo.TabIndex = 2;
             this.plPrarInfo.Visible = false;
             // 
@@ -187,11 +178,11 @@
             // 
             this.listmsg.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.listmsg.FormattingEnabled = true;
-            this.listmsg.ItemHeight = 15;
-            this.listmsg.Location = new System.Drawing.Point(328, 118);
-            this.listmsg.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
+            this.listmsg.ItemHeight = 12;
+            this.listmsg.Location = new System.Drawing.Point(246, 94);
+            this.listmsg.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.listmsg.Name = "listmsg";
-            this.listmsg.Size = new System.Drawing.Size(635, 244);
+            this.listmsg.Size = new System.Drawing.Size(477, 196);
             this.listmsg.TabIndex = 18;
             this.listmsg.Visible = false;
             // 
@@ -201,9 +192,8 @@
             this.pbImage.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.pbImage.Dock = System.Windows.Forms.DockStyle.Fill;
             this.pbImage.Location = new System.Drawing.Point(0, 0);
-            this.pbImage.Margin = new System.Windows.Forms.Padding(4);
             this.pbImage.Name = "pbImage";
-            this.pbImage.Size = new System.Drawing.Size(1192, 717);
+            this.pbImage.Size = new System.Drawing.Size(894, 573);
             this.pbImage.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
             this.pbImage.TabIndex = 20;
             this.pbImage.TabStop = false;
@@ -215,10 +205,9 @@
             this.plSEM.Controls.Add(this.lblStateMessage);
             this.plSEM.Controls.Add(this.lblFlowContent);
             this.plSEM.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.plSEM.Location = new System.Drawing.Point(0, 717);
-            this.plSEM.Margin = new System.Windows.Forms.Padding(4);
+            this.plSEM.Location = new System.Drawing.Point(0, 573);
             this.plSEM.Name = "plSEM";
-            this.plSEM.Size = new System.Drawing.Size(1192, 71);
+            this.plSEM.Size = new System.Drawing.Size(894, 57);
             this.plSEM.TabIndex = 19;
             // 
             // lblStateMessage
@@ -227,10 +216,9 @@
             this.lblStateMessage.BackColor = System.Drawing.Color.Transparent;
             this.lblStateMessage.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblStateMessage.ForeColor = System.Drawing.Color.Black;
-            this.lblStateMessage.Location = new System.Drawing.Point(814, 19);
-            this.lblStateMessage.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblStateMessage.Location = new System.Drawing.Point(610, 15);
             this.lblStateMessage.Name = "lblStateMessage";
-            this.lblStateMessage.Size = new System.Drawing.Size(379, 30);
+            this.lblStateMessage.Size = new System.Drawing.Size(284, 24);
             this.lblStateMessage.TabIndex = 1;
             this.lblStateMessage.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
@@ -240,10 +228,9 @@
             this.lblFlowContent.BackColor = System.Drawing.Color.Transparent;
             this.lblFlowContent.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblFlowContent.ForeColor = System.Drawing.Color.Black;
-            this.lblFlowContent.Location = new System.Drawing.Point(33, 26);
-            this.lblFlowContent.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lblFlowContent.Location = new System.Drawing.Point(25, 21);
             this.lblFlowContent.Name = "lblFlowContent";
-            this.lblFlowContent.Size = new System.Drawing.Size(0, 23);
+            this.lblFlowContent.Size = new System.Drawing.Size(0, 19);
             this.lblFlowContent.TabIndex = 0;
             // 
             // plLeft
@@ -253,10 +240,9 @@
             this.plLeft.Controls.Add(this.label1);
             this.plLeft.Controls.Add(this.plLeftContent);
             this.plLeft.Dock = System.Windows.Forms.DockStyle.Left;
-            this.plLeft.Location = new System.Drawing.Point(0, 100);
-            this.plLeft.Margin = new System.Windows.Forms.Padding(4);
+            this.plLeft.Location = new System.Drawing.Point(0, 80);
             this.plLeft.Name = "plLeft";
-            this.plLeft.Size = new System.Drawing.Size(194, 795);
+            this.plLeft.Size = new System.Drawing.Size(146, 636);
             this.plLeft.TabIndex = 4;
             // 
             // label1
@@ -265,10 +251,9 @@
             this.label1.BackColor = System.Drawing.Color.Transparent;
             this.label1.Font = new System.Drawing.Font("微软雅黑", 8F, System.Drawing.FontStyle.Bold);
             this.label1.ForeColor = System.Drawing.Color.Black;
-            this.label1.Location = new System.Drawing.Point(43, 2);
-            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label1.Location = new System.Drawing.Point(32, 2);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(79, 19);
+            this.label1.Size = new System.Drawing.Size(63, 16);
             this.label1.TabIndex = 1;
             this.label1.Text = "分析点列表";
             // 
@@ -280,10 +265,9 @@
             this.plLeftContent.AutoScroll = true;
             this.plLeftContent.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240)))));
             this.plLeftContent.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.plLeftContent.Location = new System.Drawing.Point(7, 26);
-            this.plLeftContent.Margin = new System.Windows.Forms.Padding(4);
+            this.plLeftContent.Location = new System.Drawing.Point(5, 21);
             this.plLeftContent.Name = "plLeftContent";
-            this.plLeftContent.Size = new System.Drawing.Size(178, 765);
+            this.plLeftContent.Size = new System.Drawing.Size(134, 612);
             this.plLeftContent.TabIndex = 0;
             // 
             // plTop
@@ -304,9 +288,8 @@
             this.plTop.Controls.Add(this.pbInit);
             this.plTop.Dock = System.Windows.Forms.DockStyle.Top;
             this.plTop.Location = new System.Drawing.Point(0, 0);
-            this.plTop.Margin = new System.Windows.Forms.Padding(4);
             this.plTop.Name = "plTop";
-            this.plTop.Size = new System.Drawing.Size(1401, 100);
+            this.plTop.Size = new System.Drawing.Size(1051, 80);
             this.plTop.TabIndex = 3;
             // 
             // pbPause
@@ -314,10 +297,9 @@
             this.pbPause.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pbPause.BackgroundImage")));
             this.pbPause.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.pbPause.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.pbPause.Location = new System.Drawing.Point(633, 6);
-            this.pbPause.Margin = new System.Windows.Forms.Padding(4);
+            this.pbPause.Location = new System.Drawing.Point(475, 5);
             this.pbPause.Name = "pbPause";
-            this.pbPause.Size = new System.Drawing.Size(91, 89);
+            this.pbPause.Size = new System.Drawing.Size(68, 71);
             this.pbPause.TabIndex = 8;
             this.pbPause.TabStop = false;
             this.pbPause.Visible = false;
@@ -328,10 +310,9 @@
             this.pbStart.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pbStart.BackgroundImage")));
             this.pbStart.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.pbStart.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.pbStart.Location = new System.Drawing.Point(495, 5);
-            this.pbStart.Margin = new System.Windows.Forms.Padding(4);
+            this.pbStart.Location = new System.Drawing.Point(371, 4);
             this.pbStart.Name = "pbStart";
-            this.pbStart.Size = new System.Drawing.Size(91, 89);
+            this.pbStart.Size = new System.Drawing.Size(68, 71);
             this.pbStart.TabIndex = 8;
             this.pbStart.TabStop = false;
             this.pbStart.Click += new System.EventHandler(this.pbStart_Click);
@@ -345,10 +326,9 @@
             this.pbMax.BackgroundImage = global::HOZProject.Properties.Resources.Max_2_;
             this.pbMax.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.pbMax.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.pbMax.Location = new System.Drawing.Point(1309, 5);
-            this.pbMax.Margin = new System.Windows.Forms.Padding(4);
+            this.pbMax.Location = new System.Drawing.Point(982, 4);
             this.pbMax.Name = "pbMax";
-            this.pbMax.Size = new System.Drawing.Size(37, 39);
+            this.pbMax.Size = new System.Drawing.Size(28, 31);
             this.pbMax.TabIndex = 7;
             this.pbMax.TabStop = false;
             this.pbMax.Click += new System.EventHandler(this.pbMax_Click);
@@ -362,10 +342,9 @@
             this.pbMin.BackgroundImage = global::HOZProject.Properties.Resources.Min_2_;
             this.pbMin.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.pbMin.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.pbMin.Location = new System.Drawing.Point(1264, 5);
-            this.pbMin.Margin = new System.Windows.Forms.Padding(4);
+            this.pbMin.Location = new System.Drawing.Point(948, 4);
             this.pbMin.Name = "pbMin";
-            this.pbMin.Size = new System.Drawing.Size(37, 39);
+            this.pbMin.Size = new System.Drawing.Size(28, 31);
             this.pbMin.TabIndex = 7;
             this.pbMin.TabStop = false;
             this.pbMin.Click += new System.EventHandler(this.pbMin_Click);
@@ -379,10 +358,9 @@
             this.pbClose.BackgroundImage = global::HOZProject.Properties.Resources.exit_2_;
             this.pbClose.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.pbClose.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.pbClose.Location = new System.Drawing.Point(1355, 5);
-            this.pbClose.Margin = new System.Windows.Forms.Padding(4);
+            this.pbClose.Location = new System.Drawing.Point(1016, 4);
             this.pbClose.Name = "pbClose";
-            this.pbClose.Size = new System.Drawing.Size(37, 39);
+            this.pbClose.Size = new System.Drawing.Size(28, 31);
             this.pbClose.TabIndex = 7;
             this.pbClose.TabStop = false;
             this.pbClose.Click += new System.EventHandler(this.pbClose_Click);
@@ -395,10 +373,9 @@
             this.pbImportTemplateFile.BackgroundImage = global::HOZProject.Properties.Resources.ImportConfigFile_3_;
             this.pbImportTemplateFile.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.pbImportTemplateFile.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.pbImportTemplateFile.Location = new System.Drawing.Point(299, 5);
-            this.pbImportTemplateFile.Margin = new System.Windows.Forms.Padding(4);
+            this.pbImportTemplateFile.Location = new System.Drawing.Point(224, 4);
             this.pbImportTemplateFile.Name = "pbImportTemplateFile";
-            this.pbImportTemplateFile.Size = new System.Drawing.Size(91, 89);
+            this.pbImportTemplateFile.Size = new System.Drawing.Size(68, 71);
             this.pbImportTemplateFile.TabIndex = 6;
             this.pbImportTemplateFile.TabStop = false;
             this.pbImportTemplateFile.Click += new System.EventHandler(this.pbImportTemplateFile_Click);
@@ -409,10 +386,9 @@
             this.pbLog.BackgroundImage = global::HOZProject.Properties.Resources.Log_3_;
             this.pbLog.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.pbLog.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.pbLog.Location = new System.Drawing.Point(396, 5);
-            this.pbLog.Margin = new System.Windows.Forms.Padding(4);
+            this.pbLog.Location = new System.Drawing.Point(297, 4);
             this.pbLog.Name = "pbLog";
-            this.pbLog.Size = new System.Drawing.Size(91, 89);
+            this.pbLog.Size = new System.Drawing.Size(68, 71);
             this.pbLog.TabIndex = 6;
             this.pbLog.TabStop = false;
             this.pbLog.Click += new System.EventHandler(this.pbLog_Click);
@@ -423,10 +399,9 @@
             this.pbSave.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pbSave.BackgroundImage")));
             this.pbSave.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.pbSave.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.pbSave.Location = new System.Drawing.Point(203, 5);
-            this.pbSave.Margin = new System.Windows.Forms.Padding(4);
+            this.pbSave.Location = new System.Drawing.Point(152, 4);
             this.pbSave.Name = "pbSave";
-            this.pbSave.Size = new System.Drawing.Size(91, 89);
+            this.pbSave.Size = new System.Drawing.Size(68, 71);
             this.pbSave.TabIndex = 4;
             this.pbSave.TabStop = false;
             this.pbSave.Click += new System.EventHandler(this.pbSave_Click);
@@ -437,10 +412,9 @@
             this.pbOpen.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pbOpen.BackgroundImage")));
             this.pbOpen.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.pbOpen.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.pbOpen.Location = new System.Drawing.Point(7, 5);
-            this.pbOpen.Margin = new System.Windows.Forms.Padding(4);
+            this.pbOpen.Location = new System.Drawing.Point(5, 2);
             this.pbOpen.Name = "pbOpen";
-            this.pbOpen.Size = new System.Drawing.Size(91, 89);
+            this.pbOpen.Size = new System.Drawing.Size(68, 71);
             this.pbOpen.TabIndex = 3;
             this.pbOpen.TabStop = false;
             this.pbOpen.Click += new System.EventHandler(this.pbOpen_Click);
@@ -450,10 +424,9 @@
             this.pbNew.BackgroundImage = global::HOZProject.Properties.Resources.New;
             this.pbNew.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.pbNew.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.pbNew.Location = new System.Drawing.Point(7, 5);
-            this.pbNew.Margin = new System.Windows.Forms.Padding(4);
+            this.pbNew.Location = new System.Drawing.Point(5, 4);
             this.pbNew.Name = "pbNew";
-            this.pbNew.Size = new System.Drawing.Size(91, 89);
+            this.pbNew.Size = new System.Drawing.Size(68, 71);
             this.pbNew.TabIndex = 3;
             this.pbNew.TabStop = false;
             this.pbNew.Visible = false;
@@ -466,10 +439,9 @@
             this.pbStop.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.pbStop.Cursor = System.Windows.Forms.Cursors.Hand;
             this.pbStop.Enabled = false;
-            this.pbStop.Location = new System.Drawing.Point(495, 4);
-            this.pbStop.Margin = new System.Windows.Forms.Padding(4);
+            this.pbStop.Location = new System.Drawing.Point(371, 3);
             this.pbStop.Name = "pbStop";
-            this.pbStop.Size = new System.Drawing.Size(91, 89);
+            this.pbStop.Size = new System.Drawing.Size(68, 71);
             this.pbStop.TabIndex = 8;
             this.pbStop.TabStop = false;
             this.pbStop.Visible = false;
@@ -483,25 +455,23 @@
             this.pbInit.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pbInit.BackgroundImage")));
             this.pbInit.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.pbInit.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.pbInit.Location = new System.Drawing.Point(104, 5);
-            this.pbInit.Margin = new System.Windows.Forms.Padding(4);
+            this.pbInit.Location = new System.Drawing.Point(78, 4);
             this.pbInit.Name = "pbInit";
-            this.pbInit.Size = new System.Drawing.Size(91, 89);
+            this.pbInit.Size = new System.Drawing.Size(68, 71);
             this.pbInit.TabIndex = 5;
             this.pbInit.TabStop = false;
             this.pbInit.Click += new System.EventHandler(this.pbInit_Click);
             // 
             // FormHOZMain
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(73)))), ((int)(((byte)(179)))), ((int)(((byte)(254)))));
-            this.ClientSize = new System.Drawing.Size(1433, 916);
+            this.ClientSize = new System.Drawing.Size(1075, 733);
             this.ControlBox = false;
             this.Controls.Add(this.plMain);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
-            this.Margin = new System.Windows.Forms.Padding(4);
-            this.MinimumSize = new System.Drawing.Size(1365, 849);
+            this.MinimumSize = new System.Drawing.Size(1024, 679);
             this.Name = "FormHOZMain";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "FormHOZMain";

HOZProject/FormHOZMain.cs

@@ -1098,68 +1098,90 @@ namespace HOZProject
                 m_MeasureFile.MParam.CorrectionType1 = Convert.ToString(ConfigurationManager.AppSettings["CorrectionType1"]);
                 m_MeasureFile.MParam.CorrectionType2 = Convert.ToString(ConfigurationManager.AppSettings["CorrectionType2"]);
                 m_MeasureFile.MParam.CorrectionType3 = Convert.ToString(ConfigurationManager.AppSettings["CorrectionType3"]);
-                // add by zjx 2020-12-21 校正角度 end 
-                // add by zjx 2020-12-21 拉直操作放大倍数
-                m_MeasureFile.MParam.StraightenTimesType0 = Convert.ToString(ConfigurationManager.AppSettings["StraightenTimesType0"]);
+            m_MeasureFile.MParam.CorrectionType4 = Convert.ToString(ConfigurationManager.AppSettings["CorrectionType4"]);
+            m_MeasureFile.MParam.CorrectionType5 = Convert.ToString(ConfigurationManager.AppSettings["CorrectionType5"]);
+            // add by zjx 2020-12-21 校正角度 end 
+            // add by zjx 2020-12-21 拉直操作放大倍数
+            m_MeasureFile.MParam.StraightenTimesType0 = Convert.ToString(ConfigurationManager.AppSettings["StraightenTimesType0"]);
                 m_MeasureFile.MParam.StraightenTimesType1 = Convert.ToString(ConfigurationManager.AppSettings["StraightenTimesType1"]);
                 m_MeasureFile.MParam.StraightenTimesType2 = Convert.ToString(ConfigurationManager.AppSettings["StraightenTimesType2"]);
                 m_MeasureFile.MParam.StraightenTimesType3 = Convert.ToString(ConfigurationManager.AppSettings["StraightenTimesType3"]);
-                // add by zjx 2020-12-21 拉直操作放大倍数 end
-                // add by zjx 2020-12-21 定位电压
-                m_MeasureFile.MParam.PositioningVoltageeType0 = Convert.ToString(ConfigurationManager.AppSettings["PositioningVoltageeType0"]);
+            m_MeasureFile.MParam.StraightenTimesType4 = Convert.ToString(ConfigurationManager.AppSettings["StraightenTimesType4"]);
+            m_MeasureFile.MParam.StraightenTimesType5 = Convert.ToString(ConfigurationManager.AppSettings["StraightenTimesType5"]);
+            // add by zjx 2020-12-21 拉直操作放大倍数 end
+            // add by zjx 2020-12-21 定位电压
+            m_MeasureFile.MParam.PositioningVoltageeType0 = Convert.ToString(ConfigurationManager.AppSettings["PositioningVoltageeType0"]);
                 m_MeasureFile.MParam.PositioningVoltageeType1 = Convert.ToString(ConfigurationManager.AppSettings["PositioningVoltageeType1"]);
                 m_MeasureFile.MParam.PositioningVoltageeType2 = Convert.ToString(ConfigurationManager.AppSettings["PositioningVoltageeType2"]);
                 m_MeasureFile.MParam.PositioningVoltageeType3 = Convert.ToString(ConfigurationManager.AppSettings["PositioningVoltageeType3"]);
-                // add by zjx 2020-12-21 定位电压 end
-                // add by zjx 2020-12-21 定位放大倍数
-                m_MeasureFile.MParam.PositioningTimesType0 = Convert.ToString(ConfigurationManager.AppSettings["PositioningTimesType0"]);
+            m_MeasureFile.MParam.PositioningVoltageeType4 = Convert.ToString(ConfigurationManager.AppSettings["PositioningVoltageeType4"]);
+            m_MeasureFile.MParam.PositioningVoltageeType5 = Convert.ToString(ConfigurationManager.AppSettings["PositioningVoltageeType5"]);
+            // add by zjx 2020-12-21 定位电压 end
+            // add by zjx 2020-12-21 定位放大倍数
+            m_MeasureFile.MParam.PositioningTimesType0 = Convert.ToString(ConfigurationManager.AppSettings["PositioningTimesType0"]);
                 m_MeasureFile.MParam.PositioningTimesType1 = Convert.ToString(ConfigurationManager.AppSettings["PositioningTimesType1"]);
                 m_MeasureFile.MParam.PositioningTimesType2 = Convert.ToString(ConfigurationManager.AppSettings["PositioningTimesType2"]);
                 m_MeasureFile.MParam.PositioningTimesType3 = Convert.ToString(ConfigurationManager.AppSettings["PositioningTimesType3"]);
-                // add by zjx 2020-12-21 定位放大倍数 end
-                // add by zjx 2020-12-21 拍照电压
-                m_MeasureFile.MParam.PhotoVoltageeType0 = Convert.ToString(ConfigurationManager.AppSettings["PhotoVoltageeType0"]);
+            m_MeasureFile.MParam.PositioningTimesType4 = Convert.ToString(ConfigurationManager.AppSettings["PositioningTimesType4"]);
+            m_MeasureFile.MParam.PositioningTimesType5 = Convert.ToString(ConfigurationManager.AppSettings["PositioningTimesType5"]);
+            // add by zjx 2020-12-21 定位放大倍数 end
+            // add by zjx 2020-12-21 拍照电压
+            m_MeasureFile.MParam.PhotoVoltageeType0 = Convert.ToString(ConfigurationManager.AppSettings["PhotoVoltageeType0"]);
                 m_MeasureFile.MParam.PhotoVoltageeType1 = Convert.ToString(ConfigurationManager.AppSettings["PhotoVoltageeType1"]);
                 m_MeasureFile.MParam.PhotoVoltageeType2 = Convert.ToString(ConfigurationManager.AppSettings["PhotoVoltageeType2"]);
                 m_MeasureFile.MParam.PhotoVoltageeType3 = Convert.ToString(ConfigurationManager.AppSettings["PhotoVoltageeType3"]);
-                // add by zjx 2020-12-21 拍照电压 end
-                // add by zjx 2020-12-21 拍照放大倍数
-                m_MeasureFile.MParam.PhotoTimesType0 = Convert.ToString(ConfigurationManager.AppSettings["PhotoTimesType0"]);
+            m_MeasureFile.MParam.PhotoVoltageeType4 = Convert.ToString(ConfigurationManager.AppSettings["PhotoVoltageeType4"]);
+            m_MeasureFile.MParam.PhotoVoltageeType5 = Convert.ToString(ConfigurationManager.AppSettings["PhotoVoltageeType5"]);
+            // add by zjx 2020-12-21 拍照电压 end
+            // add by zjx 2020-12-21 拍照放大倍数
+            m_MeasureFile.MParam.PhotoTimesType0 = Convert.ToString(ConfigurationManager.AppSettings["PhotoTimesType0"]);
                 m_MeasureFile.MParam.PhotoTimesType1 = Convert.ToString(ConfigurationManager.AppSettings["PhotoTimesType1"]);
                 m_MeasureFile.MParam.PhotoTimesType2 = Convert.ToString(ConfigurationManager.AppSettings["PhotoTimesType2"]);
                 m_MeasureFile.MParam.PhotoTimesType3 = Convert.ToString(ConfigurationManager.AppSettings["PhotoTimesType3"]);
-                // add by zjx 2020-12-21 拍照放大倍数 end
-                // add by zjx 2020-12-21 ScanRotate修正参数
-                m_MeasureFile.MParam.ScanRotateType0 = Convert.ToString(ConfigurationManager.AppSettings["ScanRotateType0"]);
+            m_MeasureFile.MParam.PhotoTimesType4 = Convert.ToString(ConfigurationManager.AppSettings["PhotoTimesType4"]);
+            m_MeasureFile.MParam.PhotoTimesType5 = Convert.ToString(ConfigurationManager.AppSettings["PhotoTimesType5"]);
+            // add by zjx 2020-12-21 拍照放大倍数 end
+            // add by zjx 2020-12-21 ScanRotate修正参数
+            m_MeasureFile.MParam.ScanRotateType0 = Convert.ToString(ConfigurationManager.AppSettings["ScanRotateType0"]);
                 m_MeasureFile.MParam.ScanRotateType1 = Convert.ToString(ConfigurationManager.AppSettings["ScanRotateType1"]);
                 m_MeasureFile.MParam.ScanRotateType2 = Convert.ToString(ConfigurationManager.AppSettings["ScanRotateType2"]);
                 m_MeasureFile.MParam.ScanRotateType3 = Convert.ToString(ConfigurationManager.AppSettings["ScanRotateType3"]);
-                // add by zjx 2020-12-21 ScanRotate修正参数 end
-                // add by zjx 2020-12-21 Y轴方向PixelSize修正值
-                m_MeasureFile.MParam.PixelSizeType0 = Convert.ToString(ConfigurationManager.AppSettings["PixelSizeType0"]);
+            m_MeasureFile.MParam.ScanRotateType4 = Convert.ToString(ConfigurationManager.AppSettings["ScanRotateType4"]);
+            m_MeasureFile.MParam.ScanRotateType5 = Convert.ToString(ConfigurationManager.AppSettings["ScanRotateType5"]);
+            // add by zjx 2020-12-21 ScanRotate修正参数 end
+            // add by zjx 2020-12-21 Y轴方向PixelSize修正值
+            m_MeasureFile.MParam.PixelSizeType0 = Convert.ToString(ConfigurationManager.AppSettings["PixelSizeType0"]);
                 m_MeasureFile.MParam.PixelSizeType1 = Convert.ToString(ConfigurationManager.AppSettings["PixelSizeType1"]);
                 m_MeasureFile.MParam.PixelSizeType2 = Convert.ToString(ConfigurationManager.AppSettings["PixelSizeType2"]);
                 m_MeasureFile.MParam.PixelSizeType3 = Convert.ToString(ConfigurationManager.AppSettings["PixelSizeType3"]);
-                // add by zjx 2020-12-21 Y轴方向PixelSize修正值 end
-                // add by zjx 2020-12-21 能谱Z轴移动位置
-                m_MeasureFile.MParam.SEMAxis_ZType0 = Convert.ToString(ConfigurationManager.AppSettings["SEMAxis_ZType0"]);
+            m_MeasureFile.MParam.PixelSizeType4 = Convert.ToString(ConfigurationManager.AppSettings["PixelSizeType4"]);
+            m_MeasureFile.MParam.PixelSizeType5 = Convert.ToString(ConfigurationManager.AppSettings["PixelSizeType5"]);
+            // add by zjx 2020-12-21 Y轴方向PixelSize修正值 end
+            // add by zjx 2020-12-21 能谱Z轴移动位置
+            m_MeasureFile.MParam.SEMAxis_ZType0 = Convert.ToString(ConfigurationManager.AppSettings["SEMAxis_ZType0"]);
                 m_MeasureFile.MParam.SEMAxis_ZType1 = Convert.ToString(ConfigurationManager.AppSettings["SEMAxis_ZType1"]);
                 m_MeasureFile.MParam.SEMAxis_ZType2 = Convert.ToString(ConfigurationManager.AppSettings["SEMAxis_ZType2"]);
                 m_MeasureFile.MParam.SEMAxis_ZType3 = Convert.ToString(ConfigurationManager.AppSettings["SEMAxis_ZType3"]);
-                // add by zjx 2020-12-21 能谱Z轴移动位置 end
-                // add by zjx 2020-12-21 能谱电压值
-                m_MeasureFile.MParam.SEMVoltageeType0 = Convert.ToString(ConfigurationManager.AppSettings["SEMVoltageeType0"]);
+            m_MeasureFile.MParam.SEMAxis_ZType4 = Convert.ToString(ConfigurationManager.AppSettings["SEMAxis_ZType4"]);
+            m_MeasureFile.MParam.SEMAxis_ZType5 = Convert.ToString(ConfigurationManager.AppSettings["SEMAxis_ZType5"]);
+            // add by zjx 2020-12-21 能谱Z轴移动位置 end
+            // add by zjx 2020-12-21 能谱电压值
+            m_MeasureFile.MParam.SEMVoltageeType0 = Convert.ToString(ConfigurationManager.AppSettings["SEMVoltageeType0"]);
                 m_MeasureFile.MParam.SEMVoltageeType1 = Convert.ToString(ConfigurationManager.AppSettings["SEMVoltageeType1"]);
                 m_MeasureFile.MParam.SEMVoltageeType2 = Convert.ToString(ConfigurationManager.AppSettings["SEMVoltageeType2"]);
                 m_MeasureFile.MParam.SEMVoltageeType3 = Convert.ToString(ConfigurationManager.AppSettings["SEMVoltageeType3"]);
-                // add by zjx 2020-12-21 能谱电压值 end
-                // add by zjx 2020-12-21 能谱电流值
-                m_MeasureFile.MParam.SEMCurrentType0 = Convert.ToString(ConfigurationManager.AppSettings["SEMCurrentType0"]);
+            m_MeasureFile.MParam.SEMVoltageeType4 = Convert.ToString(ConfigurationManager.AppSettings["SEMVoltageeType4"]);
+            m_MeasureFile.MParam.SEMVoltageeType5 = Convert.ToString(ConfigurationManager.AppSettings["SEMVoltageeType5"]);
+            // add by zjx 2020-12-21 能谱电压值 end
+            // add by zjx 2020-12-21 能谱电流值
+            m_MeasureFile.MParam.SEMCurrentType0 = Convert.ToString(ConfigurationManager.AppSettings["SEMCurrentType0"]);
                 m_MeasureFile.MParam.SEMCurrentType1 = Convert.ToString(ConfigurationManager.AppSettings["SEMCurrentType1"]);
                 m_MeasureFile.MParam.SEMCurrentType2 = Convert.ToString(ConfigurationManager.AppSettings["SEMCurrentType2"]);
                 m_MeasureFile.MParam.SEMCurrentType3 = Convert.ToString(ConfigurationManager.AppSettings["SEMCurrentType3"]);
-                // add by zjx 2020-12-21 能谱电流值 end
-                #endregion
+            m_MeasureFile.MParam.SEMCurrentType4 = Convert.ToString(ConfigurationManager.AppSettings["SEMCurrentType4"]);
+            m_MeasureFile.MParam.SEMCurrentType5 = Convert.ToString(ConfigurationManager.AppSettings["SEMCurrentType5"]);
+            // add by zjx 2020-12-21 能谱电流值 end
+            #endregion
         }
 
    

HOZProject/UserControls/UControl_Init.cs

@@ -1617,6 +1617,32 @@ namespace HOZProject
                 cbbEDSA.Text = FormHOZMainObject.m_MeasureFile.MParam.SEMCurrentType3;//能谱电流值
                 label27.Text = "3-DDIC";
             }
+            else
+                        if (cbbWYP.Text == "4")
+            {
+                //cbbWCS.Text = FormHOZMainObject.m_MeasureFile.MParam.VendorType3;//厂商
+                cbbWLZ.Text = FormHOZMainObject.m_MeasureFile.MParam.StraightenTimesType4;//拉直放大倍数
+                cbbWQGD.Text = FormHOZMainObject.m_MeasureFile.MParam.PositioningVoltageeType4;//定位电压
+                cbbWQGF.Text = FormHOZMainObject.m_MeasureFile.MParam.PositioningTimesType4;//定位放大倍数
+                cbbWPZD.Text = FormHOZMainObject.m_MeasureFile.MParam.PhotoVoltageeType4;//拍照电压
+                cbbWPZF.Text = FormHOZMainObject.m_MeasureFile.MParam.PhotoTimesType4;//拍照放大倍数
+                cbbEDSV.Text = FormHOZMainObject.m_MeasureFile.MParam.SEMVoltageeType4;//能谱电压值
+                cbbEDSA.Text = FormHOZMainObject.m_MeasureFile.MParam.SEMCurrentType4;//能谱电流值
+                label27.Text = "4-射频IC-1";
+            }
+            else
+                        if (cbbWYP.Text == "5")
+            {
+                //cbbWCS.Text = FormHOZMainObject.m_MeasureFile.MParam.VendorType3;//厂商
+                cbbWLZ.Text = FormHOZMainObject.m_MeasureFile.MParam.StraightenTimesType5;//拉直放大倍数
+                cbbWQGD.Text = FormHOZMainObject.m_MeasureFile.MParam.PositioningVoltageeType5;//定位电压
+                cbbWQGF.Text = FormHOZMainObject.m_MeasureFile.MParam.PositioningTimesType5;//定位放大倍数
+                cbbWPZD.Text = FormHOZMainObject.m_MeasureFile.MParam.PhotoVoltageeType5;//拍照电压
+                cbbWPZF.Text = FormHOZMainObject.m_MeasureFile.MParam.PhotoTimesType5;//拍照放大倍数
+                cbbEDSV.Text = FormHOZMainObject.m_MeasureFile.MParam.SEMVoltageeType5;//能谱电压值
+                cbbEDSA.Text = FormHOZMainObject.m_MeasureFile.MParam.SEMCurrentType5;//能谱电流值
+                label27.Text = "5-射频IC-1";
+            }
         }
     }
 }

MeasureData/MeasureParam.cs

@@ -452,6 +452,18 @@ namespace MeasureData
             get { return this.m_VendorType3; }
             set { this.m_VendorType3 = value; }
         }
+        private String m_VendorType4;
+        public String VendorType4
+        {
+            get { return this.m_VendorType4; }
+            set { this.m_VendorType4 = value; }
+        }
+        private String m_VendorType5;
+        public String VendorType5
+        {
+            get { return this.m_VendorType5; }
+            set { this.m_VendorType5 = value; }
+        }
         #endregion
         // add by zjx 2020-12-20 厂商名字 end
 
@@ -481,6 +493,18 @@ namespace MeasureData
             get { return this.m_CorrectionType3; }
             set { this.m_CorrectionType3 = value; }
         }
+        private String m_CorrectionType4;
+        public String CorrectionType4
+        {
+            get { return this.m_CorrectionType4; }
+            set { this.m_CorrectionType4 = value; }
+        }
+        private String m_CorrectionType5;
+        public String CorrectionType5
+        {
+            get { return this.m_CorrectionType5; }
+            set { this.m_CorrectionType5 = value; }
+        }
         #endregion
         //add by zjx 2020-12-20 校正角度 end
 
@@ -510,6 +534,19 @@ namespace MeasureData
             get { return this.m_StraightenTimesType3; }
             set { this.m_StraightenTimesType3 = value; }
         }
+        private String m_StraightenTimesType4;
+        public String StraightenTimesType4
+        {
+            get { return this.m_StraightenTimesType4; }
+            set { this.m_StraightenTimesType4 = value; }
+        }
+        private String m_StraightenTimesType5;
+        public String StraightenTimesType5
+        {
+            get { return this.m_StraightenTimesType5; }
+            set { this.m_StraightenTimesType5 = value; }
+        }
+
         #endregion
         //add by zjx 2020-12-20 拉直操作放大倍数 end 
 
@@ -539,6 +576,18 @@ namespace MeasureData
             get { return this.m_PositioningVoltageeType3; }
             set { this.m_PositioningVoltageeType3 = value; }
         }
+        private String m_PositioningVoltageeType4;
+        public String PositioningVoltageeType4
+        {
+            get { return this.m_PositioningVoltageeType4; }
+            set { this.m_PositioningVoltageeType4 = value; }
+        }
+        private String m_PositioningVoltageeType5;
+        public String PositioningVoltageeType5
+        {
+            get { return this.m_PositioningVoltageeType5; }
+            set { this.m_PositioningVoltageeType5 = value; }
+        }
         #endregion
         //add by zjx 2020-12-20 样品类型的定位电压 end 
 
@@ -568,6 +617,18 @@ namespace MeasureData
             get { return this.m_PositioningTimesType3; }
             set { this.m_PositioningTimesType3 = value; }
         }
+        private String m_PositioningTimesType4;
+        public String PositioningTimesType4
+        {
+            get { return this.m_PositioningTimesType4; }
+            set { this.m_PositioningTimesType4 = value; }
+        }
+        private String m_PositioningTimesType5;
+        public String PositioningTimesType5
+        {
+            get { return this.m_PositioningTimesType5; }
+            set { this.m_PositioningTimesType5 = value; }
+        }
         #endregion
         //add by zjx 2020-12-20 样品类型的定位放大倍数 end 
 
@@ -597,6 +658,18 @@ namespace MeasureData
             get { return this.m_PhotoVoltageeType3; }
             set { this.m_PhotoVoltageeType3 = value; }
         }
+        private String m_PhotoVoltageeType4;
+        public String PhotoVoltageeType4
+        {
+            get { return this.m_PhotoVoltageeType4; }
+            set { this.m_PhotoVoltageeType4 = value; }
+        }
+        private String m_PhotoVoltageeType5;
+        public String PhotoVoltageeType5
+        {
+            get { return this.m_PhotoVoltageeType5; }
+            set { this.m_PhotoVoltageeType5 = value; }
+        }
         #endregion
         //add by zjx 2020-12-20 样品类型的拍照电压 end 
 
@@ -626,6 +699,18 @@ namespace MeasureData
             get { return this.m_PhotoTimesType3; }
             set { this.m_PhotoTimesType3 = value; }
         }
+        private String m_PhotoTimesType4;
+        public String PhotoTimesType4
+        {
+            get { return this.m_PhotoTimesType4; }
+            set { this.m_PhotoTimesType4 = value; }
+        }
+        private String m_PhotoTimesType5;
+        public String PhotoTimesType5
+        {
+            get { return this.m_PhotoTimesType5; }
+            set { this.m_PhotoTimesType5 = value; }
+        }
         #endregion
         //add by zjx 2020-12-20 样品类型的拍照放大倍数 end 
 
@@ -655,6 +740,18 @@ namespace MeasureData
             get { return this.m_ScanRotateType3; }
             set { this.m_ScanRotateType3 = value; }
         }
+        private String m_ScanRotateType4;
+        public String ScanRotateType4
+        {
+            get { return this.m_ScanRotateType4; }
+            set { this.m_ScanRotateType4 = value; }
+        }
+        private String m_ScanRotateType5;
+        public String ScanRotateType5
+        {
+            get { return this.m_ScanRotateType5; }
+            set { this.m_ScanRotateType5 = value; }
+        }
         #endregion
         //add by zjx 2020-12-20 样品类型的ScanRotate修正参数 end 
 
@@ -684,6 +781,18 @@ namespace MeasureData
             get { return this.m_PixelSizeType3; }
             set { this.m_PixelSizeType3 = value; }
         }
+        private String m_PixelSizeType4;
+        public String PixelSizeType4
+        {
+            get { return this.m_PixelSizeType4; }
+            set { this.m_PixelSizeType4 = value; }
+        }
+        private String m_PixelSizeType5;
+        public String PixelSizeType5
+        {
+            get { return this.m_PixelSizeType5; }
+            set { this.m_PixelSizeType5 = value; }
+        }
         #endregion
         //add by zjx 2020-12-20 样品类型的Y轴方向PixelSize修正值 end 
 
@@ -713,6 +822,18 @@ namespace MeasureData
             get { return this.m_SEMAxis_ZType3; }
             set { this.m_SEMAxis_ZType3 = value; }
         }
+        private String m_SEMAxis_ZType4;
+        public String SEMAxis_ZType4
+        {
+            get { return this.m_SEMAxis_ZType4; }
+            set { this.m_SEMAxis_ZType4 = value; }
+        }
+        private String m_SEMAxis_ZType5;
+        public String SEMAxis_ZType5
+        {
+            get { return this.m_SEMAxis_ZType5; }
+            set { this.m_SEMAxis_ZType5 = value; }
+        }
         #endregion
         //add by zjx 2020-12-20 样品类型的能谱Z轴移动位置 end 
 
@@ -742,6 +863,18 @@ namespace MeasureData
             get { return this.m_SEMVoltageeType3; }
             set { this.m_SEMVoltageeType3 = value; }
         }
+        private String m_SEMVoltageeType4;
+        public String SEMVoltageeType4
+        {
+            get { return this.m_SEMVoltageeType4; }
+            set { this.m_SEMVoltageeType4 = value; }
+        }
+        private String m_SEMVoltageeType5;
+        public String SEMVoltageeType5
+        {
+            get { return this.m_SEMVoltageeType5; }
+            set { this.m_SEMVoltageeType5 = value; }
+        }
         #endregion
         //add by zjx 2020-12-20 样品类型的能谱电压值 end
 
@@ -771,11 +904,23 @@ namespace MeasureData
             get { return this.m_SEMCurrentType3; }
             set { this.m_SEMCurrentType3 = value; }
         }
+        private String m_SEMCurrentType4;
+        public String SEMCurrentType4
+        {
+            get { return this.m_SEMCurrentType4; }
+            set { this.m_SEMCurrentType4 = value; }
+        }
+        private String m_SEMCurrentType5;
+        public String SEMCurrentType5
+        {
+            get { return this.m_SEMCurrentType5; }
+            set { this.m_SEMCurrentType5 = value; }
+        }
         #endregion
         //add by zjx 2020-12-20 样品类型的能谱电流值 end
         #endregion
 
-       
+
 
 
         //构造函数

MeasureThread/IMath.cs

@@ -10,11 +10,11 @@ namespace MeasureThread
 
         [XmlRpcMethod("autostigfocus")]//其中客户端的web方法名称即[ ]中的名称必须和服务端相同，否则会抛异常。
         [return: XmlRpcReturnValue(Description = "autostigfocus: 对焦；")]
-        string autofocusstig(int search_step, int iter_n, double wd_searh_factor, double stig_range, double iter_range_damping);
+        string autofocusstig(int search_step, int iter_n, double wd_searh_factor, double stig_range, double iter_range_damping,bool normalized);
 
         [XmlRpcMethod("autofocus")]
         [return: XmlRpcReturnValue(Description = "autofocus: 对焦；")]//注释写什么都可以。
-        string autofocus(int search_step, double wd_searh_factor, double retry, bool refine);
+        string autofocus(int search_step, double wd_searh_factor, double retry, bool refine,bool normalized);
     }
 
 }

MeasureThread/Measure.cs

@@ -517,7 +517,7 @@ namespace MeasureThread
 
             if (MParam.EDS == true)
             {
-                log.Info("进行能谱分析", true);
+                log.Info("进行能谱分析，初始化Xray数据库", true);
                 Init_MeasDB();
             }
 
@@ -3594,10 +3594,19 @@ namespace MeasureThread
                 #region 执行蔡司自动对焦程序
                 //服务地址
                 string snumstr = @"http://192.168.1.101:8123";
+                bool normalized;
+                if (MParam.SampleName == "1")//第1大类代表3、4小类
+                {
+                    normalized = false;
+                }
+                else
+                {
+                    normalized = true;
+                }
                 // 调用方法；只对焦不消像散
                 if (Is_Stig)
                 {
-                    string focusstig = XmlRpcClient.autofocusstig(10, 3, 3, 3, 0.7, snumstr);
+                    string focusstig = XmlRpcClient.autofocusstig(10, 3, 3, 3, 0.7, snumstr,normalized);
                     if (focusstig != "success")
                     {
                         log.Error("对焦失败" + focusstig, false);
@@ -3606,7 +3615,7 @@ namespace MeasureThread
                 }
                 else
                 {
-                    string onlyfocus = XmlRpcClient.autofocus(10, 3, 3, true, snumstr);
+                    string onlyfocus = XmlRpcClient.autofocus(10, 3, 3, true, snumstr,normalized);
                     if (onlyfocus != "success")
                     {
                         return false;
@@ -6759,20 +6768,28 @@ namespace MeasureThread
             //这块应该做成参数！！！ 暂时写死。类型3 则为 5000V 500pA
             bool mRet_VoltageFlag = false;
             bool mRet_ElecFlag = false;
-            if (MParam.SampleName != "3")
+            if (MParam.SampleName == "4" || MParam.SampleName == "5")
             {
-                mRet_VoltageFlag = iSEM.SetSEMVoltage(2000);
+                mRet_VoltageFlag = iSEM.SetSEMVoltage(5000);
                 Thread.Sleep(500);
                 mRet_ElecFlag = iSEM.SetSEMIPROBE(0.2F / 1000000000);
                 Thread.Sleep(500);
             }
-            else
+            else if (MParam.SampleName == "3")
             {
                 mRet_VoltageFlag = iSEM.SetSEMVoltage(5000);
                 Thread.Sleep(500);
                 mRet_ElecFlag = iSEM.SetSEMIPROBE(0.5F / 1000000000);
                 Thread.Sleep(500);
             }
+            else
+            {              
+
+                mRet_VoltageFlag = iSEM.SetSEMVoltage(2000);
+                Thread.Sleep(500);
+                mRet_ElecFlag = iSEM.SetSEMIPROBE(0.2F / 1000000000);
+                Thread.Sleep(500);
+            }
             if (!mRet_VoltageFlag) return false;
             if (!mRet_ElecFlag) return false;
             log.Info("测量线程：设置电压电流完成！", true);

MeasureThread/XmlRpcClient.cs

@@ -30,12 +30,12 @@ namespace MeasureThread
         /// 对焦
         /// </summary>
         /// <returns></returns>
-        public static string autofocusstig(int search_step, int iter_n, double wd_searh_factor, double stig_range, double iter_range_damping, string urlstr)
+        public static string autofocusstig(int search_step, int iter_n, double wd_searh_factor, double stig_range, double iter_range_damping, string urlstr,bool normalized)
         {
             string xrs;
             //调取接口方法
             IMethod method = getInstance(urlstr);
-            xrs = method.autofocusstig( search_step, iter_n, wd_searh_factor, stig_range, iter_range_damping);
+            xrs = method.autofocusstig( search_step, iter_n, wd_searh_factor, stig_range, iter_range_damping,normalized);
 
             return xrs;
         }
@@ -43,12 +43,12 @@ namespace MeasureThread
         /// 对焦
         /// </summary>
         /// <returns></returns>
-        public static string autofocus(int search_step, double wd_searh_factor, double retry, bool refine, string urlstr)
+        public static string autofocus(int search_step, double wd_searh_factor, double retry, bool refine, string urlstr,bool normalized)
         {
             string xrs;
             //调取接口方法
             IMethod method = getInstance(urlstr);
-            xrs = method.autofocus( search_step,  wd_searh_factor,  retry,  refine);
+            xrs = method.autofocus( search_step,  wd_searh_factor,  retry,  refine,normalized);
 
             return xrs;
         }