Ver código fonte

修改些配置

cxs 1 ano atrás
pai
commit
76e0ef91d0

+ 2 - 2
Bin/x64/Debug/Resources/XMLData/AppResource_EN.xml

@@ -20,11 +20,11 @@
   <Form>
     <Name>ControllerSettingForm</Name>
     <Controls>
-      <Control name="tabXRay" text="X-RaySettings" />
+      <Control name="tabXRay" text="X-RayTest" />
       <Control name="lblCollectionTime" text="Collection" />
       <Control name="groupBox1" text="ImageDisplay" />
       <Control name="btnDisplayXRay" text="DisplayXRay" />
-      <Control name="tabImage" text="BSESettings" />
+      <Control name="tabImage" text="BSETest" />
       <Control name="groupBox2" text="ImageDisplay" />
       <Control name="btnDisplay" text="ImageAcquisition" />
       <Control name="lblDwellTime" text="Collection" />

+ 2 - 2
Bin/x64/Debug/Resources/XMLData/AppResource_ZH.xml

@@ -20,11 +20,11 @@
 <Form>
    <Name>ControllerSettingForm</Name>
     <Controls>
-      <Control name="tabXRay" text="X-Ray设置" />
+      <Control name="tabXRay" text="X-Ray测试" />
       <Control name="lblCollectionTime" text="采集时间" />
       <Control name="groupBox1" text="图像显示" />
       <Control name="btnDisplayXRay" text="单点采集" />
-      <Control name="tabImage" text="BSE设置" />
+      <Control name="tabImage" text="BSE测试" />
       <Control name="groupBox2" text="图像显示" />
       <Control name="btnDisplay" text="图像采集" />
       <Control name="lblDwellTime" text="采集时间" />

+ 102 - 88
OTSSysMgrApp/ControllerSettingForm.Designer.cs

@@ -75,6 +75,7 @@
             this.pictureBox4 = new System.Windows.Forms.PictureBox();
             this.pictureBox2 = new System.Windows.Forms.PictureBox();
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
+            this.btn_Recommendedconfiguration = new System.Windows.Forms.Button();
             this.tabSetting.SuspendLayout();
             this.tabXRay.SuspendLayout();
             this.groupBox1.SuspendLayout();
@@ -96,15 +97,15 @@
             // 
             // tabSetting
             // 
-            this.tabSetting.Controls.Add(this.tabXRay);
             this.tabSetting.Controls.Add(this.tabImage);
+            this.tabSetting.Controls.Add(this.tabXRay);
             this.tabSetting.Controls.Add(this.tabImage2);
             this.tabSetting.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tabSetting.Location = new System.Drawing.Point(0, 0);
             this.tabSetting.Margin = new System.Windows.Forms.Padding(2);
             this.tabSetting.Name = "tabSetting";
             this.tabSetting.SelectedIndex = 0;
-            this.tabSetting.Size = new System.Drawing.Size(835, 797);
+            this.tabSetting.Size = new System.Drawing.Size(835, 736);
             this.tabSetting.TabIndex = 2;
             // 
             // tabXRay
@@ -124,9 +125,9 @@
             this.tabXRay.Margin = new System.Windows.Forms.Padding(2);
             this.tabXRay.Name = "tabXRay";
             this.tabXRay.Padding = new System.Windows.Forms.Padding(2);
-            this.tabXRay.Size = new System.Drawing.Size(827, 771);
+            this.tabXRay.Size = new System.Drawing.Size(827, 710);
             this.tabXRay.TabIndex = 0;
-            this.tabXRay.Text = "X-Ray设置";
+            this.tabXRay.Text = "X-Ray测试";
             this.tabXRay.UseVisualStyleBackColor = true;
             // 
             // groupBox1
@@ -136,11 +137,11 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.groupBox1.BackColor = System.Drawing.Color.White;
             this.groupBox1.Controls.Add(this.chartXRay);
-            this.groupBox1.Location = new System.Drawing.Point(6, 49);
+            this.groupBox1.Location = new System.Drawing.Point(6, 45);
             this.groupBox1.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox1.Name = "groupBox1";
             this.groupBox1.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox1.Size = new System.Drawing.Size(819, 720);
