Merge branch 'OTSRelease3_0' of http://36.129.163.148:30080/gogsadmin/OTS into OTSRelease3_0

Bin/x64/Debug/Resources/XMLData/AppResource_EN.xml

@@ -1067,19 +1067,15 @@
 	  <Control name="groupBox4" text="ConventionalMeasurementParameters" />
 	  <Control name="label42" text="Refining" />
 	  <Control name="label19" text="UserLib" />
-	  <Control name="label18" text="SysLib" />
-	  <Control name="label40" text="μm" />
 	  <Control name="label15" text="Switch" />
 	  <Control name="label14" text="Name" />
 	  <Control name="groupBox5" text="ImageProcessingParameters" />
 	  <Control name="label22" text="ParticleRange" />
 	  <Control name="label21" text="BackgRange" />
 	  <Control name="label25" text="Min" />
-	  <Control name="label24" text="Min" />
 	  <Control name="label28" text="Max" />
 	  <Control name="label27" text="Max" />
 	  <Control name="label26" text="Max" />
-	  <Control name="label23" text="Min" />
 	  <Control name="label20" text="SizeRange" />
 	  <Control name="lbShape" text="DefualtMeasureShape" />
 	  <Control name="lbArea" text="DefualtMeasureArea" />

Bin/x64/Debug/Resources/XMLData/AppResource_ZH.xml

@@ -1055,19 +1055,15 @@
 	  <Control name="groupBox4" text="常规测量参数" />
 	  <Control name="label42" text="精炼工艺" />
 	  <Control name="label19" text="用户分析库编辑" />
-	  <Control name="label18" text="系统分析库文件夹" />
-	  <Control name="label40" text="μm" />
 	  <Control name="label15" text="执行开关" />
 	  <Control name="label14" text="样品名" />
 	  <Control name="groupBox5" text="图像处理参数" />
 	  <Control name="label22" text="颗粒灰度范围" />
 	  <Control name="label21" text="背景灰度范围" />
 	  <Control name="label25" text="最小" />
-	  <Control name="label24" text="最小" />
 	  <Control name="label28" text="最大" />
 	  <Control name="label27" text="最大" />
 	  <Control name="label26" text="最大" />
-	  <Control name="label23" text="最小" />
 	  <Control name="label20" text="颗粒尺寸范围" />
 	  <Control name="lbShape" text="测量区域形状" />
 	  <Control name="lbArea" text="测量区域面积/mm2" />

OTSIncAMeasureApp/7-OTSProgMgrInfo/ProgMgrInfoForm.designer.cs

@@ -446,17 +446,17 @@
             // 
             // tB_StopMode
             // 
-            this.tB_StopMode.Location = new System.Drawing.Point(107, 21);
+            this.tB_StopMode.Location = new System.Drawing.Point(110, 23);
             this.tB_StopMode.Margin = new System.Windows.Forms.Padding(2);
             this.tB_StopMode.Name = "tB_StopMode";
             this.tB_StopMode.ReadOnly = true;
-            this.tB_StopMode.Size = new System.Drawing.Size(157, 21);
+            this.tB_StopMode.Size = new System.Drawing.Size(122, 21);
             this.tB_StopMode.TabIndex = 372;
             this.tB_StopMode.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
             // btn_StopMode
             // 
-            this.btn_StopMode.Location = new System.Drawing.Point(268, 19);
+            this.btn_StopMode.Location = new System.Drawing.Point(235, 21);
             this.btn_StopMode.Margin = new System.Windows.Forms.Padding(2);
             this.btn_StopMode.Name = "btn_StopMode";
             this.btn_StopMode.Size = new System.Drawing.Size(45, 23);
@@ -759,18 +759,18 @@
             // 
             // IDC_EDIT_OTHERSELECTION
             // 
-            this.IDC_EDIT_OTHERSELECTION.Location = new System.Drawing.Point(107, 159);
+            this.IDC_EDIT_OTHERSELECTION.Location = new System.Drawing.Point(108, 159);
             this.IDC_EDIT_OTHERSELECTION.Margin = new System.Windows.Forms.Padding(2);
             this.IDC_EDIT_OTHERSELECTION.MaxLength = 10;
             this.IDC_EDIT_OTHERSELECTION.Name = "IDC_EDIT_OTHERSELECTION";
             this.IDC_EDIT_OTHERSELECTION.ReadOnly = true;
-            this.IDC_EDIT_OTHERSELECTION.Size = new System.Drawing.Size(157, 21);
+            this.IDC_EDIT_OTHERSELECTION.Size = new System.Drawing.Size(122, 21);
             this.IDC_EDIT_OTHERSELECTION.TabIndex = 843;
             this.IDC_EDIT_OTHERSELECTION.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
             // btn_otherselection
             // 
-            this.btn_otherselection.Location = new System.Drawing.Point(268, 157);
+            this.btn_otherselection.Location = new System.Drawing.Point(235, 157);
             this.btn_otherselection.Margin = new System.Windows.Forms.Padding(2);
             this.btn_otherselection.Name = "btn_otherselection";
             this.btn_otherselection.Size = new System.Drawing.Size(45, 23);
@@ -1142,7 +1142,7 @@
             // IDC_USINGXRAY_LIB
             // 
             this.IDC_USINGXRAY_LIB.AutoSize = true;
-            this.IDC_USINGXRAY_LIB.Location = new System.Drawing.Point(139, 23);
+            this.IDC_USINGXRAY_LIB.Location = new System.Drawing.Point(110, 23);
             this.IDC_USINGXRAY_LIB.Margin = new System.Windows.Forms.Padding(2);
             this.IDC_USINGXRAY_LIB.Name = "IDC_USINGXRAY_LIB";
             this.IDC_USINGXRAY_LIB.Size = new System.Drawing.Size(15, 14);
@@ -1217,7 +1217,7 @@
             // 
             // btnok
             // 
-            this.btnok.Location = new System.Drawing.Point(478, 606);
+            this.btnok.Location = new System.Drawing.Point(499, 606);
             this.btnok.Margin = new System.Windows.Forms.Padding(2);
             this.btnok.Name = "btnok";
             this.btnok.Size = new System.Drawing.Size(66, 22);
@@ -1253,7 +1253,7 @@
             // 
             // btncancel
             // 
-            this.btncancel.Location = new System.Drawing.Point(568, 606);
+            this.btncancel.Location = new System.Drawing.Point(580, 606);
             this.btncancel.Margin = new System.Windows.Forms.Padding(2);
             this.btncancel.Name = "btncancel";
             this.btncancel.Size = new System.Drawing.Size(66, 22);