浏览代码

optimize oxford test feature.

zhangjiaxin 4 年之前
父节点
当前提交
9d12b4a50a
共有 2 个文件被更改,包括 180 次插入120 次删除
  1. 20 20
      OxfordTest/Form1.Designer.cs
  2. 160 100
      OxfordTest/Form1.resx

+ 20 - 20
OxfordTest/Form1.Designer.cs

@@ -29,10 +29,10 @@
         private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Form1));
-            System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
-            System.Windows.Forms.DataVisualization.Charting.Legend legend1 = new System.Windows.Forms.DataVisualization.Charting.Legend();
-            System.Windows.Forms.DataVisualization.Charting.Series series1 = new System.Windows.Forms.DataVisualization.Charting.Series();
-            System.Windows.Forms.DataVisualization.Charting.Series series2 = new System.Windows.Forms.DataVisualization.Charting.Series();
+            System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea2 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
+            System.Windows.Forms.DataVisualization.Charting.Legend legend2 = new System.Windows.Forms.DataVisualization.Charting.Legend();
+            System.Windows.Forms.DataVisualization.Charting.Series series3 = new System.Windows.Forms.DataVisualization.Charting.Series();
+            System.Windows.Forms.DataVisualization.Charting.Series series4 = new System.Windows.Forms.DataVisualization.Charting.Series();
             this.label1 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
             this.label3 = new System.Windows.Forms.Label();
@@ -1063,24 +1063,24 @@
             // 
             // chart1
             // 
-            chartArea1.Name = "ChartArea1";
-            this.chart1.ChartAreas.Add(chartArea1);
-            legend1.Alignment = System.Drawing.StringAlignment.Center;
-            legend1.Docking = System.Windows.Forms.DataVisualization.Charting.Docking.Top;
-            legend1.Name = "Legend1";
-            this.chart1.Legends.Add(legend1);
+            chartArea2.Name = "ChartArea1";
+            this.chart1.ChartAreas.Add(chartArea2);
+            legend2.Alignment = System.Drawing.StringAlignment.Center;
+            legend2.Docking = System.Windows.Forms.DataVisualization.Charting.Docking.Top;
+            legend2.Name = "Legend1";
+            this.chart1.Legends.Add(legend2);
             resources.ApplyResources(this.chart1, "chart1");
             this.chart1.Name = "chart1";
-            series1.ChartArea = "ChartArea1";
-            series1.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Spline;
-            series1.Legend = "Legend1";
-            series1.Name = "Series1";
-            series2.ChartArea = "ChartArea1";
-            series2.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Spline;
-            series2.Legend = "Legend1";
-            series2.Name = "Series2";
-            this.chart1.Series.Add(series1);
-            this.chart1.Series.Add(series2);
+            series3.ChartArea = "ChartArea1";
+            series3.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Spline;
+            series3.Legend = "Legend1";
+            series3.Name = "Series1";
+            series4.ChartArea = "ChartArea1";
+            series4.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.Spline;
+            series4.Legend = "Legend1";
+            series4.Name = "Series2";
+            this.chart1.Series.Add(series3);
+            this.chart1.Series.Add(series4);
             // 
             // button29
             // 

+ 160 - 100
OxfordTest/Form1.resx

@@ -2151,6 +2151,60 @@
   <data name="&gt;&gt;button23.ZOrder" xml:space="preserve">
     <value>3</value>
   </data>
+  <data name="&gt;&gt;button27.Name" xml:space="preserve">
+    <value>button27</value>
+  </data>
+  <data name="&gt;&gt;button27.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;button27.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;button27.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;btnCreateDB.Name" xml:space="preserve">
+    <value>btnCreateDB</value>
+  </data>
+  <data name="&gt;&gt;btnCreateDB.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnCreateDB.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;btnCreateDB.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>8, 8</value>
+  </data>
+  <data name="groupBox1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>2, 2, 2, 2</value>
+  </data>
+  <data name="groupBox1.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>2, 2, 2, 2</value>
+  </data>
+  <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>491, 384</value>
+  </data>
+  <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
+    <value>76</value>
+  </data>
+  <data name="groupBox1.Text" xml:space="preserve">
+    <value>电镜和样品台控制</value>
+  </data>
+  <data name="&gt;&gt;groupBox1.Name" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;groupBox1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;groupBox1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;groupBox1.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
   <data name="button27.Location" type="System.Drawing.Point, System.Drawing">
     <value>107, -1</value>
   </data>