+            this.groupBox1.Size = new System.Drawing.Size(819, 665);
             this.groupBox1.TabIndex = 16;
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "图像显示";
@@ -151,7 +152,7 @@
             chartArea1.Name = "ChartArea1";
             this.chartXRay.ChartAreas.Add(chartArea1);
             this.chartXRay.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.chartXRay.Location = new System.Drawing.Point(2, 15);
+            this.chartXRay.Location = new System.Drawing.Point(2, 16);
             this.chartXRay.Margin = new System.Windows.Forms.Padding(2);
             this.chartXRay.Name = "chartXRay";
             series1.ChartArea = "ChartArea1";
@@ -164,7 +165,7 @@
             series1.XValueType = System.Windows.Forms.DataVisualization.Charting.ChartValueType.Int64;
             series1.YValueType = System.Windows.Forms.DataVisualization.Charting.ChartValueType.Int64;
             this.chartXRay.Series.Add(series1);
-            this.chartXRay.Size = new System.Drawing.Size(815, 703);
+            this.chartXRay.Size = new System.Drawing.Size(815, 647);
             this.chartXRay.SuppressExceptions = true;
             this.chartXRay.TabIndex = 2;
             this.chartXRay.Text = "chart2";
@@ -172,10 +173,10 @@
             // btnClearData
             // 
             this.btnClearData.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnClearData.Location = new System.Drawing.Point(688, 10);
+            this.btnClearData.Location = new System.Drawing.Point(688, 9);
             this.btnClearData.Margin = new System.Windows.Forms.Padding(2);
             this.btnClearData.Name = "btnClearData";
-            this.btnClearData.Size = new System.Drawing.Size(39, 36);
+            this.btnClearData.Size = new System.Drawing.Size(39, 33);
             this.btnClearData.TabIndex = 5;
             this.btnClearData.Text = "清空";
             this.btnClearData.UseVisualStyleBackColor = true;
@@ -184,10 +185,10 @@
             // btnAreaRay
             // 
             this.btnAreaRay.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnAreaRay.Location = new System.Drawing.Point(458, 10);
+            this.btnAreaRay.Location = new System.Drawing.Point(458, 9);
             this.btnAreaRay.Margin = new System.Windows.Forms.Padding(2);
             this.btnAreaRay.Name = "btnAreaRay";
-            this.btnAreaRay.Size = new System.Drawing.Size(67, 36);
+            this.btnAreaRay.Size = new System.Drawing.Size(67, 33);
             this.btnAreaRay.TabIndex = 4;
             this.btnAreaRay.Text = "面积采集";
             this.btnAreaRay.UseVisualStyleBackColor = true;
@@ -196,10 +197,10 @@
             // btnPointXRay
             // 
             this.btnPointXRay.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnPointXRay.Location = new System.Drawing.Point(617, 10);
+            this.btnPointXRay.Location = new System.Drawing.Point(617, 9);
             this.btnPointXRay.Margin = new System.Windows.Forms.Padding(2);
             this.btnPointXRay.Name = "btnPointXRay";
-            this.btnPointXRay.Size = new System.Drawing.Size(67, 36);
+            this.btnPointXRay.Size = new System.Drawing.Size(67, 33);
             this.btnPointXRay.TabIndex = 3;
             this.btnPointXRay.Text = "多点采集";
             this.btnPointXRay.UseVisualStyleBackColor = true;
@@ -208,10 +209,10 @@
             // btnEanalysis
             // 
             this.btnEanalysis.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnEanalysis.Location = new System.Drawing.Point(756, 10);
+            this.btnEanalysis.Location = new System.Drawing.Point(756, 9);
             this.btnEanalysis.Margin = new System.Windows.Forms.Padding(2);
             this.btnEanalysis.Name = "btnEanalysis";
-            this.btnEanalysis.Size = new System.Drawing.Size(67, 36);
+            this.btnEanalysis.Size = new System.Drawing.Size(67, 33);
             this.btnEanalysis.TabIndex = 6;
             this.btnEanalysis.Text = "元素分析";
             this.btnEanalysis.UseVisualStyleBackColor = true;
