优化界面，去除没用的按键图标，线扫描方式修改成使用点扫模拟线扫

ExtenderControl/HOZExtender.csproj

@@ -45,7 +45,7 @@
     </Reference>
     <Reference Include="OINA.Extender, Version=4.2.0.0, Culture=neutral, PublicKeyToken=5efad68c95e0364e, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\bin\Debug\OINA.Extender.dll</HintPath>
+      <HintPath>C:\Program Files (x86)\Oxford Instruments NanoAnalysis\Extender\OINA.Extender.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -67,30 +67,6 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="C:\Program Files (x86)\Oxford Instruments NanoAnalysis\Extender\apidsp_windows.dll">
-      <Link>apidsp_windows.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="C:\Program Files (x86)\Oxford Instruments NanoAnalysis\Extender\apidsp_windows_x64.dll">
-      <Link>apidsp_windows_x64.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="C:\Program Files (x86)\Oxford Instruments NanoAnalysis\Extender\hasp_net_windows.dll">
-      <Link>hasp_net_windows.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="C:\Program Files (x86)\Oxford Instruments NanoAnalysis\Extender\hasp_windows_50590.dll">
-      <Link>hasp_windows_50590.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="C:\Program Files (x86)\Oxford Instruments NanoAnalysis\Extender\hasp_windows_x64_50590.dll">
-      <Link>hasp_windows_x64_50590.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="C:\Program Files (x86)\Oxford Instruments NanoAnalysis\Extender\OINA.SNSLicenseProvider.dll">
-      <Link>OINA.SNSLicenseProvider.dll</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <Content Include="C:\Program Files (x86)\Oxford Instruments NanoAnalysis\Extender\x64\OINA.Ipp.dll">
       <Link>x64\OINA.Ipp.dll</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>

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 = global::HOZProject.Properties.Resources.Report;
             this.pbPause.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.pbPause.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.pbPause.Location = new System.Drawing.Point(497, 5);
-            this.pbPause.Margin = new System.Windows.Forms.Padding(4);
+            this.pbPause.Location = new System.Drawing.Point(301, 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.Click += new System.EventHandler(this.pbPause_Click);
@@ -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(398, 3);
-            this.pbStart.Margin = new System.Windows.Forms.Padding(4);
+            this.pbStart.Location = new System.Drawing.Point(226, 3);
             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,12 +373,12 @@
             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(473, 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.Visible = false;
             this.pbImportTemplateFile.Click += new System.EventHandler(this.pbImportTemplateFile_Click);
             // 
             // pbLog
@@ -409,10 +387,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(754, 5);
-            this.pbLog.Margin = new System.Windows.Forms.Padding(4);
+            this.pbLog.Location = new System.Drawing.Point(566, 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.Visible = false;
@@ -424,10 +401,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);
@@ -438,10 +414,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, 4);
             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);
@@ -451,10 +426,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;
@@ -467,10 +441,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(398, 4);
-            this.pbStop.Margin = new System.Windows.Forms.Padding(4);
+            this.pbStop.Location = new System.Drawing.Point(226, 4);
             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;
@@ -484,25 +457,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

