轴方向验证 界面完善

Bin/x64/Debug/Config/ProData/HardwareConfig.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XMLData PathName="HardwareConfig.xml" ID="1">
-  <Member RegName="SemControllerName" Value="FEI" ImageInputSources="SE" />
-  <Member RegName="EDSName" Value="FEI" />
+  <Member RegName="SemControllerName" Value="OffLine" ImageInputSources="SE" />
+  <Member RegName="EDSName" Value="OffLine" />
   <Member RegName="BrukerDllVersion" Version="Bruker.API.Esprit64.dll" />
   <Member RegName="FEIIP" Value="192.168.0.1" />
   <Member RegName="FEIPORT" Value="7520" />

OTSSysMgrApp/ControllerSettingForm.Designer.cs

@@ -59,9 +59,6 @@
             this.lblResolution = new System.Windows.Forms.Label();
             this.tabImage2 = new System.Windows.Forms.TabPage();
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();
-            this.label5 = new System.Windows.Forms.Label();
-            this.Pic_height = new System.Windows.Forms.TextBox();
-            this.Pic_width = new System.Windows.Forms.TextBox();
             this.label4 = new System.Windows.Forms.Label();
             this.label3 = new System.Windows.Forms.Label();
             this.tB_scanFieldSize100 = new System.Windows.Forms.TextBox();
@@ -71,11 +68,12 @@
             this.label_y = new System.Windows.Forms.Label();
             this.cb_Xdirection = new System.Windows.Forms.ComboBox();
             this.label_x = new System.Windows.Forms.Label();
-            this.bn_continuousshot = new System.Windows.Forms.Button();
+            this.btn_continuousshot = new System.Windows.Forms.Button();
             this.pictureBox3 = new System.Windows.Forms.PictureBox();
             this.pictureBox4 = new System.Windows.Forms.PictureBox();
             this.pictureBox2 = new System.Windows.Forms.PictureBox();
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
+            this.cb_imageresolution = new System.Windows.Forms.ComboBox();
             this.tabSetting.SuspendLayout();
             this.tabXRay.SuspendLayout();
             this.groupBox1.SuspendLayout();
@@ -105,7 +103,7 @@
             this.tabSetting.Margin = new System.Windows.Forms.Padding(2);
             this.tabSetting.Name = "tabSetting";
             this.tabSetting.SelectedIndex = 0;
-            this.tabSetting.Size = new System.Drawing.Size(833, 792);
+            this.tabSetting.Size = new System.Drawing.Size(833, 731);
             this.tabSetting.TabIndex = 2;
             // 
             // tabXRay
@@ -125,7 +123,7 @@
             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(825, 766);
+            this.tabXRay.Size = new System.Drawing.Size(825, 705);
             this.tabXRay.TabIndex = 0;
             this.tabXRay.Text = "X-Ray设置";
             this.tabXRay.UseVisualStyleBackColor = true;
@@ -137,11 +135,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, 62);
+            this.groupBox1.Location = new System.Drawing.Point(6, 57);
             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(812, 646);
+            this.groupBox1.Size = new System.Drawing.Size(812, 596);
             this.groupBox1.TabIndex = 16;
             this.groupBox1.TabStop = false;
             this.groupBox1.Text = "图像显示";
@@ -152,7 +150,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";
@@ -165,7 +163,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(808, 629);
+            this.chartXRay.Size = new System.Drawing.Size(808, 578);
             this.chartXRay.SuppressExceptions = true;
             this.chartXRay.TabIndex = 2;
             this.chartXRay.Text = "chart2";