@@ -220,10 +221,10 @@
             // btnDisplayXRay
             // 
             this.btnDisplayXRay.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnDisplayXRay.Location = new System.Drawing.Point(538, 10);
+            this.btnDisplayXRay.Location = new System.Drawing.Point(538, 9);
             this.btnDisplayXRay.Margin = new System.Windows.Forms.Padding(2);
             this.btnDisplayXRay.Name = "btnDisplayXRay";
-            this.btnDisplayXRay.Size = new System.Drawing.Size(76, 36);
+            this.btnDisplayXRay.Size = new System.Drawing.Size(76, 33);
             this.btnDisplayXRay.TabIndex = 2;
             this.btnDisplayXRay.Text = "默认点采集";
             this.btnDisplayXRay.UseVisualStyleBackColor = true;
@@ -232,20 +233,20 @@
             // lbXrayCount
             // 
             this.lbXrayCount.AutoSize = true;
-            this.lbXrayCount.Location = new System.Drawing.Point(260, 21);
+            this.lbXrayCount.Location = new System.Drawing.Point(260, 19);
             this.lbXrayCount.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.lbXrayCount.Name = "lbXrayCount";
-            this.lbXrayCount.Size = new System.Drawing.Size(58, 13);
+            this.lbXrayCount.Size = new System.Drawing.Size(59, 12);
             this.lbXrayCount.TabIndex = 13;
             this.lbXrayCount.Text = "DropCount";
             // 
             // btnCollectionTime
             // 
             this.btnCollectionTime.Enabled = false;
-            this.btnCollectionTime.Location = new System.Drawing.Point(167, 16);
+            this.btnCollectionTime.Location = new System.Drawing.Point(167, 15);
             this.btnCollectionTime.Margin = new System.Windows.Forms.Padding(2);
             this.btnCollectionTime.Name = "btnCollectionTime";
-            this.btnCollectionTime.Size = new System.Drawing.Size(40, 23);
+            this.btnCollectionTime.Size = new System.Drawing.Size(40, 21);
             this.btnCollectionTime.TabIndex = 8;
             this.btnCollectionTime.Text = "Test";
             this.btnCollectionTime.UseVisualStyleBackColor = true;
@@ -254,30 +255,30 @@
             // 
             // tbCollectionTime
             // 
-            this.tbCollectionTime.Location = new System.Drawing.Point(76, 17);
+            this.tbCollectionTime.Location = new System.Drawing.Point(76, 16);
             this.tbCollectionTime.Margin = new System.Windows.Forms.Padding(2);
             this.tbCollectionTime.Name = "tbCollectionTime";
-            this.tbCollectionTime.Size = new System.Drawing.Size(63, 20);
+            this.tbCollectionTime.Size = new System.Drawing.Size(63, 21);
             this.tbCollectionTime.TabIndex = 1;
             this.tbCollectionTime.Text = "120";
             // 
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(143, 21);
+            this.label2.Location = new System.Drawing.Point(143, 19);
             this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(20, 13);
+            this.label2.Size = new System.Drawing.Size(17, 12);
             this.label2.TabIndex = 0;
             this.label2.Text = "ms";
             // 
             // lblCollectionTime
             // 
             this.lblCollectionTime.AutoSize = true;
-            this.lblCollectionTime.Location = new System.Drawing.Point(1, 21);
+            this.lblCollectionTime.Location = new System.Drawing.Point(1, 19);
             this.lblCollectionTime.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.lblCollectionTime.Name = "lblCollectionTime";
-            this.lblCollectionTime.Size = new System.Drawing.Size(55, 13);
+            this.lblCollectionTime.Size = new System.Drawing.Size(53, 12);
             this.lblCollectionTime.TabIndex = 0;
             this.lblCollectionTime.Text = "采集时间";
             // 
@@ -295,9 +296,9 @@
             this.tabImage.Margin = new System.Windows.Forms.Padding(2);
             this.tabImage.Name = "tabImage";
             this.tabImage.Padding = new System.Windows.Forms.Padding(2);
-            this.tabImage.Size = new System.Drawing.Size(827, 771);
+            this.tabImage.Size = new System.Drawing.Size(827, 710);
             this.tabImage.TabIndex = 1;