@@ -948,15 +948,15 @@ namespace HOZProject
             if (File.Exists(m_MeasureFile.m_SavePath))
             {
                 string position = System.Environment.CurrentDirectory;
-                 //Process pro = Process.Start(@"D:\DebugLine\Debug\ExportReport.exe", @"D:\6\s.msf");//打开程序B
-                  Process pro = Process.Start(position + "\\Report\\ExportReport.exe", m_MeasureFile.m_SavePath);//打开程序B
+                //Process pro = Process.Start(@"C:\Users\admin\Desktop\Report\Report\ExportReport.exe", @"C:\Users\admin\Downloads\3\3\3.msf");//打开程序B
+                Process pro = Process.Start(position + "\\Report\\ExportReport.exe", m_MeasureFile.m_SavePath);//打开程序B
                  pro.WaitForExit();
                 int Result = pro.ExitCode;//程序B退出回传值
                 if (Result == 1)//接收到程序B退出代码"1"
                 {
                     MessageBox.Show("退出程序B");
                 }
-            }
+        }
             else
             {
                 MessageBox.Show("尚未保存文件");

HOZProject/UserControls/UControl_Init.Designer.cs

@@ -94,7 +94,7 @@
             this.label1.ForeColor = System.Drawing.Color.Black;
             this.label1.Location = new System.Drawing.Point(15, 9);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(84, 20);
+            this.label1.Size = new System.Drawing.Size(68, 17);
             this.label1.TabIndex = 0;
             this.label1.Text = "初始化设置";
             // 
@@ -132,7 +132,7 @@
             this.tbCutHoleFilePath.Location = new System.Drawing.Point(174, 48);
             this.tbCutHoleFilePath.Name = "tbCutHoleFilePath";
             this.tbCutHoleFilePath.ReadOnly = true;
-            this.tbCutHoleFilePath.Size = new System.Drawing.Size(347, 27);
+            this.tbCutHoleFilePath.Size = new System.Drawing.Size(347, 23);
             this.tbCutHoleFilePath.TabIndex = 5;
             // 
             // txtWPTF
@@ -141,7 +141,7 @@
             this.txtWPTF.Location = new System.Drawing.Point(174, 99);
             this.txtWPTF.Name = "txtWPTF";
             this.txtWPTF.ReadOnly = true;
-            this.txtWPTF.Size = new System.Drawing.Size(346, 27);
+            this.txtWPTF.Size = new System.Drawing.Size(346, 23);
             this.txtWPTF.TabIndex = 7;
             // 
             // lblCutHoleCount
@@ -151,7 +151,7 @@
             this.lblCutHoleCount.ForeColor = System.Drawing.Color.Black;
             this.lblCutHoleCount.Location = new System.Drawing.Point(172, 78);
             this.lblCutHoleCount.Name = "lblCutHoleCount";
-            this.lblCutHoleCount.Size = new System.Drawing.Size(138, 20);
+            this.lblCutHoleCount.Size = new System.Drawing.Size(111, 17);
             this.lblCutHoleCount.TabIndex = 8;
             this.lblCutHoleCount.Text = "成功导入0个分析点";
             // 
@@ -163,7 +163,7 @@
             this.chkManul.Location = new System.Drawing.Point(647, 129);
             this.chkManul.Margin = new System.Windows.Forms.Padding(2);
             this.chkManul.Name = "chkManul";
-            this.chkManul.Size = new System.Drawing.Size(100, 27);
+            this.chkManul.Size = new System.Drawing.Size(80, 23);
             this.chkManul.TabIndex = 15;
             this.chkManul.Text = "手动对焦";
             this.chkManul.UseVisualStyleBackColor = true;
@@ -177,7 +177,7 @@
             this.label6.Location = new System.Drawing.Point(88, 49);
             this.label6.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(84, 20);
+            this.label6.Size = new System.Drawing.Size(68, 17);
             this.label6.TabIndex = 17;
             this.label6.Text = "导入分析点";
             // 
@@ -189,7 +189,7 @@
             this.cbbWCS.Location = new System.Drawing.Point(497, 190);
             this.cbbWCS.Margin = new System.Windows.Forms.Padding(2);
             this.cbbWCS.Name = "cbbWCS";
-            this.cbbWCS.Size = new System.Drawing.Size(155, 25);
+            this.cbbWCS.Size = new System.Drawing.Size(155, 21);
             this.cbbWCS.TabIndex = 93;
             // 
             // cbbWYP
@@ -200,7 +200,7 @@
             this.cbbWYP.Location = new System.Drawing.Point(174, 185);
             this.cbbWYP.Margin = new System.Windows.Forms.Padding(2);
             this.cbbWYP.Name = "cbbWYP";
-            this.cbbWYP.Size = new System.Drawing.Size(155, 25);
+            this.cbbWYP.Size = new System.Drawing.Size(155, 21);
             this.cbbWYP.TabIndex = 92;
             this.cbbWYP.SelectedIndexChanged += new System.EventHandler(this.cbbWYP_SelectedIndexChanged);
             // 
@@ -212,7 +212,7 @@
             this.label50.Location = new System.Drawing.Point(80, 264);
             this.label50.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label50.Name = "label50";
-            this.label50.Size = new System.Drawing.Size(70, 20);
+            this.label50.Size = new System.Drawing.Size(56, 17);
             this.label50.TabIndex = 90;
             this.label50.Text = "电流/mA";
             // 
@@ -224,7 +224,7 @@
             this.label54.Location = new System.Drawing.Point(18, 390);
             this.label54.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label54.Name = "label54";
-            this.label54.Size = new System.Drawing.Size(159, 20);
+            this.label54.Size = new System.Drawing.Size(128, 17);
             this.label54.TabIndex = 89;
             this.label54.Text = "第一次截面照放大倍数";
             // 
@@ -236,7 +236,7 @@
             this.label46.Location = new System.Drawing.Point(80, 239);
             this.label46.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label46.Name = "label46";
-            this.label46.Size = new System.Drawing.Size(55, 20);
+            this.label46.Size = new System.Drawing.Size(45, 17);
             this.label46.TabIndex = 88;
             this.label46.Text = "电压/V";
             // 
@@ -248,7 +248,7 @@
             this.label42.Location = new System.Drawing.Point(18, 362);
             this.label42.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label42.Name = "label42";
-            this.label42.Size = new System.Drawing.Size(159, 20);
+            this.label42.Size = new System.Drawing.Size(128, 17);
             this.label42.TabIndex = 87;
             this.label42.Text = "找到已切割孔放大倍数";
             // 
@@ -260,7 +260,7 @@
             this.label38.Location = new System.Drawing.Point(48, 334);
             this.label38.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label38.Name = "label38";
-            this.label38.Size = new System.Drawing.Size(129, 20);
+            this.label38.Size = new System.Drawing.Size(104, 17);
             this.label38.TabIndex = 86;
             this.label38.Text = "拉直操作放大倍数";
             // 
@@ -269,12 +269,12 @@
             this.chkWIsP.AutoSize = true;
             this.chkWIsP.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.chkWIsP.ForeColor = System.Drawing.Color.Black;
-            this.chkWIsP.Location = new System.Drawing.Point(90, 156);
+            this.chkWIsP.Location = new System.Drawing.Point(85, 156);
             this.chkWIsP.Margin = new System.Windows.Forms.Padding(2);
             this.chkWIsP.Name = "chkWIsP";
-            this.chkWIsP.Size = new System.Drawing.Size(83, 27);
+            this.chkWIsP.Size = new System.Drawing.Size(176, 23);
             this.chkWIsP.TabIndex = 85;
-            this.chkWIsP.Text = "仅拍照";
+            this.chkWIsP.Text = "仅SEM拍照(倾斜角度为0)";
             this.chkWIsP.UseVisualStyleBackColor = true;
             this.chkWIsP.CheckedChanged += new System.EventHandler(this.chkWIsP_CheckedChanged);
             // 
@@ -286,7 +286,7 @@
             this.label48.Location = new System.Drawing.Point(96, 189);
             this.label48.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label48.Name = "label48";
-            this.label48.Size = new System.Drawing.Size(69, 20);
+            this.label48.Size = new System.Drawing.Size(56, 17);
             this.label48.TabIndex = 81;
             this.label48.Text = "样品类型";
             // 
@@ -298,7 +298,7 @@
             this.label56.Location = new System.Drawing.Point(455, 190);
             this.label56.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label56.Name = "label56";
-            this.label56.Size = new System.Drawing.Size(39, 20);
+            this.label56.Size = new System.Drawing.Size(32, 17);
             this.label56.TabIndex = 80;
             this.label56.Text = "厂商";
             // 
@@ -310,7 +310,7 @@
             this.label59.Location = new System.Drawing.Point(82, 129);
             this.label59.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label59.Name = "label59";
-            this.label59.Size = new System.Drawing.Size(90, 20);
+            this.label59.Size = new System.Drawing.Size(74, 17);
             this.label59.TabIndex = 79;
             this.label59.Text = "FIB文件名称";
             // 
@@ -322,7 +322,7 @@
             this.label61.Location = new System.Drawing.Point(86, 100);
             this.label61.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label61.Name = "label61";
-            this.label61.Size = new System.Drawing.Size(87, 20);
+            this.label61.Size = new System.Drawing.Size(70, 17);
             this.label61.TabIndex = 78;
             this.label61.Text = "PT文件名称";
             // 
@@ -331,10 +331,10 @@
             this.chkWPT.AutoSize = true;
             this.chkWPT.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.chkWPT.ForeColor = System.Drawing.Color.Black;
-            this.chkWPT.Location = new System.Drawing.Point(191, 156);
+            this.chkWPT.Location = new System.Drawing.Point(335, 156);
             this.chkWPT.Margin = new System.Windows.Forms.Padding(2);
             this.chkWPT.Name = "chkWPT";
-            this.chkWPT.Size = new System.Drawing.Size(86, 27);
+            this.chkWPT.Size = new System.Drawing.Size(69, 23);
             this.chkWPT.TabIndex = 77;
             this.chkWPT.Text = "使用PT";
             this.chkWPT.UseVisualStyleBackColor = true;
@@ -346,7 +346,7 @@
             this.txtWFIBF.Location = new System.Drawing.Point(174, 128);
             this.txtWFIBF.Name = "txtWFIBF";
             this.txtWFIBF.ReadOnly = true;
-            this.txtWFIBF.Size = new System.Drawing.Size(346, 27);
+            this.txtWFIBF.Size = new System.Drawing.Size(346, 23);
             this.txtWFIBF.TabIndex = 103;
             // 
             // chkWqxkc
@@ -354,12 +354,13 @@
             this.chkWqxkc.AutoSize = true;
             this.chkWqxkc.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.chkWqxkc.ForeColor = System.Drawing.Color.Black;
-            this.chkWqxkc.Location = new System.Drawing.Point(310, 156);
+            this.chkWqxkc.Location = new System.Drawing.Point(635, 162);
             this.chkWqxkc.Name = "chkWqxkc";
-            this.chkWqxkc.Size = new System.Drawing.Size(100, 27);
+            this.chkWqxkc.Size = new System.Drawing.Size(80, 23);
             this.chkWqxkc.TabIndex = 115;
             this.chkWqxkc.Text = "倾斜观测";
             this.chkWqxkc.UseVisualStyleBackColor = true;
+            this.chkWqxkc.Visible = false;
             this.chkWqxkc.CheckedChanged += new System.EventHandler(this.chkWqxkc_CheckedChanged);
             // 
             // panel2
@@ -404,10 +405,10 @@
             this.chkEDS.AutoSize = true;
             this.chkEDS.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.chkEDS.ForeColor = System.Drawing.Color.Black;
-            this.chkEDS.Location = new System.Drawing.Point(431, 156);
+            this.chkEDS.Location = new System.Drawing.Point(478, 156);
             this.chkEDS.Margin = new System.Windows.Forms.Padding(2);
             this.chkEDS.Name = "chkEDS";
-            this.chkEDS.Size = new System.Drawing.Size(100, 27);
+            this.chkEDS.Size = new System.Drawing.Size(80, 23);
             this.chkEDS.TabIndex = 138;
             this.chkEDS.Text = "能谱测量";
             this.chkEDS.UseVisualStyleBackColor = true;
@@ -424,7 +425,7 @@
             this.cboXrayMode.Location = new System.Drawing.Point(496, 420);
             this.cboXrayMode.Margin = new System.Windows.Forms.Padding(2);
             this.cboXrayMode.Name = "cboXrayMode";
-            this.cboXrayMode.Size = new System.Drawing.Size(155, 25);
+            this.cboXrayMode.Size = new System.Drawing.Size(155, 21);
             this.cboXrayMode.TabIndex = 148;
             // 
             // label28
@@ -435,7 +436,7 @@
             this.label28.Location = new System.Drawing.Point(406, 425);
             this.label28.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label28.Name = "label28";
-            this.label28.Size = new System.Drawing.Size(85, 20);
+            this.label28.Size = new System.Drawing.Size(69, 17);
             this.label28.TabIndex = 142;
             this.label28.Text = "XrayMode";
             // 
@@ -447,7 +448,7 @@
             this.label29.Location = new System.Drawing.Point(659, 431);
             this.label29.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label29.Name = "label29";
-            this.label29.Size = new System.Drawing.Size(103, 20);
+            this.label29.Size = new System.Drawing.Size(81, 17);
             this.label29.TabIndex = 142;
             this.label29.Text = "0:Point 1:line";
             // 
@@ -459,7 +460,7 @@
             this.label30.Location = new System.Drawing.Point(659, 456);
             this.label30.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label30.Name = "label30";
-            this.label30.Size = new System.Drawing.Size(53, 20);
+            this.label30.Size = new System.Drawing.Size(44, 17);
             this.label30.TabIndex = 142;
             this.label30.Text = "2:area";
             // 
@@ -475,6 +476,7 @@
             this.btnHandSavePoints.Text = "手动添加点";
             this.btnHandSavePoints.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             this.btnHandSavePoints.UseVisualStyleBackColor = true;
+            this.btnHandSavePoints.Visible = false;
             this.btnHandSavePoints.Click += new System.EventHandler(this.btnHandSavePoints_Click);
             // 
             // btnFIBTemplateFile
@@ -517,6 +519,7 @@
             this.btnCutHoleAuto.Text = "单个测试点";
             this.btnCutHoleAuto.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             this.btnCutHoleAuto.UseVisualStyleBackColor = true;
+            this.btnCutHoleAuto.Visible = false;
             this.btnCutHoleAuto.Click += new System.EventHandler(this.btnCutHoleAuto_Click);
             // 
             // btnCutHoleFile
@@ -528,7 +531,7 @@
             this.btnCutHoleFile.Name = "btnCutHoleFile";
             this.btnCutHoleFile.Size = new System.Drawing.Size(103, 25);
             this.btnCutHoleFile.TabIndex = 120;
-            this.btnCutHoleFile.Text = "多个测试点";
+            this.btnCutHoleFile.Text = "读取测试点";
             this.btnCutHoleFile.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             this.btnCutHoleFile.UseVisualStyleBackColor = true;
             this.btnCutHoleFile.Click += new System.EventHandler(this.btnCutHoleFile_Click);
@@ -541,7 +544,7 @@
             this.label2.Location = new System.Drawing.Point(48, 309);
             this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(129, 20);
+            this.label2.Size = new System.Drawing.Size(104, 17);
             this.label2.TabIndex = 86;
             this.label2.Text = "恢复位置放大倍数";
             // 
@@ -550,7 +553,7 @@
             this.txtMag1.Location = new System.Drawing.Point(174, 302);
             this.txtMag1.Name = "txtMag1";
             this.txtMag1.ReadOnly = true;
-            this.txtMag1.Size = new System.Drawing.Size(155, 27);
+            this.txtMag1.Size = new System.Drawing.Size(155, 23);
             this.txtMag1.TabIndex = 149;
             // 
             // txtMag2
@@ -558,7 +561,7 @@
             this.txtMag2.Location = new System.Drawing.Point(174, 331);
             this.txtMag2.Name = "txtMag2";
             this.txtMag2.ReadOnly = true;
-            this.txtMag2.Size = new System.Drawing.Size(155, 27);
+            this.txtMag2.Size = new System.Drawing.Size(155, 23);
             this.txtMag2.TabIndex = 149;
             // 
             // txtMag3
@@ -566,7 +569,7 @@
             this.txtMag3.Location = new System.Drawing.Point(174, 360);
             this.txtMag3.Name = "txtMag3";
             this.txtMag3.ReadOnly = true;
-            this.txtMag3.Size = new System.Drawing.Size(155, 27);
+            this.txtMag3.Size = new System.Drawing.Size(155, 23);
             this.txtMag3.TabIndex = 149;
             // 
             // txtMag4
@@ -574,7 +577,7 @@
             this.txtMag4.Location = new System.Drawing.Point(174, 389);
             this.txtMag4.Name = "txtMag4";
             this.txtMag4.ReadOnly = true;
-            this.txtMag4.Size = new System.Drawing.Size(155, 27);
+            this.txtMag4.Size = new System.Drawing.Size(155, 23);
             this.txtMag4.TabIndex = 149;
             // 
             // txtVot
@@ -582,7 +585,7 @@
             this.txtVot.Location = new System.Drawing.Point(174, 234);
             this.txtVot.Name = "txtVot";
             this.txtVot.ReadOnly = true;
-            this.txtVot.Size = new System.Drawing.Size(155, 27);
+            this.txtVot.Size = new System.Drawing.Size(155, 23);
             this.txtVot.TabIndex = 149;
             // 
             // txtIprobe
@@ -590,7 +593,7 @@
             this.txtIprobe.Location = new System.Drawing.Point(174, 265);
             this.txtIprobe.Name = "txtIprobe";
             this.txtIprobe.ReadOnly = true;
-            this.txtIprobe.Size = new System.Drawing.Size(155, 27);
+            this.txtIprobe.Size = new System.Drawing.Size(155, 23);
             this.txtIprobe.TabIndex = 149;
             // 
             // label3
@@ -601,7 +604,7 @@
             this.label3.Location = new System.Drawing.Point(395, 234);
             this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(99, 20);
+            this.label3.Size = new System.Drawing.Size(80, 17);
             this.label3.TabIndex = 142;
             this.label3.Text = "角度补偿参数";
             // 
@@ -613,7 +616,7 @@
             this.label5.Location = new System.Drawing.Point(386, 267);
             this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(108, 20);
+            this.label5.Size = new System.Drawing.Size(87, 17);
             this.label5.TabIndex = 142;
             this.label5.Text = "Y轴方向修正值";
             // 
@@ -621,35 +624,35 @@
             // 
             this.txtScanRotCur.Location = new System.Drawing.Point(497, 232);
             this.txtScanRotCur.Name = "txtScanRotCur";
-            this.txtScanRotCur.Size = new System.Drawing.Size(156, 27);
+            this.txtScanRotCur.Size = new System.Drawing.Size(156, 23);
             this.txtScanRotCur.TabIndex = 150;
             // 
             // txtYPSCur
             // 
             this.txtYPSCur.Location = new System.Drawing.Point(498, 265);
             this.txtYPSCur.Name = "txtYPSCur";
-            this.txtYPSCur.Size = new System.Drawing.Size(156, 27);
+            this.txtYPSCur.Size = new System.Drawing.Size(156, 23);
             this.txtYPSCur.TabIndex = 150;
             // 
             // txtEDSZ
             // 
             this.txtEDSZ.Location = new System.Drawing.Point(497, 301);
             this.txtEDSZ.Name = "txtEDSZ";
-            this.txtEDSZ.Size = new System.Drawing.Size(156, 27);
+            this.txtEDSZ.Size = new System.Drawing.Size(156, 23);
             this.txtEDSZ.TabIndex = 150;
             // 
             // txtEDSV
             // 
             this.txtEDSV.Location = new System.Drawing.Point(498, 334);
             this.txtEDSV.Name = "txtEDSV";
-            this.txtEDSV.Size = new System.Drawing.Size(156, 27);
+            this.txtEDSV.Size = new System.Drawing.Size(156, 23);
             this.txtEDSV.TabIndex = 150;
             // 
             // txtEDSA
             // 
             this.txtEDSA.Location = new System.Drawing.Point(498, 367);
             this.txtEDSA.Name = "txtEDSA";
-            this.txtEDSA.Size = new System.Drawing.Size(156, 27);
+            this.txtEDSA.Size = new System.Drawing.Size(156, 23);
             this.txtEDSA.TabIndex = 150;
             // 
             // label4
@@ -660,7 +663,7 @@
             this.label4.Location = new System.Drawing.Point(398, 304);
             this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(93, 20);
+            this.label4.Size = new System.Drawing.Size(75, 17);
             this.label4.TabIndex = 142;
             this.label4.Text = "能谱Z轴位置";
             // 
@@ -672,7 +675,7 @@
             this.label7.Location = new System.Drawing.Point(422, 341);
             this.label7.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(69, 20);
+            this.label7.Size = new System.Drawing.Size(56, 17);
             this.label7.TabIndex = 142;
             this.label7.Text = "能谱电压";
             // 
@@ -684,13 +687,13 @@
             this.label8.Location = new System.Drawing.Point(422, 374);
             this.label8.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(69, 20);
+            this.label8.Size = new System.Drawing.Size(56, 17);
             this.label8.TabIndex = 142;
             this.label8.Text = "能谱电流";
             // 
             // UControl_Init
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 17F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240)))));
             this.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;