@@ -2205,35 +2259,71 @@
   <data name="&gt;&gt;btnCreateDB.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
-  <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>8, 8</value>
+  <data name="&gt;&gt;button28.Name" xml:space="preserve">
+    <value>button28</value>
   </data>
-  <data name="groupBox1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+  <data name="&gt;&gt;button28.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;button28.Parent" xml:space="preserve">
+    <value>拍图</value>
+  </data>
+  <data name="&gt;&gt;button28.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;pBImage.Name" xml:space="preserve">
+    <value>pBImage</value>
+  </data>
+  <data name="&gt;&gt;pBImage.Type" xml:space="preserve">
+    <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;pBImage.Parent" xml:space="preserve">
+    <value>拍图</value>
+  </data>
+  <data name="&gt;&gt;pBImage.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;button24.Name" xml:space="preserve">
+    <value>button24</value>
+  </data>
+  <data name="&gt;&gt;button24.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;button24.Parent" xml:space="preserve">
+    <value>拍图</value>
+  </data>
+  <data name="&gt;&gt;button24.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="拍图.Location" type="System.Drawing.Point, System.Drawing">
+    <value>526, 8</value>
+  </data>
+  <data name="拍图.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
   </data>
-  <data name="groupBox1.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
+  <data name="拍图.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
   </data>
-  <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>491, 384</value>
+  <data name="拍图.Size" type="System.Drawing.Size, System.Drawing">
+    <value>593, 384</value>
   </data>
-  <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
-    <value>76</value>
+  <data name="拍图.TabIndex" type="System.Int32, mscorlib">
+    <value>77</value>
   </data>
-  <data name="groupBox1.Text" xml:space="preserve">
-    <value>电镜和样品台控制</value>
+  <data name="拍图.Text" xml:space="preserve">
+    <value>拍图</value>
   </data>
-  <data name="&gt;&gt;groupBox1.Name" xml:space="preserve">
-    <value>groupBox1</value>
+  <data name="&gt;&gt;拍图.Name" xml:space="preserve">
+    <value>拍图</value>
   </data>
-  <data name="&gt;&gt;groupBox1.Type" xml:space="preserve">
+  <data name="&gt;&gt;拍图.Type" xml:space="preserve">
     <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;groupBox1.Parent" xml:space="preserve">
+  <data name="&gt;&gt;拍图.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
-  <data name="&gt;&gt;groupBox1.ZOrder" xml:space="preserve">
-    <value>2</value>
+  <data name="&gt;&gt;拍图.ZOrder" xml:space="preserve">
+    <value>1</value>
   </data>
   <data name="button28.Location" type="System.Drawing.Point, System.Drawing">
     <value>104, 19</value>
@@ -2316,41 +2406,11 @@
   <data name="&gt;&gt;button24.ZOrder" xml:space="preserve">
     <value>2</value>
   </data>
-  <data name="拍图.Location" type="System.Drawing.Point, System.Drawing">
-    <value>526, 8</value>
-  </data>
-  <data name="拍图.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>2, 2, 2, 2</value>
-  </data>
-  <data name="拍图.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>2, 2, 2, 2</value>
-  </data>
-  <data name="拍图.Size" type="System.Drawing.Size, System.Drawing">
-    <value>593, 384</value>
-  </data>
-  <data name="拍图.TabIndex" type="System.Int32, mscorlib">
-    <value>77</value>
-  </data>
-  <data name="拍图.Text" xml:space="preserve">
-    <value>拍图</value>
-  </data>
-  <data name="&gt;&gt;拍图.Name" xml:space="preserve">
-    <value>拍图</value>
-  </data>
-  <data name="&gt;&gt;拍图.Type" xml:space="preserve">
-    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;拍图.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;拍图.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
   <data name="btnTest.Font" type="System.Drawing.Font, System.Drawing">
     <value>微软雅黑, 12pt</value>
   </data>
   <data name="btnTest.Location" type="System.Drawing.Point, System.Drawing">
-    <value>377, 28</value>
+    <value>458, 22</value>
   </data>
   <data name="btnTest.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