@@ -173,10 +171,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(689, 10);
+            this.btnClearData.Location = new System.Drawing.Point(689, 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;
@@ -185,10 +183,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(477, 10);
+            this.btnAreaRay.Location = new System.Drawing.Point(477, 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;
@@ -197,10 +195,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(618, 10);
+            this.btnPointXRay.Location = new System.Drawing.Point(618, 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;
@@ -209,10 +207,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(757, 10);
+            this.btnEanalysis.Location = new System.Drawing.Point(757, 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;
@@ -221,10 +219,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(548, 10);
+            this.btnDisplayXRay.Location = new System.Drawing.Point(548, 9);
             this.btnDisplayXRay.Margin = new System.Windows.Forms.Padding(2);
             this.btnDisplayXRay.Name = "btnDisplayXRay";
-            this.btnDisplayXRay.Size = new System.Drawing.Size(67, 36);
+            this.btnDisplayXRay.Size = new System.Drawing.Size(67, 33);
             this.btnDisplayXRay.TabIndex = 2;
             this.btnDisplayXRay.Text = "单点采集";
             this.btnDisplayXRay.UseVisualStyleBackColor = true;
@@ -233,20 +231,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;
@@ -255,30 +253,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 = "采集时间";
             // 
@@ -296,7 +294,7 @@
             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(825, 766);
+            this.tabImage.Size = new System.Drawing.Size(825, 705);
             this.tabImage.TabIndex = 1;
             this.tabImage.Text = "BSE设置";
             this.tabImage.UseVisualStyleBackColor = true;
@@ -313,10 +311,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
@@ -327,11 +325,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(815, 662);
+            this.groupBox2.Size = new System.Drawing.Size(815, 611);
             this.groupBox2.TabIndex = 13;
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "图像显示";
@@ -341,10 +339,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(811, 645);
+            this.panel1.Size = new System.Drawing.Size(811, 593);
             this.panel1.TabIndex = 2;
             // 
             // pbImage
@@ -354,7 +352,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(811, 645);
+            this.pbImage.Size = new System.Drawing.Size(811, 593);
             this.pbImage.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
             this.pbImage.TabIndex = 0;
             this.pbImage.TabStop = false;
@@ -362,10 +360,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(743, 83);
+            this.btnClear.Location = new System.Drawing.Point(743, 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;
@@ -375,10 +373,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(551, 9);
+            this.btnSaveImage.Location = new System.Drawing.Point(551, 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;
@@ -388,10 +386,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(757, 9);
+            this.btnDisplay.Location = new System.Drawing.Point(757, 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;
@@ -399,39 +397,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 = "分辨率";
             // 
@@ -441,22 +439,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(825, 766);
+            this.tabImage2.Size = new System.Drawing.Size(825, 705);
             this.tabImage2.TabIndex = 2;
             this.tabImage2.Text = "BSE设置2";
             this.tabImage2.UseVisualStyleBackColor = true;
             // 
             // splitContainer1
             // 
-            this.splitContainer1.Location = new System.Drawing.Point(7, 8);
+            this.splitContainer1.Location = new System.Drawing.Point(7, 7);
             this.splitContainer1.Name = "splitContainer1";
             this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal;
             // 
             // splitContainer1.Panel1
             // 
-            this.splitContainer1.Panel1.Controls.Add(this.label5);
-            this.splitContainer1.Panel1.Controls.Add(this.Pic_height);
-            this.splitContainer1.Panel1.Controls.Add(this.Pic_width);
+            this.splitContainer1.Panel1.Controls.Add(this.cb_imageresolution);
             this.splitContainer1.Panel1.Controls.Add(this.label4);
             this.splitContainer1.Panel1.Controls.Add(this.label3);
             this.splitContainer1.Panel1.Controls.Add(this.tB_scanFieldSize100);
@@ -466,7 +462,7 @@
             this.splitContainer1.Panel1.Controls.Add(this.label_y);
             this.splitContainer1.Panel1.Controls.Add(this.cb_Xdirection);
             this.splitContainer1.Panel1.Controls.Add(this.label_x);
-            this.splitContainer1.Panel1.Controls.Add(this.bn_continuousshot);
+            this.splitContainer1.Panel1.Controls.Add(this.btn_continuousshot);
             // 
             // splitContainer1.Panel2
             // 
@@ -474,137 +470,110 @@
             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 = 92;
+            this.splitContainer1.Size = new System.Drawing.Size(813, 695);
+            this.splitContainer1.SplitterDistance = 84;
             this.splitContainer1.TabIndex = 2;
             // 
-            // label5
-            // 
-            this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(121, 52);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(11, 13);
-            this.label5.TabIndex = 14;
-            this.label5.Text = "*";
-            // 
-            // Pic_height
-            // 
-            this.Pic_height.Location = new System.Drawing.Point(137, 48);
-            this.Pic_height.Margin = new System.Windows.Forms.Padding(2);
-            this.Pic_height.Name = "Pic_height";
-            this.Pic_height.Size = new System.Drawing.Size(48, 20);
-            this.Pic_height.TabIndex = 12;
-            this.Pic_height.Text = "1024";
-            this.Pic_height.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            // 
-            // Pic_width
-            // 
-            this.Pic_width.Location = new System.Drawing.Point(68, 48);
-            this.Pic_width.Margin = new System.Windows.Forms.Padding(2);
-            this.Pic_width.Name = "Pic_width";
-            this.Pic_width.Size = new System.Drawing.Size(48, 20);
-            this.Pic_width.TabIndex = 11;
-            this.Pic_width.Text = "1536";
-            this.Pic_width.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
-            // 
             // 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(533, 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 = "毫米";
+            this.label3.Text = "微米";
             // 
             // tB_scanFieldSize100
             // 
-            this.tB_scanFieldSize100.Location = new System.Drawing.Point(427, 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(327, 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.Text = "保存";
             this.btn_confirm.UseVisualStyleBackColor = true;
             this.btn_confirm.Click += new System.EventHandler(this.btn_confirm_Click);
             // 
             // cb_Ydirection
             // 
+            this.cb_Ydirection.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cb_Ydirection.FormattingEnabled = true;
-            this.cb_Ydirection.Location = new System.Drawing.Point(235, 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(86, 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(169, 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轴正方向：";
             // 
             // cb_Xdirection
             // 
+            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(86, 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轴正方向：";
             // 
-            // bn_continuousshot
+            // btn_continuousshot
             // 
-            this.bn_continuousshot.Location = new System.Drawing.Point(649, 12);
-            this.bn_continuousshot.Name = "bn_continuousshot";
-            this.bn_continuousshot.Size = new System.Drawing.Size(75, 66);
-            this.bn_continuousshot.TabIndex = 0;
-            this.bn_continuousshot.Text = "连拍";
-            this.bn_continuousshot.UseVisualStyleBackColor = true;
-            this.bn_continuousshot.Click += new System.EventHandler(this.bn_continuousshot_Click);
+            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, 61);
+            this.btn_continuousshot.TabIndex = 0;
+            this.btn_continuousshot.Text = "轴方向验证";
+            this.btn_continuousshot.UseVisualStyleBackColor = true;
+            this.btn_continuousshot.Click += new System.EventHandler(this.bn_continuousshot_Click);
             // 
             // pictureBox3
             // 
             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;
@@ -613,10 +582,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;
@@ -628,7 +597,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;
@@ -640,21 +609,29 @@
             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;
             // 
+            // cb_imageresolution
+            // 
+            this.cb_imageresolution.FormattingEnabled = true;
+            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, 20);
+            this.cb_imageresolution.TabIndex = 14;
+            // 
             // 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(833, 792);
+            this.ClientSize = new System.Drawing.Size(833, 731);
             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";
@@ -716,7 +693,7 @@
         private System.Windows.Forms.SplitContainer splitContainer1;
         private System.Windows.Forms.ComboBox cb_Xdirection;
         private System.Windows.Forms.Label label_x;
-        private System.Windows.Forms.Button bn_continuousshot;
+        private System.Windows.Forms.Button btn_continuousshot;
         private System.Windows.Forms.PictureBox pictureBox3;
         private System.Windows.Forms.PictureBox pictureBox4;
         private System.Windows.Forms.PictureBox pictureBox2;
@@ -726,9 +703,7 @@
         private System.Windows.Forms.Label label3;
         private System.Windows.Forms.TextBox tB_scanFieldSize100;
         private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.Label label5;
-        private System.Windows.Forms.TextBox Pic_height;
-        private System.Windows.Forms.TextBox Pic_width;
         private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.ComboBox cb_imageresolution;
     }
 }

OTSSysMgrApp/ControllerSettingForm.cs

@@ -156,8 +156,12 @@ namespace OTSSysMgrApp
             cb_Ydirection.Items.Add("UP_TOWARD");
             cb_Ydirection.Items.Add("DOWN_TOWARD");
             tB_scanFieldSize100.Text = "1270";
+            cb_imageresolution.Items.Add("1024*768");
+            cb_imageresolution.Items.Add("1024*704");
+            cb_imageresolution.Items.Add("1536*1024");
             cb_Xdirection.SelectedIndex = 0;
             cb_Ydirection.SelectedIndex = 0;
+            cb_imageresolution.SelectedIndex = 0;
         }
 
         Thread ScanThread = null;
@@ -1158,8 +1162,8 @@ namespace OTSSysMgrApp
             pictureBox3.Image = null;
             pictureBox4.Image = null;
 
-
-            bn_continuousshot.Enabled = false;
+            btn_continuousshot.Enabled = false;
+            btn_confirm.Enabled = false;
             this.Refresh();
 
             ISemController m_Sem= SemController.GetSEMController();
@@ -1185,21 +1189,29 @@ namespace OTSSysMgrApp
             double PositionR = 0;
             m_Sem.GetSemPositionXY(ref PositionX, ref PositionY, ref PositionR);
 
+            int width = 1024;
+            int height = 768;
             //设置图像分辨率
-            int width = Convert.ToInt32(Pic_width.Text);
-            int height = Convert.ToInt32(Pic_height.Text);
-
-            //pictureBox1.Width = width;
-            pictureBox1.Height = pictureBox1.Width* height/ width;
-            //pictureBox2.Width = width;
-            pictureBox2.Height = pictureBox1.Width * height / width;
-            //pictureBox3.Width = width;
-            pictureBox3.Height = pictureBox1.Width * height / width;
-            //pictureBox4.Width = width;
-            pictureBox4.Height = pictureBox1.Width * height / width;
-            pictureBox2.Location = new Point(pictureBox1.Location.X + pictureBox1.Width, pictureBox1.Location.Y);
-            pictureBox3.Location = new Point(pictureBox1.Location.X , pictureBox1.Location.Y+ pictureBox1.Height);
-            pictureBox4.Location = new Point(pictureBox1.Location.X+ pictureBox1.Width , pictureBox1.Location.Y+ pictureBox1.Height);
+            if (cb_imageresolution.Text.Trim() == "")
+            {
+                MessageBox.Show("imageresolution cannot be null!");
+                return;
+            }
+            else
+            {
+                width = Convert.ToInt32(cb_imageresolution.Text.Split('*')[0]);
+                height = Convert.ToInt32(cb_imageresolution.Text.Split('*')[1]);
+                
+                pictureBox1.Height = pictureBox1.Width * height / width;
+                pictureBox2.Height = pictureBox1.Width * height / width;
+                pictureBox3.Height = pictureBox1.Width * height / width;
+                pictureBox4.Height = pictureBox1.Width * height / width;
+                pictureBox2.Location = new Point(pictureBox1.Location.X + pictureBox1.Width, pictureBox1.Location.Y);
+                pictureBox3.Location = new Point(pictureBox1.Location.X, pictureBox1.Location.Y + pictureBox1.Height);
+                pictureBox4.Location = new Point(pictureBox1.Location.X + pictureBox1.Width, pictureBox1.Location.Y + pictureBox1.Height);
+            }
+
+            this.Refresh();
 
             double scanFieldSizeH = scanFieldSize * height / width;
 
@@ -1240,11 +1252,9 @@ namespace OTSSysMgrApp
                         }
                         m_Sem.MoveSEMToPoint(PositionX, PositionY);
                     }
-                    //MessageBox.Show(PositionX.ToString() + "," + PositionY.ToString());
                     //Thread.Sleep(50);
                     byte[] ImageByte = new byte[width * height];
                     bool resultValue = GetScanImage(width, height, "2", ref ImageByte);
-                    string str2 = table["str2"].ToString();
 
                     if (resultValue)
                     {
@@ -1266,15 +1276,8 @@ namespace OTSSysMgrApp
                                     pictureBox3.Image = bitmap;
                                     break;
                             }
+                            this.Refresh();
                         }
-                        else
-                        {
-                            MessageBox.Show(str2, "Tip");
-                        }
-                    }
-                    else
-                    {
-                        MessageBox.Show(str2, "Tip");
                     }
                 }
 
@@ -1287,8 +1290,9 @@ namespace OTSSysMgrApp
             {
                 m_Sem.SetScanExternal(false);
                 m_Sem.DisConnect();
-                bn_continuousshot.Enabled = true;
-                bn_continuousshot.Refresh();
+                btn_continuousshot.Enabled = true;
+                btn_confirm.Enabled = true;
+                btn_continuousshot.Refresh();
             }
         }
 
@@ -1299,9 +1303,9 @@ namespace OTSSysMgrApp
             {
                 XmlDocument xmlDocument = new XmlDocument();
                 xmlDocument.Load(xmlpath);
-                XmlNodeList nodeList = xmlDocument.SelectSingleNode("XMLData").ChildNodes;//获取Employees节点的所有子节点
+                XmlNodeList nodeList = xmlDocument.SelectSingleNode("XMLData").ChildNodes;
 
-                foreach (XmlNode xn in nodeList)//遍历
+                foreach (XmlNode xn in nodeList)
                 {
                     XmlElement xe = (XmlElement)xn;
                     if (xe.GetAttribute("RegName") == "StageData")
@@ -1325,10 +1329,18 @@ namespace OTSSysMgrApp
 
         private void btn_confirm_Click(object sender, EventArgs e)
         {
-            string xmlpath = Application.StartupPath + @"\Config\SysData\OTSProgMgrParam.pmf";
-            string xAxisDir = "1:" + cb_Xdirection.SelectedItem.ToString(); ;
-            string yAxisDir = "0:"+cb_Ydirection.Text;
-            SaveConfigXml(xmlpath, xAxisDir, yAxisDir, tB_scanFieldSize100.Text);
+            double dscanFieldSize100 = 0;
+            if (cb_Xdirection.Text.Trim() != null && cb_imageresolution.Text.Trim() != null && cb_Ydirection.Text.Trim() != null && double.TryParse(tB_scanFieldSize100.Text, out dscanFieldSize100))
+            {
+                string xmlpath = Application.StartupPath + @"\Config\SysData\OTSProgMgrParam.pmf";
+                string xAxisDir = "1:" + cb_Xdirection.SelectedItem.ToString(); ;
+                string yAxisDir = "0:" + cb_Ydirection.Text;
+                SaveConfigXml(xmlpath, xAxisDir, yAxisDir, tB_scanFieldSize100.Text);
+            }
+            else
+            {
+                MessageBox.Show("Please check params!");
+            }
         }
     }
 }