-            this.tabImage.Text = "BSE设置";
+            this.tabImage.Text = "BSE测试";
             this.tabImage.UseVisualStyleBackColor = true;
             // 
             // ddlDwellTime
@@ -312,10 +313,10 @@
             "64",
             "128",
             "256"});
-            this.ddlDwellTime.Location = new System.Drawing.Point(266, 17);
+            this.ddlDwellTime.Location = new System.Drawing.Point(266, 16);
             this.ddlDwellTime.Margin = new System.Windows.Forms.Padding(2);
             this.ddlDwellTime.Name = "ddlDwellTime";
-            this.ddlDwellTime.Size = new System.Drawing.Size(82, 21);
+            this.ddlDwellTime.Size = new System.Drawing.Size(82, 20);
             this.ddlDwellTime.TabIndex = 3;
             // 
             // groupBox2
@@ -326,11 +327,11 @@
             this.groupBox2.BackColor = System.Drawing.Color.White;
             this.groupBox2.Controls.Add(this.panel1);
             this.groupBox2.Controls.Add(this.btnClear);
-            this.groupBox2.Location = new System.Drawing.Point(6, 49);
+            this.groupBox2.Location = new System.Drawing.Point(6, 45);
             this.groupBox2.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox2.Name = "groupBox2";
             this.groupBox2.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox2.Size = new System.Drawing.Size(822, 720);
+            this.groupBox2.Size = new System.Drawing.Size(822, 665);
             this.groupBox2.TabIndex = 13;
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "图像显示";
@@ -340,10 +341,10 @@
             this.panel1.AutoScroll = true;
             this.panel1.Controls.Add(this.pbImage);
             this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panel1.Location = new System.Drawing.Point(2, 15);
+            this.panel1.Location = new System.Drawing.Point(2, 16);
             this.panel1.Margin = new System.Windows.Forms.Padding(2);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(818, 703);
+            this.panel1.Size = new System.Drawing.Size(818, 647);
             this.panel1.TabIndex = 2;
             // 
             // pbImage
@@ -353,7 +354,7 @@
             this.pbImage.Location = new System.Drawing.Point(0, 0);
             this.pbImage.Margin = new System.Windows.Forms.Padding(2);
             this.pbImage.Name = "pbImage";
-            this.pbImage.Size = new System.Drawing.Size(818, 703);
+            this.pbImage.Size = new System.Drawing.Size(818, 647);
             this.pbImage.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
             this.pbImage.TabIndex = 0;
             this.pbImage.TabStop = false;
@@ -361,10 +362,10 @@
             // btnClear
             // 
             this.btnClear.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnClear.Location = new System.Drawing.Point(750, 83);
+            this.btnClear.Location = new System.Drawing.Point(750, 77);
             this.btnClear.Margin = new System.Windows.Forms.Padding(2);
             this.btnClear.Name = "btnClear";
-            this.btnClear.Size = new System.Drawing.Size(67, 54);
+            this.btnClear.Size = new System.Drawing.Size(67, 50);
             this.btnClear.TabIndex = 1;
             this.btnClear.Text = "Clear";
             this.btnClear.UseVisualStyleBackColor = true;
@@ -374,10 +375,10 @@
             // btnSaveImage
             // 
             this.btnSaveImage.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnSaveImage.Location = new System.Drawing.Point(550, 9);
+            this.btnSaveImage.Location = new System.Drawing.Point(550, 8);
             this.btnSaveImage.Margin = new System.Windows.Forms.Padding(2);
             this.btnSaveImage.Name = "btnSaveImage";
-            this.btnSaveImage.Size = new System.Drawing.Size(67, 36);
+            this.btnSaveImage.Size = new System.Drawing.Size(67, 33);
             this.btnSaveImage.TabIndex = 4;
             this.btnSaveImage.Text = "保存图片";
             this.btnSaveImage.UseVisualStyleBackColor = true;
@@ -387,10 +388,10 @@
             // btnDisplay
             // 
             this.btnDisplay.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnDisplay.Location = new System.Drawing.Point(756, 9);
+            this.btnDisplay.Location = new System.Drawing.Point(756, 8);
             this.btnDisplay.Margin = new System.Windows.Forms.Padding(2);
             this.btnDisplay.Name = "btnDisplay";