@@ -2380,7 +2440,7 @@
     <value>True</value>
   </data>
   <data name="label37.Location" type="System.Drawing.Point, System.Drawing">
-    <value>224, 226</value>
+    <value>305, 220</value>
   </data>
   <data name="label37.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 0, 2, 0</value>
@@ -2407,7 +2467,7 @@
     <value>1</value>
   </data>
   <data name="txtarea2l3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>377, 272</value>
+    <value>457, 268</value>
   </data>
   <data name="txtarea2l3.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
@@ -2437,7 +2497,7 @@
     <value>2</value>
   </data>
   <data name="txtarea2l2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>377, 249</value>
+    <value>458, 243</value>
   </data>
   <data name="txtarea2l2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
@@ -2467,7 +2527,7 @@
     <value>3</value>
   </data>
   <data name="txtarea2y3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>323, 272</value>
+    <value>403, 268</value>
   </data>
   <data name="txtarea2y3.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
@@ -2497,7 +2557,7 @@
     <value>4</value>
   </data>
   <data name="txtarea2x3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>276, 272</value>
+    <value>356, 268</value>
   </data>
   <data name="txtarea2x3.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
@@ -2527,7 +2587,7 @@
     <value>5</value>
   </data>
   <data name="txtarea2y2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>323, 249</value>
+    <value>404, 243</value>
   </data>
   <data name="txtarea2y2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
@@ -2557,7 +2617,7 @@
     <value>6</value>
   </data>
   <data name="txtarea2x2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>276, 249</value>
+    <value>357, 243</value>
   </data>
   <data name="txtarea2x2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
@@ -2587,7 +2647,7 @@
     <value>7</value>
   </data>
   <data name="txtarea2l1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>377, 224</value>
+    <value>458, 218</value>
   </data>
   <data name="txtarea2l1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
@@ -2617,7 +2677,7 @@
     <value>8</value>
   </data>
   <data name="txtarea1l3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>377, 201</value>
+    <value>458, 195</value>
   </data>
   <data name="txtarea1l3.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
@@ -2647,7 +2707,7 @@
     <value>9</value>
   </data>
   <data name="txtarea2y1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>323, 224</value>
+    <value>404, 218</value>
   </data>
   <data name="txtarea2y1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
@@ -2677,7 +2737,7 @@
     <value>10</value>
   </data>
   <data name="txtarea2x1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>276, 224</value>
+    <value>357, 218</value>
   </data>
   <data name="txtarea2x1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
@@ -2707,7 +2767,7 @@
     <value>11</value>
   </data>
   <data name="txtarea1y3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>323, 201</value>
+    <value>404, 195</value>
   </data>
   <data name="txtarea1y3.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
@@ -2737,7 +2797,7 @@
     <value>12</value>
   </data>
   <data name="txtarea1x3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>276, 201</value>
+    <value>357, 195</value>
   </data>
   <data name="txtarea1x3.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
@@ -2767,7 +2827,7 @@
     <value>13</value>
   </data>
   <data name="txtarea1l2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>377, 176</value>
+    <value>458, 170</value>
   </data>
   <data name="txtarea1l2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
@@ -2797,7 +2857,7 @@
     <value>14</value>
   </data>
   <data name="textRegionHeight.Location" type="System.Drawing.Point, System.Drawing">
-    <value>517, 146</value>
+    <value>598, 140</value>
   </data>
   <data name="textRegionHeight.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
@@ -2827,7 +2887,7 @@
     <value>15</value>
   </data>
   <data name="textTime.Location" type="System.Drawing.Point, System.Drawing">
-    <value>464, 189</value>
+    <value>545, 183</value>
   </data>
   <data name="textTime.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
@@ -2857,7 +2917,7 @@
     <value>16</value>
   </data>
   <data name="textRegionwidth1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>464, 146</value>
+    <value>545, 140</value>
   </data>
   <data name="textRegionwidth1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
@@ -2887,7 +2947,7 @@
     <value>17</value>
   </data>
   <data name="textRegionY1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>517, 92</value>
+    <value>598, 86</value>
   </data>
   <data name="textRegionY1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
@@ -2917,7 +2977,7 @@
     <value>18</value>
   </data>
   <data name="textRegionX1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>464, 92</value>
+    <value>545, 86</value>
   </data>
   <data name="textRegionX1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