HOZProject/UserControls/UControl_Init.cs

@@ -365,7 +365,15 @@ namespace HOZProject
             var m_param = formHOZMain.m_MeasureFile.MParam;
             m_param.Is_Photograph = chkWIsP.Checked;//是否仅拍照
             m_param.PT = chkWPT.Checked;//是否有PT
-            m_param.Tilt = chkWqxkc.Checked;//是否倾斜样品台
+           // m_param.Tilt = chkWqxkc.Checked;//是否倾斜样品台
+            if (chkWIsP.Checked)
+            {
+                m_param.Tilt = false;
+
+            }else
+            {
+                m_param.Tilt = true; ;
+            }
             m_param.EDS = chkEDS.Checked;
             m_param.EDSZ = Convert.ToSingle(txtEDSZ.Text) ;
             m_param.EDSV = Convert.ToSingle(txtEDSV.Text);
@@ -487,7 +495,7 @@ namespace HOZProject
             chkWIsP.Checked=Convert.ToBoolean(config.AppSettings.Settings["Is_Photograph"].Value);
             chkWPT.Checked = Convert.ToBoolean(config.AppSettings.Settings["PT_Depostion"].Value);
          
-            chkWqxkc.Checked = Convert.ToBoolean(config.AppSettings.Settings["Is_Title"].Value);
+          //  chkWqxkc.Checked = Convert.ToBoolean(config.AppSettings.Settings["Is_Title"].Value);
 
             txtWPTF.Text = config.AppSettings.Settings["PT_ELYFile"].Value;
             txtWFIBF.Text = config.AppSettings.Settings["FIB_ELYFile"].Value;