-            this.btnDisplay.Size = new System.Drawing.Size(67, 36);
+            this.btnDisplay.Size = new System.Drawing.Size(67, 33);
             this.btnDisplay.TabIndex = 5;
             this.btnDisplay.Text = "图像采集";
             this.btnDisplay.UseVisualStyleBackColor = true;
@@ -398,39 +399,39 @@
             // 
             // tbRHeight
             // 
-            this.tbRHeight.Location = new System.Drawing.Point(119, 16);
+            this.tbRHeight.Location = new System.Drawing.Point(119, 15);
             this.tbRHeight.Margin = new System.Windows.Forms.Padding(2);
             this.tbRHeight.Name = "tbRHeight";
-            this.tbRHeight.Size = new System.Drawing.Size(48, 20);
+            this.tbRHeight.Size = new System.Drawing.Size(48, 21);
             this.tbRHeight.TabIndex = 2;
             this.tbRHeight.Text = "768";
             // 
             // tbRWidth
             // 
-            this.tbRWidth.Location = new System.Drawing.Point(66, 16);
+            this.tbRWidth.Location = new System.Drawing.Point(66, 15);
             this.tbRWidth.Margin = new System.Windows.Forms.Padding(2);
             this.tbRWidth.Name = "tbRWidth";
-            this.tbRWidth.Size = new System.Drawing.Size(48, 20);
+            this.tbRWidth.Size = new System.Drawing.Size(48, 21);
             this.tbRWidth.TabIndex = 1;
             this.tbRWidth.Text = "1024";
             // 
             // lblDwellTime
             // 
             this.lblDwellTime.AutoSize = true;
-            this.lblDwellTime.Location = new System.Drawing.Point(189, 21);
+            this.lblDwellTime.Location = new System.Drawing.Point(189, 19);
             this.lblDwellTime.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.lblDwellTime.Name = "lblDwellTime";
-            this.lblDwellTime.Size = new System.Drawing.Size(55, 13);
+            this.lblDwellTime.Size = new System.Drawing.Size(53, 12);
             this.lblDwellTime.TabIndex = 10;
             this.lblDwellTime.Text = "采集时间";
             // 
             // lblResolution
             // 
             this.lblResolution.AutoSize = true;
-            this.lblResolution.Location = new System.Drawing.Point(-3, 21);
+            this.lblResolution.Location = new System.Drawing.Point(-3, 19);
             this.lblResolution.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.lblResolution.Name = "lblResolution";
-            this.lblResolution.Size = new System.Drawing.Size(43, 13);
+            this.lblResolution.Size = new System.Drawing.Size(41, 12);
             this.lblResolution.TabIndex = 10;
             this.lblResolution.Text = "分辨率";
             // 
@@ -440,19 +441,20 @@
             this.tabImage2.Location = new System.Drawing.Point(4, 22);
             this.tabImage2.Name = "tabImage2";
             this.tabImage2.Padding = new System.Windows.Forms.Padding(3);
-            this.tabImage2.Size = new System.Drawing.Size(827, 771);
+            this.tabImage2.Size = new System.Drawing.Size(827, 710);
             this.tabImage2.TabIndex = 2;
             this.tabImage2.Text = "轴方向测试";
             this.tabImage2.UseVisualStyleBackColor = true;
             // 
             // splitContainer1
             // 
-            this.splitContainer1.Location = new System.Drawing.Point(7, 9);
+            this.splitContainer1.Location = new System.Drawing.Point(7, 8);
             this.splitContainer1.Name = "splitContainer1";
             this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
             // 
             // splitContainer1.Panel1
             // 
+            this.splitContainer1.Panel1.Controls.Add(this.btn_Recommendedconfiguration);
             this.splitContainer1.Panel1.Controls.Add(this.label5);
             this.splitContainer1.Panel1.Controls.Add(this.cb_imageresolution);
             this.splitContainer1.Panel1.Controls.Add(this.label4);
@@ -472,68 +474,68 @@
             this.splitContainer1.Panel2.Controls.Add(this.pictureBox4);
             this.splitContainer1.Panel2.Controls.Add(this.pictureBox2);
             this.splitContainer1.Panel2.Controls.Add(this.pictureBox1);