@@ -2947,7 +3007,7 @@
     <value>19</value>
   </data>
   <data name="txtarea1l1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>377, 153</value>
+    <value>458, 147</value>
   </data>
   <data name="txtarea1l1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
@@ -2977,7 +3037,7 @@
     <value>20</value>
   </data>
   <data name="txtarea1y2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>323, 176</value>
+    <value>404, 170</value>
   </data>
   <data name="txtarea1y2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
@@ -3007,7 +3067,7 @@
     <value>21</value>
   </data>
   <data name="txtarea1x2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>276, 176</value>
+    <value>357, 170</value>
   </data>
   <data name="txtarea1x2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
@@ -3037,7 +3097,7 @@
     <value>22</value>
   </data>
   <data name="txtarea1y1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>323, 153</value>
+    <value>404, 147</value>
   </data>
   <data name="txtarea1y1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
@@ -3067,7 +3127,7 @@
     <value>23</value>
   </data>
   <data name="txtarea1x1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>276, 153</value>
+    <value>357, 147</value>
   </data>
   <data name="txtarea1x1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
@@ -3100,7 +3160,7 @@
     <value>True</value>
   </data>
   <data name="label36.Location" type="System.Drawing.Point, System.Drawing">
-    <value>226, 155</value>
+    <value>307, 149</value>
   </data>
   <data name="label36.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 0, 2, 0</value>
@@ -3127,7 +3187,7 @@
     <value>25</value>
   </data>
   <data name="txtpy5.Location" type="System.Drawing.Point, System.Drawing">
-    <value>323, 127</value>
+    <value>404, 121</value>
   </data>
   <data name="txtpy5.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
@@ -3157,7 +3217,7 @@
     <value>26</value>
   </data>
   <data name="txtpx5.Location" type="System.Drawing.Point, System.Drawing">
-    <value>276, 127</value>
+    <value>357, 121</value>
   </data>
   <data name="txtpx5.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
@@ -3187,7 +3247,7 @@
     <value>27</value>
   </data>
   <data name="txtpy4.Location" type="System.Drawing.Point, System.Drawing">
-    <value>323, 102</value>
+    <value>404, 96</value>
   </data>
   <data name="txtpy4.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
@@ -3217,7 +3277,7 @@
     <value>28</value>
   </data>
   <data name="txtpx4.Location" type="System.Drawing.Point, System.Drawing">
-    <value>276, 102</value>
+    <value>357, 96</value>
   </data>
   <data name="txtpx4.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
@@ -3247,7 +3307,7 @@
     <value>29</value>
   </data>
   <data name="txtpy3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>323, 78</value>
+    <value>404, 72</value>
   </data>
   <data name="txtpy3.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
@@ -3277,7 +3337,7 @@
     <value>30</value>
   </data>
   <data name="txtpx3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>276, 78</value>
+    <value>357, 72</value>
   </data>
   <data name="txtpx3.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
@@ -3307,7 +3367,7 @@
     <value>31</value>
   </data>
   <data name="txtpy2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>323, 53</value>
+    <value>404, 47</value>
   </data>
   <data name="txtpy2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
@@ -3337,7 +3397,7 @@
     <value>32</value>
   </data>
   <data name="txtpx2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>276, 53</value>
+    <value>357, 47</value>
   </data>
   <data name="txtpx2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
@@ -3370,7 +3430,7 @@
     <value>True</value>
   </data>
   <data name="label35.Location" type="System.Drawing.Point, System.Drawing">
-    <value>378, 13</value>
+    <value>459, 7</value>
   </data>
   <data name="label35.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 0, 2, 0</value>
@@ -3400,7 +3460,7 @@
     <value>True</value>
   </data>
   <data name="label34.Location" type="System.Drawing.Point, System.Drawing">
-    <value>338, 13</value>
+    <value>419, 7</value>
   </data>
   <data name="label34.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 0, 2, 0</value>
@@ -3430,7 +3490,7 @@
     <value>True</value>
   </data>
   <data name="label33.Location" type="System.Drawing.Point, System.Drawing">
-    <value>292, 13</value>
+    <value>373, 7</value>
   </data>
   <data name="label33.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 0, 2, 0</value>
@@ -3457,7 +3517,7 @@
     <value>36</value>
   </data>
   <data name="txtpy1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>323, 28</value>
+    <value>404, 22</value>
   </data>
   <data name="txtpy1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
