添加配置文件及参数检测

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

@@ -983,9 +983,11 @@
 	  <Control name="label17" text="Time" />
 	  <Control name="label30" text="MinimumCount" />
 	  <Control name="label29" text="Accuracy" />
-	  <Control name="label32" text="ScanningTime" />
+	  <Control name="label32" text="LargeParticleX-rayTime" />
+	  <Control name="label45" text="SmallParticleX-rayTime" />
 	  <Control name="label33" text="CountingExpectations" />
-	  <Control name="label31" text="ScanningMode" />
+	  <Control name="label31" text="ScanningMode(Large particles)" />
+	  <Control name="label37" text="Analysis threshold" />
 	  <Control name="groupBox7" text="ModeSelection" />
 	  <Control name="lbModelSel" text="ModeSelection" />
 	  <Control name="lbLaboratoty" text="Laboratoty" />
@@ -1066,7 +1068,8 @@
 	  <Control name="message61" text="The item which called Using X-ray cannot be empty!" />
 	  
 	  <Control name="message62" text="The entered measurement area area cannot be empty!" />
-	  
+	  <Control name="message63" text="Please enter the correct numerical format!" />
+	  <Control name="message64" text="Please enter the correct numerical format!" />
     </Controls>
  </Form>
  <Form>

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

@@ -980,9 +980,11 @@
 	  <Control name="label17" text="使用系统库开关" />
 	  <Control name="label30" text="搜索X-ray最低计数" />
 	  <Control name="label29" text="搜索X-ray精度" />
-	  <Control name="label32" text="分析X-ray扫描时间" />
+	  <Control name="label32" text="大颗粒X-ray时间" />
+	  <Control name="label45" text="小颗粒Xray时间" />
 	  <Control name="label33" text="分析X-ray计数期望值" />
-	  <Control name="label31" text="X-ray扫描方式" /> 
+	  <Control name="label31" text="扫描方式(大颗粒）" /> 
+	  <Control name="label37" text="分析阈值" />
 	  <Control name="groupBox7" text="模式选择" />
 	  <Control name="lbModelSel" text="模式选择" />
 	  <Control name="lbLaboratoty" text="实验室" />
@@ -1062,6 +1064,8 @@
 	  <Control name="message60" text="请输入正确的数值格式!" />
 	  <Control name="message61" text="是否使用X-ray项不能为空" />
 	  <Control name="message62" text="输入的测量区域面积不可以为空!" />
+	  <Control name="message63" text="请输入正确的数值范围!" />
+	  <Control name="message64" text="请输入正确的数值范围!" />
     </Controls>
  </Form>
  <Form>

OTSIncAMeasureApp/7-OTSProgMgrInfo/ProgMgrInfoForm.cs

@@ -1492,6 +1492,22 @@ namespace OTSMeasureApp
                 return false;
             }
 
+            if (false == rg.Match(IDC_EDIT_QuantifyMinSize.Text.Trim()).Success)
+            {
+                IDC_EDIT_QuantifyMinSize.Focus();
+                IDC_EDIT_QuantifyMinSize.SelectAll();
+                string message = table["message63"].ToString();
+                MessageBox.Show(message, "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                return false;
+            }
+            if (false == rg.Match(IDC_EDIT_SmallPartAQTime.Text.Trim()).Success)
+            {
+                IDC_EDIT_SmallPartAQTime.Focus();
+                IDC_EDIT_SmallPartAQTime.SelectAll();
+                string message = table["message64"].ToString();
+                MessageBox.Show(message, "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                return false;
+            }
             //测量区域面积mm2
             if (false == rg.Match(tBMeasArea.Text.Trim()).Success)
             {