-            this.splitContainer1.Size = new System.Drawing.Size(813, 753);
-            this.splitContainer1.SplitterDistance = 89;
+            this.splitContainer1.Size = new System.Drawing.Size(813, 695);
+            this.splitContainer1.SplitterDistance = 82;
             this.splitContainer1.TabIndex = 3;
             // 
             // label5
             // 
             this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(512, 57);
+            this.label5.Location = new System.Drawing.Point(512, 53);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(127, 13);
+            this.label5.Size = new System.Drawing.Size(131, 12);
             this.label5.TabIndex = 15;
             this.label5.Text = "请在 100 放大倍数调试";
             // 
             // cb_imageresolution
             // 
             this.cb_imageresolution.FormattingEnabled = true;
-            this.cb_imageresolution.Location = new System.Drawing.Point(66, 49);
+            this.cb_imageresolution.Location = new System.Drawing.Point(66, 45);
             this.cb_imageresolution.Name = "cb_imageresolution";
-            this.cb_imageresolution.Size = new System.Drawing.Size(121, 21);
+            this.cb_imageresolution.Size = new System.Drawing.Size(121, 20);
             this.cb_imageresolution.TabIndex = 14;
             // 
             // label4
             // 
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(7, 52);
+            this.label4.Location = new System.Drawing.Point(7, 48);
             this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(46, 13);
+            this.label4.Size = new System.Drawing.Size(47, 12);
             this.label4.TabIndex = 13;
             this.label4.Text = "分辨率:";
             // 
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(597, 12);
+            this.label3.Location = new System.Drawing.Point(597, 11);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(31, 13);
+            this.label3.Size = new System.Drawing.Size(29, 12);
             this.label3.TabIndex = 8;
             this.label3.Text = "微米";
             // 
             // tB_scanFieldSize100
             // 
-            this.tB_scanFieldSize100.Location = new System.Drawing.Point(491, 8);
+            this.tB_scanFieldSize100.Location = new System.Drawing.Point(491, 7);
             this.tB_scanFieldSize100.Name = "tB_scanFieldSize100";
-            this.tB_scanFieldSize100.Size = new System.Drawing.Size(100, 20);
+            this.tB_scanFieldSize100.Size = new System.Drawing.Size(100, 21);
             this.tB_scanFieldSize100.TabIndex = 7;
             this.tB_scanFieldSize100.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(391, 12);
+            this.label1.Location = new System.Drawing.Point(391, 11);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(103, 13);
+            this.label1.Size = new System.Drawing.Size(107, 12);
             this.label1.TabIndex = 6;
             this.label1.Text = "100倍下屏幕宽度:";
             // 
             // btn_confirm
             // 
-            this.btn_confirm.Location = new System.Drawing.Point(730, 12);
+            this.btn_confirm.Location = new System.Drawing.Point(730, 11);
             this.btn_confirm.Name = "btn_confirm";
-            this.btn_confirm.Size = new System.Drawing.Size(75, 65);
+            this.btn_confirm.Size = new System.Drawing.Size(75, 60);
             this.btn_confirm.TabIndex = 5;
             this.btn_confirm.Text = "保存";
             this.btn_confirm.UseVisualStyleBackColor = true;
@@ -543,17 +545,17 @@
             // 
             this.cb_Ydirection.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cb_Ydirection.FormattingEnabled = true;
-            this.cb_Ydirection.Location = new System.Drawing.Point(259, 8);
+            this.cb_Ydirection.Location = new System.Drawing.Point(259, 7);
             this.cb_Ydirection.Name = "cb_Ydirection";
-            this.cb_Ydirection.Size = new System.Drawing.Size(119, 21);
+            this.cb_Ydirection.Size = new System.Drawing.Size(119, 20);
             this.cb_Ydirection.TabIndex = 4;
             // 
             // label_y
             // 
             this.label_y.AutoSize = true;
-            this.label_y.Location = new System.Drawing.Point(193, 12);
+            this.label_y.Location = new System.Drawing.Point(193, 11);
             this.label_y.Name = "label_y";