@@ -3487,7 +3547,7 @@
     <value>37</value>
   </data>
   <data name="txtpx1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>276, 28</value>
+    <value>357, 22</value>
   </data>
   <data name="txtpx1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
@@ -3523,7 +3583,7 @@
     <value>NoControl</value>
   </data>
   <data name="label39.Location" type="System.Drawing.Point, System.Drawing">
-    <value>532, 78</value>
+    <value>613, 72</value>
   </data>
   <data name="label39.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 0, 2, 0</value>
@@ -3556,7 +3616,7 @@
     <value>NoControl</value>
   </data>
   <data name="label41.Location" type="System.Drawing.Point, System.Drawing">
-    <value>519, 130</value>
+    <value>600, 124</value>
   </data>
   <data name="label41.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 0, 2, 0</value>
@@ -3589,7 +3649,7 @@
     <value>NoControl</value>
   </data>
   <data name="label42.Location" type="System.Drawing.Point, System.Drawing">
-    <value>465, 176</value>
+    <value>546, 170</value>
   </data>
   <data name="label42.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 0, 2, 0</value>
@@ -3622,7 +3682,7 @@
     <value>NoControl</value>
   </data>
   <data name="label40.Location" type="System.Drawing.Point, System.Drawing">
-    <value>465, 130</value>
+    <value>546, 124</value>
   </data>
   <data name="label40.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 0, 2, 0</value>
@@ -3655,7 +3715,7 @@
     <value>NoControl</value>
   </data>
   <data name="label38.Location" type="System.Drawing.Point, System.Drawing">
-    <value>475, 78</value>
+    <value>556, 72</value>
   </data>
   <data name="label38.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 0, 2, 0</value>
@@ -3685,7 +3745,7 @@
     <value>True</value>
   </data>
   <data name="label32.Location" type="System.Drawing.Point, System.Drawing">
-    <value>226, 32</value>
+    <value>307, 26</value>
   </data>
   <data name="label32.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 0, 2, 0</value>
@@ -3715,7 +3775,7 @@
     <value>宋体, 12pt</value>
   </data>
   <data name="NUDNum.Location" type="System.Drawing.Point, System.Drawing">
-    <value>18, 257</value>
+    <value>273, 322</value>
   </data>
   <data name="NUDNum.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
@@ -3742,7 +3802,7 @@
     <value>45</value>
   </data>
   <data name="btnReadP.Location" type="System.Drawing.Point, System.Drawing">
-    <value>124, 254</value>
+    <value>379, 319</value>
   </data>
   <data name="btnReadP.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
@@ -3781,13 +3841,13 @@
     <value>含量</value>
   </data>
   <data name="dataGridView1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>18, 70</value>
+    <value>12, 51</value>
   </data>
   <data name="dataGridView1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
   </data>
   <data name="dataGridView1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>181, 170</value>
+    <value>247, 374</value>
   </data>
   <data name="dataGridView1.TabIndex" type="System.Int32, mscorlib">
     <value>79</value>
@@ -3835,7 +3895,7 @@
     <value>NoControl</value>
   </data>
   <data name="button29.Location" type="System.Drawing.Point, System.Drawing">
-    <value>477, 32</value>
+    <value>558, 26</value>
   </data>
   <data name="button29.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
@@ -3862,7 +3922,7 @@
     <value>49</value>
   </data>
   <data name="button26.Location" type="System.Drawing.Point, System.Drawing">
-    <value>117, 26</value>
+    <value>145, 17</value>
   </data>
   <data name="button26.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
@@ -3889,7 +3949,7 @@
     <value>50</value>
   </data>
   <data name="button25.Location" type="System.Drawing.Point, System.Drawing">
-    <value>18, 26</value>
+    <value>46, 17</value>
   </data>
   <data name="button25.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>
@@ -3925,7 +3985,7 @@
     <value>2, 2, 2, 2</value>
   </data>
   <data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1316, 298</value>
+    <value>1316, 429</value>
   </data>
   <data name="groupBox2.TabIndex" type="System.Int32, mscorlib">
     <value>78</value>
@@ -3955,7 +4015,7 @@
     <value>GrowAndShrink</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>1377, 703</value>
+    <value>1377, 836</value>
   </data>
   <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>2, 2, 2, 2</value>