@@ -583,8 +591,9 @@ namespace HOZProject
         {
             if (chkWIsP.Checked)
             {
-                chkWqxkc.Checked = false;
-                chkWqxkc.Visible = false;
+             //   chkWIsP.Text = "仅SEM拍照(倾斜角度为0)"; 
+               // chkWqxkc.Checked = false;
+               // chkWqxkc.Visible = false;
                 chkWPT.Checked = false;
                 chkWPT.Visible = false;
                 label61.Visible = false;
@@ -605,7 +614,8 @@ namespace HOZProject
             }
             else
             {
-                chkWqxkc.Visible = true;
+              //  chkWIsP.Text = "仅SEM拍照";
+                //  chkWqxkc.Visible = true;
                 chkWPT.Visible = true;
                 label61.Visible = true;
                 label59.Visible = true;

MeasureThread/Focus.cs

@@ -148,7 +148,7 @@ namespace MeasureThread
             Thread.Sleep(200);
             float cycle_time = iSEM.GetCycleTime();
             Thread.Sleep(Convert.ToInt32(cycle_time) + 100);
-            // 
+            log.Info("角度补充为:"+ prm.tiltCorrAngle.ToString());
             if (!TiltCorrection(prm.tiltCorrAngle))
             {               
                 return false;

MeasureThread/Measure.cs

@@ -991,9 +991,6 @@ namespace MeasureThread
 
             if (MParam.Is_Photograph == false)
             {
-              
-
-              
 
                 #region 获取两个位置上及放大倍数
                 //计算两个测量区域坐标
@@ -1274,7 +1271,7 @@ namespace MeasureThread
                 //第三步：自动化流程-每个点都需要补偿54度
                 if (MParam.Is_Photograph == false)
                 {
-                    log.Info("测量线程：倾斜补偿角度为54度", true);
+                    log.Info("测量线程：倾斜补偿角度为"+ MParam.Correction_Angle_OutSide.ToString(), true);
                     if (!m_focuse. TiltCorrection(MParam.Correction_Angle_OutSide))
                     {
                         log.Error("测量线程报错：倾斜补偿角度为54度失败", false);
@@ -1669,13 +1666,14 @@ namespace MeasureThread
                             XrayData = new long[2000];
                             listElement = new Dictionary<string, double>();
                           
-                            if (iExtender.XrayPointCollecting(param.PointTime, pt.X, pt.Y , out XrayData, out listElement))
+                            if (iExtender.XrayPointCollecting(1000, pt.X, pt.Y , out XrayData, out listElement))
                             {
                                 string ele = "";
                                 foreach (var s in listElement)
                                 {
                                     ele += s.ToString();
                                 }
+                                log.Info("采集时间=1000", true);
                                 log.Info("采集点：（" + pt.X.ToString() + ":" + pt.Y.ToString() + ") 元素：" + ele);
                                 //写入数据库
                                 m_nXrayId++;
@@ -1690,6 +1688,7 @@ namespace MeasureThread
                     case 1://line mode
 
                         log.Info("线扫描", true);
+                        
                         state = 0;
                         ImagePro.EDS_Param_Lines(edsfn, a_FieldImagePositionID, Convert.ToInt32(MParam.SampleTypeNo()), MParam.Firm, out LinesStartPoint, out lines_height, out state);
                         string sp = "";
@@ -1697,17 +1696,17 @@ namespace MeasureThread
                         {
                             sp += "(" + p.X + "," + p.Y + ")";
                         }
-                        log.Info("线返回数据,lines=" + LinesStartPoint.Count.ToString() + " " + sp, true);
+                        log.Info("线返回数据,lines=" + LinesStartPoint.Count.ToString() + " " + sp+"每条线的长度为："+ lines_height[0].ToString(), true);
 
                         if (state == 1)
                         {
                             //将线转换为segment数据
                             log.Info("将线转换为segment数据", true);
-                           
+
                             for (int i = 0; i < LinesStartPoint.Count; i++)
                             {
                                 int wholeHeight = lines_height[i];
-                                int singleHeight = 20;//每5高度形成一个单元
+                                int singleHeight = 3;//每5高度形成一个单元
 
                                 for (int k = 0; k < wholeHeight; k += singleHeight)
                                 {
@@ -1717,8 +1716,8 @@ namespace MeasureThread
                                     {
                                         Segment segment = new Segment();
                                         segment.X = LinesStartPoint[i].X;
-                                        segment.Y = LinesStartPoint[i].Y + j+ k;
-                                        segment.Length = 2;
+                                        segment.Y = LinesStartPoint[i].Y;
+                                        segment.Length = 1;
                                         feature.Add(segment);
                                     }
                                     Features.Add(feature);
@@ -1732,7 +1731,7 @@ namespace MeasureThread
                         }
                         //线采集
 
-
+                        m_nXrayId = 0;
                         iExtender.BeginMultipleAquisition();
                         Thread.Sleep(100);
                         for (int i = 0; i < Features.Count; i++)
@@ -1742,31 +1741,29 @@ namespace MeasureThread
                             listElement = new Dictionary<string, double>();
 
 
-                            if (iExtender.XrayAreaCollectiong(5000, listSeg, out XrayData, out listElement))
+                            //if (iExtender.XrayAreaCollectiong(5000, listSeg, out XrayData, out listElement))
+                            if (iExtender.XrayPointCollecting(300, listSeg[0].X, listSeg[0].Y, out XrayData, out listElement))
                             {
                                 string ele = "";
                                 foreach (var s in listElement)
                                 {
                                     ele += s.ToString();
                                 }
-                                log.Info("采集时间=5000" , true);
-                                log.Info("(" + listSeg[0].X + "," + listSeg[0].Y + ") height=20"  + " 元素：" + ele);
+                                log.Info("采集时间=300", true);
+                                log.Info("(" + listSeg[0].X + "," + listSeg[0].Y + ") height=3" + " 元素：" + ele);
                                 log.Info("线采集结束，写入数据库开始", true);
                                 //写入数据库
                                 m_nXrayId++;
 
                                 AreasNo++;
+                                //m_MeasDB.InsertAPointXray(currHole.HoleNo, m_nXrayId, listSeg[0].X, listSeg[0].Y, XrayData, listElement, a_FieldImagePositionID);
                                 m_MeasDB.InsertAAreaXay(currHole.HoleNo, m_nXrayId, AreasNo, listSeg, XrayData, listElement, a_FieldImagePositionID);
-
-
-
                             }
                             else
                             {
                                 log.Error("线扫xray失败");
                             }
 
-
                         }
                         iExtender.EndMultipleAquisition();
 
@@ -1792,10 +1789,7 @@ namespace MeasureThread
                                     segments.Add(segment);
                                 }
                                 Features.Add(segments);
-
                             }
-                            
-
                         }
                         else
                         {
@@ -1889,7 +1883,7 @@ namespace MeasureThread
 
             float mag = tmag;
            
-            String fileName4 = currHole.data_path + "\\EDS\\" + MParam.Firm + " - " + mag.ToString("0") + "-" + currHole.HoleName + "-" + ImageNameEDS4;
+            String fileName4 = currHole.data_path + "\\EDS\\" + MParam.Firm + "-" + mag.ToString("0") + "-" + currHole.HoleName + "-" + ImageNameEDS4;
             PhotoParam prm = new PhotoParam()
             {