-            this.label_y.Size = new System.Drawing.Size(66, 13);
+            this.label_y.Size = new System.Drawing.Size(71, 12);
             this.label_y.TabIndex = 3;
             this.label_y.Text = "y轴正方向:";
             // 
@@ -561,25 +563,25 @@
             // 
             this.cb_Xdirection.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cb_Xdirection.FormattingEnabled = true;
-            this.cb_Xdirection.Location = new System.Drawing.Point(68, 9);
+            this.cb_Xdirection.Location = new System.Drawing.Point(68, 8);
             this.cb_Xdirection.Name = "cb_Xdirection";
-            this.cb_Xdirection.Size = new System.Drawing.Size(119, 21);
+            this.cb_Xdirection.Size = new System.Drawing.Size(119, 20);
             this.cb_Xdirection.TabIndex = 2;
             // 
             // label_x
             // 
             this.label_x.AutoSize = true;
-            this.label_x.Location = new System.Drawing.Point(3, 12);
+            this.label_x.Location = new System.Drawing.Point(3, 11);
             this.label_x.Name = "label_x";
-            this.label_x.Size = new System.Drawing.Size(66, 13);
+            this.label_x.Size = new System.Drawing.Size(71, 12);
             this.label_x.TabIndex = 1;
             this.label_x.Text = "x轴正方向:";
             // 
             // btn_continuousshot
             // 
-            this.btn_continuousshot.Location = new System.Drawing.Point(649, 12);
+            this.btn_continuousshot.Location = new System.Drawing.Point(649, 11);
             this.btn_continuousshot.Name = "btn_continuousshot";
-            this.btn_continuousshot.Size = new System.Drawing.Size(75, 66);
+            this.btn_continuousshot.Size = new System.Drawing.Size(75, 61);
             this.btn_continuousshot.TabIndex = 0;
             this.btn_continuousshot.Text = "轴方向验证";
             this.btn_continuousshot.UseVisualStyleBackColor = true;
@@ -589,10 +591,10 @@
             // 
             this.pictureBox3.BackColor = System.Drawing.Color.White;
             this.pictureBox3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.pictureBox3.Location = new System.Drawing.Point(405, 330);
+            this.pictureBox3.Location = new System.Drawing.Point(405, 305);
             this.pictureBox3.Margin = new System.Windows.Forms.Padding(2);
             this.pictureBox3.Name = "pictureBox3";
-            this.pictureBox3.Size = new System.Drawing.Size(400, 325);
+            this.pictureBox3.Size = new System.Drawing.Size(400, 300);
             this.pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
             this.pictureBox3.TabIndex = 4;
             this.pictureBox3.TabStop = false;
@@ -601,10 +603,10 @@
             // 
             this.pictureBox4.BackColor = System.Drawing.Color.White;
             this.pictureBox4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.pictureBox4.Location = new System.Drawing.Point(5, 330);
+            this.pictureBox4.Location = new System.Drawing.Point(5, 305);
             this.pictureBox4.Margin = new System.Windows.Forms.Padding(2);
             this.pictureBox4.Name = "pictureBox4";
-            this.pictureBox4.Size = new System.Drawing.Size(400, 325);
+            this.pictureBox4.Size = new System.Drawing.Size(400, 300);
             this.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
             this.pictureBox4.TabIndex = 3;
             this.pictureBox4.TabStop = false;
@@ -616,7 +618,7 @@
             this.pictureBox2.Location = new System.Drawing.Point(405, 5);
             this.pictureBox2.Margin = new System.Windows.Forms.Padding(2);
             this.pictureBox2.Name = "pictureBox2";
-            this.pictureBox2.Size = new System.Drawing.Size(400, 325);
+            this.pictureBox2.Size = new System.Drawing.Size(400, 300);
             this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
             this.pictureBox2.TabIndex = 2;
             this.pictureBox2.TabStop = false;
@@ -628,21 +630,32 @@
             this.pictureBox1.Location = new System.Drawing.Point(5, 5);
             this.pictureBox1.Margin = new System.Windows.Forms.Padding(2);
             this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(400, 325);
+            this.pictureBox1.Size = new System.Drawing.Size(400, 300);
             this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
             this.pictureBox1.TabIndex = 1;
             this.pictureBox1.TabStop = false;
             // 
+            // btn_Recommendedconfiguration
+            // 
+            this.btn_Recommendedconfiguration.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btn_Recommendedconfiguration.Location = new System.Drawing.Point(259, 41);
+            this.btn_Recommendedconfiguration.Name = "btn_Recommendedconfiguration";
+            this.btn_Recommendedconfiguration.Size = new System.Drawing.Size(75, 23);
+            this.btn_Recommendedconfiguration.TabIndex = 16;
+            this.btn_Recommendedconfiguration.Text = "推荐配置";
+            this.btn_Recommendedconfiguration.UseVisualStyleBackColor = true;
+            this.btn_Recommendedconfiguration.Click += new System.EventHandler(this.btn_Recommendedconfiguration_Click);
+            // 
             // ControllerSettingForm
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.White;
-            this.ClientSize = new System.Drawing.Size(835, 797);
+            this.ClientSize = new System.Drawing.Size(835, 736);
             this.Controls.Add(this.tabSetting);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Margin = new System.Windows.Forms.Padding(2);
-            this.MinimumSize = new System.Drawing.Size(639, 433);
+            this.MinimumSize = new System.Drawing.Size(639, 403);
             this.Name = "ControllerSettingForm";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "BSEAndXrayTest";
@@ -717,5 +730,6 @@
         private System.Windows.Forms.PictureBox pictureBox4;
         private System.Windows.Forms.PictureBox pictureBox2;
         private System.Windows.Forms.PictureBox pictureBox1;
+        private System.Windows.Forms.Button btn_Recommendedconfiguration;
     }
 }

+ 15 - 0
OTSSysMgrApp/ControllerSettingForm.cs

@@ -16,6 +16,7 @@ namespace OTSSysMgrApp
     public partial class ControllerSettingForm : Form
     {
         #region 全部变量声明
+        RecommendedConfiguration recommendedConfiguration;
         //连接状态
         bool ConnectionState = false;
 
@@ -1405,5 +1406,19 @@ namespace OTSSysMgrApp
                 MessageBox.Show("Please check params!");
             }
         }
+
+        private void btn_Recommendedconfiguration_Click(object sender, EventArgs e)
+        {
+            if (recommendedConfiguration == null || recommendedConfiguration.IsDisposed)
+            {
+                recommendedConfiguration = new RecommendedConfiguration();
+
+                recommendedConfiguration.Show();
+            }
+            else
+            {
+                recommendedConfiguration.Activate();
+            }
+        }
     }
 }

+ 9 - 0
OTSSysMgrApp/OTSSysMgrApp.csproj

@@ -217,6 +217,12 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
+    <Compile Include="RecommendedConfiguration.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="RecommendedConfiguration.Designer.cs">
+      <DependentUpon>RecommendedConfiguration.cs</DependentUpon>
+    </Compile>
     <Compile Include="SemTestForms.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -244,6 +250,9 @@
       <SubType>Designer</SubType>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <EmbeddedResource Include="RecommendedConfiguration.resx">
+      <DependentUpon>RecommendedConfiguration.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="SemTestForms.resx">
       <DependentUpon>SemTestForms.cs</DependentUpon>
     </EmbeddedResource>

+ 6 - 2
OTSSysMgrApp/OTSSystemManagerForms.cs

@@ -365,7 +365,12 @@ namespace OTSSysMgrApp
 
         private void CopyConfigBySysType()
         {
-             string sourceFilepath= Application.StartupPath + @"\Config\ConfigTemplate";
+            DialogResult dialogResult= MessageBox.Show("操作有风险,将会采用默认系统配置初始化当前所有配置文件,是否继续?", "删除提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);
+            if(dialogResult==DialogResult.Cancel)
+            {
+                return;
+            }
+            string sourceFilepath= Application.StartupPath + @"\Config\ConfigTemplate";
 
             if (radioButton_IncA.Checked)
             {
@@ -402,7 +407,6 @@ namespace OTSSysMgrApp
                 }
                 fileInfo.CopyTo(tagretFile +"\\"+ fileInfo.Name, true);
             }
-            MessageBox.Show("设定 成功!","提醒");
         }
 
         private void GetSEMAndEDSController()