Merge branch 'dev' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into dev

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

@@ -984,6 +984,9 @@
 	  <Control name="message59" text="Please enter the correct numerical format" />
 	  <Control name="message60" text="Please enter the correct numerical format" />
 	  <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!" />
+	  
     </Controls>
  </Form>
  <Form>
@@ -1127,6 +1130,7 @@
 	  <Control name="message9" text="Delete BSE picture error message:" />
 	  <Control name="message10" text="Is the polygon area drawn?" />
 	  <Control name="message11" text="Tip" />
+	  <Control name="message12" text="The current position of the SEM has exceeded the range of the sample stage and cannot be moved!" />
     </Controls>
  </Form>
   <Form>

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

@@ -979,6 +979,7 @@
 	  <Control name="message59" text="请输入正确的数值格式!" />
 	  <Control name="message60" text="请输入正确的数值格式!" />
 	  <Control name="message61" text="是否使用X-ray项不能为空" />
+	  <Control name="message62" text="输入的测量区域面积不可以为空!" />
     </Controls>
  </Form>
  <Form>
@@ -1122,6 +1123,7 @@
 	  <Control name="message9" text="删除BSE图片错误信息：" />
 	  <Control name="message10" text="多边形区域是否绘制完成？" />
 	  <Control name="message11" text="提示" />
+	  <Control name="message12" text="SEM当前位置已经超出样品台范围,无法移动!" />
     </Controls>
  </Form>
  <Form>
@@ -1424,4 +1426,26 @@
 	  <Control name="button1" text="确  定" />
     </Controls>
  </Form>
+ <Form>
+    <Name>OTSDisplaySampleGrid</Name>
+    <Controls>
+      <Control name="str1" text="夹杂物级别" />
+	  <Control name="str2" text="结果" />
+	  <Control name="str3" text="K0指数" />
+	  <Control name="str4" text="中文名" />
+	  <Control name="str5" text="夹杂物ID" />
+	  <Control name="str6" text="起" />
+	  <Control name="str7" text="止" />
+	  <Control name="str8" text="原子数" />
+	  <Control name="str9" text="名称" />
+	  <Control name="str10" text="编号" />
+	  <Control name="str11" text="代表色" />
+	  <Control name="str12" text="宽高比" />
+	  <Control name="str13" text="元素号" />
+	  <Control name="str14" text="原子数" />
+	  <Control name="str15" text="规则" />
+	  <Control name="str16" text="最小" />
+	  <Control name="str17" text="最大" />
+    </Controls>
+ </Form>
 </Resource>

OTSIncAMeasureApp/1-OTSMeasure/OTSMeasureDisplayResult.cs

@@ -116,7 +116,7 @@ namespace OTSMeasureApp
                     }
                     catch (Exception ex)
                     {
-                        log.Error("OTSIncAMeasureApp_backgroundWorker_ProgressChanged:--打开测量结果列表窗口--错误日志:" + ex.ToString());
+                        log.Error("OTSIncAMeasureApp_backgroundWorker_ProgressChanged:--Open the measurement results list window - error log:" + ex.ToString());
                     }
                 }
                 //测量结果
@@ -143,14 +143,14 @@ namespace OTSMeasureApp
                     }
                     catch (Exception ex)
                     {
-                        log.Error("OTSIncAMeasureApp_backgroundWorker_ProgressChanged:--打开测量结果列表窗口--错误日志:" + ex.ToString());
+                        log.Error("OTSIncAMeasureApp_backgroundWorker_ProgressChanged:--Open the measurement results list window - error log:" + ex.ToString());
                     }
                 }
 
             }
             catch (Exception ex)
             {
-                log.Error("OTSIncAMeasureApp_backgroundWorker_ProgressChanged:--打开测量结果列表窗口--错误日志:" + ex.ToString());
+                log.Error("OTSIncAMeasureApp_backgroundWorker_ProgressChanged:--Open the measurement results list window - error log:" + ex.ToString());
             }
         }
         #endregion
@@ -715,7 +715,7 @@ namespace OTSMeasureApp
             }
             catch (Exception ex)
             {
-               log.Error("RunMeasureState--错误信息:"+ ex.ToString()); 
+               log.Error("RunMeasureState--The error message:" + ex.ToString()); 
             }
         }
 

OTSIncAMeasureApp/3-OTSDisplaySourceGridData/OTSDisplaySampleGrid.cs

@@ -906,7 +906,7 @@ namespace OTSMeasureApp
                     if (false == rg_szzmxhx.Match(in_str.Trim()).Success)
                     {
                         m_SampleGrid.m_PropWindow.PropGrid[m_SampleGrid.m_ClickRow, 2].Value = "Sample";
-                        MessageBox.Show("样品名长度不能大于20,请重新输入!", "错误提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                        MessageBox.Show("The length of sample name should not be greater than 20, please re-enter!", "Error Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
                         return false;
                     }
                     break;
@@ -915,7 +915,7 @@ namespace OTSMeasureApp
                     if (false == rg_zzs_bhl.Match(in_str.Trim()).Success)
                     {
                         m_SampleGrid.m_PropWindow.PropGrid[m_SampleGrid.m_ClickRow, 2].Value = "100";
-                        MessageBox.Show("样品 颗粒数 错误,请重新输入!", "错误提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                        MessageBox.Show("The particle number of sample is wrong, please input again!", "Error Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
                         return false;
                     }
                     break;
@@ -924,7 +924,7 @@ namespace OTSMeasureApp
                     if (false == rg_zzs_bhl.Match(in_str.Trim()).Success)
                     {
                         m_SampleGrid.m_PropWindow.PropGrid[m_SampleGrid.m_ClickRow, 2].Value = "100";
-                        MessageBox.Show("样品 帧图数 错误,请重新输入!", "错误提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                        MessageBox.Show("The number of frame is wrong, please input again!", "Error Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
                         return false;
                     }
                     break;
@@ -933,7 +933,7 @@ namespace OTSMeasureApp
                     if (false == rg_zzs_bhl.Match(in_str.Trim()).Success)
                     {
                         m_SampleGrid.m_PropWindow.PropGrid[m_SampleGrid.m_ClickRow, 2].Value = "100";
-                        MessageBox.Show("样品 测量时间 错误,请重新输入!", "错误提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                        MessageBox.Show("The measurement time of sample is wrong, please input again!", "Error Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
                         return false;
                     }
                     break;
@@ -942,13 +942,13 @@ namespace OTSMeasureApp
                     if (in_str.Trim() == "0")
                     {
                         m_SampleGrid.m_PropWindow.PropGrid[m_SampleGrid.m_ClickRow, 2].Value = "5.00";
-                        MessageBox.Show("样品 颗粒直径最小值 错误,请重新输入!", "错误提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                        MessageBox.Show("The minimum particle diameter of the sample is wrong, please re-enter!", "Error Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
                         return false;
                     }
                     if (false == rg_fds_bhl.Match(in_str.Trim()).Success)
                     {
                         m_SampleGrid.m_PropWindow.PropGrid[m_SampleGrid.m_ClickRow, 2].Value = "5.00";
-                        MessageBox.Show("样品 颗粒直径最小值 错误,请重新输入!", "错误提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                        MessageBox.Show("The minimum particle diameter of the sample is wrong, please re-enter!", "Error Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
                         return false;
                     }
                     break;
@@ -956,13 +956,13 @@ namespace OTSMeasureApp
                     if (in_str.Trim() == "0")
                     {
                         m_SampleGrid.m_PropWindow.PropGrid[m_SampleGrid.m_ClickRow, 2].Value = "100.00";
-                        MessageBox.Show("样品 颗粒直径最大值 错误,请重新输入!", "错误提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                        MessageBox.Show("The maximum particle diameter of sample is wrong, please input again!", "Error Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
                         return false;
                     }
                     if (false == rg_fds_bhl.Match(in_str.Trim()).Success)
                     {
                         m_SampleGrid.m_PropWindow.PropGrid[m_SampleGrid.m_ClickRow, 2].Value = "100.00";
-                        MessageBox.Show("样品 颗粒直径最大值 错误,请重新输入!", "错误提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                        MessageBox.Show("The maximum particle diameter of sample is wrong, please input again!", "Error Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
                         return false;
                     }
                     break;
@@ -971,7 +971,7 @@ namespace OTSMeasureApp
                     if (false == rg_zzs_hl.Match(in_str.Trim()).Success)
                     {
                         m_SampleGrid.m_PropWindow.PropGrid[m_SampleGrid.m_ClickRow, 2].Value = "146";
-                        MessageBox.Show("样品 背景灰度最小值 错误,请重新输入!", "错误提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                        MessageBox.Show("The minimum background gray value of the sample is wrong, please re-enter!", "Error Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
                         return false;
                     }
                     break;
@@ -980,7 +980,7 @@ namespace OTSMeasureApp
                     if (false == rg_zzs_hl.Match(in_str.Trim()).Success)
                     {
                         m_SampleGrid.m_PropWindow.PropGrid[m_SampleGrid.m_ClickRow, 2].Value = "255";
-                        MessageBox.Show("样品 背景灰度最大值 错误,请重新输入!", "错误提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                        MessageBox.Show("The maximum background gray value of the sample is wrong, please re-enter!", "Error Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
                         return false;
                     }
                     break;
@@ -989,7 +989,7 @@ namespace OTSMeasureApp
                     if (false == rg_zzs_hl.Match(in_str.Trim()).Success)
                     {
                         m_SampleGrid.m_PropWindow.PropGrid[m_SampleGrid.m_ClickRow, 2].Value = "0";
-                        MessageBox.Show("样品 颗粒灰度最小值 错误,请重新输入!", "错误提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                        MessageBox.Show("The minimum gray value of the sample is wrong, please re-enter!", "Error Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
                         return false;
                     }
                     break;
@@ -998,7 +998,7 @@ namespace OTSMeasureApp
                     if (false == rg_zzs_hl.Match(in_str.Trim()).Success)
                     {
                         m_SampleGrid.m_PropWindow.PropGrid[m_SampleGrid.m_ClickRow, 2].Value = "145";
-                        MessageBox.Show("样品 颗粒灰度最大值 错误,请重新输入!", "错误提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                        MessageBox.Show("The maximum value of sample particle gray scale is wrong, please re-enter!", "Error Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
                         return false;
                     }
                     break;
@@ -1007,7 +1007,7 @@ namespace OTSMeasureApp
                     if (false == rg_zzs_bhl.Match(in_str.Trim()).Success)
                     {
                         m_SampleGrid.m_PropWindow.PropGrid[m_SampleGrid.m_ClickRow, 2].Value = "1000";
-                        MessageBox.Show("样品 分析x-ray时间 错误,请重新输入!", "错误提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                        MessageBox.Show("The analysis x-ray time of the sample is wrong, please re-enter!", "Error Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
                         return false;
                     }
                     break;
@@ -1016,7 +1016,7 @@ namespace OTSMeasureApp
                     if (false == rg_zzs_bhl.Match(in_str.Trim()).Success)
                     {
                         m_SampleGrid.m_PropWindow.PropGrid[m_SampleGrid.m_ClickRow, 2].Value = "1000";
-                        MessageBox.Show("样品 期望计数率 错误,请重新输入!", "错误提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                        MessageBox.Show("The expected count rate of the sample is wrong, please re-enter!", "Error Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
                         return false;
                     }
                     break;
@@ -1025,13 +1025,13 @@ namespace OTSMeasureApp
                     if (false == rg_zzs_bhl.Match(in_str.Trim()).Success)
                     {
                         m_SampleGrid.m_PropWindow.PropGrid[m_SampleGrid.m_ClickRow, 2].Value = "100";
-                        MessageBox.Show("样品 放大倍数 错误,请重新输入!", "错误提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                        MessageBox.Show("The magnification of sample is wrong, please input again!", "Error Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
                         return false;
                     }
                     if (Convert.ToInt32(in_str.Trim()) < 45)
                     {
                         m_SampleGrid.m_PropWindow.PropGrid[m_SampleGrid.m_ClickRow, 2].Value = "45";
-                        MessageBox.Show("样品 放大倍数 过小,请重新输入!", "错误提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                        MessageBox.Show("The magnification of the sample is too small, please re-enter!", "Error Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
                         return false;
                     }
                     break;
@@ -1041,7 +1041,7 @@ namespace OTSMeasureApp
                     if (false == rg_fds_bhl.Match(in_str.Trim()).Success)
                     {
                         m_SampleGrid.m_PropWindow.PropGrid[m_SampleGrid.m_ClickRow, 2].Value = "2";
-                        MessageBox.Show("样品 像素尺寸 错误,请重新输入!", "错误提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                        MessageBox.Show("The pixel size of the sample is wrong, please re-enter!", "Error Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
                         return false;
                     }
                     break;
@@ -1050,7 +1050,7 @@ namespace OTSMeasureApp
                     if (false == rg_zzs_bhl.Match(in_str.Trim()).Success)
                     {
                         m_SampleGrid.m_PropWindow.PropGrid[m_SampleGrid.m_ClickRow, 2].Value = "100";
-                        MessageBox.Show("样品 覆盖测量区域帧图数 错误,请重新输入!", "错误提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                        MessageBox.Show("The number of frames in the coverage measurement area of the sample is wrong, please re-enter!", "Error Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
                         return false;
                     }
                     break;
@@ -1059,7 +1059,7 @@ namespace OTSMeasureApp
                     if (false == rg_zzs_bhl.Match(in_str.Trim()).Success)
                     {
                         m_SampleGrid.m_PropWindow.PropGrid[m_SampleGrid.m_ClickRow, 2].Value = "100";
-                        MessageBox.Show("样品 覆盖测量区域帧图数 错误,请重新输入!", "错误提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                        MessageBox.Show("The number of completed frames of the sample is wrong, please re-enter!", "Error Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
                         return false;
                     }
                     break;
@@ -1068,7 +1068,7 @@ namespace OTSMeasureApp
                     if (false == rg_zzs_bhl.Match(in_str.Trim()).Success)
                     {
                         m_SampleGrid.m_PropWindow.PropGrid[m_SampleGrid.m_ClickRow, 2].Value = "100000";
-                        MessageBox.Show("样品 覆盖测量区域帧图数 错误,请重新输入!", "错误提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                        MessageBox.Show("The detection area of the sample is wrong, please re-enter!", "Error Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
                         return false;
                     }
                     break;
@@ -1077,7 +1077,7 @@ namespace OTSMeasureApp
                     if (false == rg_zzs_bhl.Match(in_str.Trim()).Success)
                     {
                         m_SampleGrid.m_PropWindow.PropGrid[m_SampleGrid.m_ClickRow, 2].Value = "100";
-                        MessageBox.Show("样品 覆盖测量区域帧图数 错误,请重新输入!", "错误提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                        MessageBox.Show("The detection area of the sample is wrong, please re-enter!", "Error Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
                         return false;
                     }
                     break;
@@ -1086,7 +1086,7 @@ namespace OTSMeasureApp
                     if (false == rg_zzs_bhl.Match(in_str.Trim()).Success)
                     {
                         m_SampleGrid.m_PropWindow.PropGrid[m_SampleGrid.m_ClickRow, 2].Value = "10000";
-                        MessageBox.Show("样品 覆盖测量区域帧图数 错误,请重新输入!", "错误提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                        MessageBox.Show("The particle area of the sample is wrong, please re-enter!", "Error Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
                         return false;
                     }
                     break;

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceGraphicsPanelFun.cs

@@ -810,7 +810,7 @@ namespace OTSMeasureApp
             string sDeleteSampleName = str1;
             sDeleteSampleName += sampleName;
             sDeleteSampleName += "  信息 ?";
-            if (DialogResult.OK == MessageBox.Show(sDeleteSampleName, "删除样品信息提示", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning))
+            if (DialogResult.OK == MessageBox.Show(sDeleteSampleName, "Delete sample information prompt", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning))
             {
                 return true;
             }

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceWindow.cs

@@ -3994,7 +3994,7 @@ namespace OTSMeasureApp
                                     }
                                     else
                                     {
-                                        MessageBox.Show("SEM当前位置已经超出样品台范围,无法移动!", "提示");
+                                        MessageBox.Show(table["message12"].ToString(), table["message11"].ToString());
                                         return;
                                     }
                                 }

OTSIncAMeasureApp/7-OTSProgMgrInfo/ProgMgrInfoForm.cs

@@ -876,7 +876,7 @@ namespace OTSMeasureApp
             //SaveInfoToProgMgrFile()
             if (false == m_cotsprogmgrparamfile.SaveInfoToProgMgrFile())
             {
-                log.Error("(OTSProgMgrInfoFun.SaveInfoToProgMgrFile)  将参数保存到文件失败");
+                log.Error("(OTSProgMgrInfoFun.SaveInfoToProgMgrFile)  Failed to save parameters to file");
                 return false;
             }
             return true;
@@ -891,42 +891,42 @@ namespace OTSMeasureApp
             bool result = m_cotsprogmgrparamfile.LoadInfoFromProgMgrFile();
             if (!result)
             {
-                log.Error("(OTSProgMgrInfoFun.LoadParamFun)  LoadInfoFromProgMgrFile失败");
+                log.Error("(OTSProgMgrInfoFun.LoadParamFun)  LoadInfoFromProgMgrFile Failed");
                 return false;
             }
 
             m_csemstagedata = m_cotsprogmgrparamfile.GetStageDataParam();
             if (null == m_csemstagedata)
             {
-                log.Error("(OTSProgMgrInfoFun.LoadParamFun)  GetStageData失败");
+                log.Error("(OTSProgMgrInfoFun.LoadParamFun)  GetStageData Failed");
                 return false;
             }
 
             m_cotsimgscanprm = m_cotsprogmgrparamfile.GetImageScanParam();
             if (null == m_cotsimgscanprm)
             {
-                log.Error("(OTSProgMgrInfoFun.LoadParamFun)  GetImageScanParam失败");
+                log.Error("(OTSProgMgrInfoFun.LoadParamFun)  GetImageScanParam Failed");
                 return false;
             }
 
             m_cgenparam = m_cotsprogmgrparamfile.GetGenParam();
             if (null == m_cgenparam)
             {
-                log.Error("(OTSProgMgrInfoFun.LoadParamFun)  GetGenParam失败");
+                log.Error("(OTSProgMgrInfoFun.LoadParamFun)  GetGenParam Failed");
                 return false;
             }
 
             m_cotsimgprocprm = m_cotsprogmgrparamfile.GetImageProcParam();
             if (null == m_cotsimgprocprm)
             {
-                log.Error("(OTSProgMgrInfoFun.LoadParamFun)  GetImageProcParam失败");
+                log.Error("(OTSProgMgrInfoFun.LoadParamFun)  GetImageProcParam Failed");
                 return false;
             }
 
             m_cotsxrayprm = m_cotsprogmgrparamfile.GetXRayParam();
             if (null == m_cotsxrayprm)
             {
-                log.Error("(OTSProgMgrInfoFun.LoadParamFun)  GetXRayParam失败");
+                log.Error("(OTSProgMgrInfoFun.LoadParamFun)  GetXRayParam Failed");
                 return false;
             }
 
@@ -1056,14 +1056,14 @@ namespace OTSMeasureApp
             if (m_cstagefile == null)
             {
                 //报错
-                log.Error("(OTSProgMgrInfoFun.CStageFileClrSave) 保存样品台信息出错!");
+                log.Error("(OTSProgMgrInfoFun.CStageFileClrSave) Error saving sample station information!");
             }
             else
             {
                 bool b_ret = m_cstagefile.Save();
                 if (false == b_ret)
                 {
-                    log.Error("(OTSProgMgrInfoFun.CStageFileClrSave) 保存样品台信息出错!");
+                    log.Error("(OTSProgMgrInfoFun.CStageFileClrSave) Error saving sample table information!");
                 }
             }
             return false;
@@ -1165,7 +1165,7 @@ namespace OTSMeasureApp
             if ("" == IDC_EDIT_STOP_FIELD_NUM.Text)
             {
                 string message = table["message8"].ToString();
-                MessageBox.Show("终止帧图数不能为空", "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                MessageBox.Show(message, "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
                 IDC_EDIT_STOP_FIELD_NUM.Focus();
                 IDC_EDIT_STOP_FIELD_NUM.SelectAll();
                 return false;
@@ -1295,7 +1295,8 @@ namespace OTSMeasureApp
 
             if ("" == tBMeasArea.Text)
             {
-                MessageBox.Show("输入的测量区域面积不可以为空!", "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                string message = table["message62"].ToString();
+                MessageBox.Show(message, "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
                 tBMeasArea.Focus();
                 tBMeasArea.SelectAll();
                 return false;
@@ -1505,7 +1506,7 @@ namespace OTSMeasureApp
             {
                 tBMeasArea.Focus();
                 tBMeasArea.SelectAll();
-                MessageBox.Show("请输入正确的数值格式!", "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                MessageBox.Show("Please enter the correct value format!", "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
                 return false;
             }
 
@@ -1527,7 +1528,7 @@ namespace OTSMeasureApp
             {
                 IDC_EDIT_MINMAG.Focus();
                 IDC_EDIT_MINMAG.SelectAll();
-                string message = "最小放大倍数不可以小于45倍";
+                string message = "The minimum magnification cannot be less than 45 times";
                 MessageBox.Show(message, "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
                 return false;
             }
@@ -1635,7 +1636,7 @@ namespace OTSMeasureApp
         {
             if (!m_cstagefile.Save())
             {
-                log.Error("(OTSProgMgrInfoFun.StageLoad)  保存样品台信息失败");
+                log.Error("(OTSProgMgrInfoFun.StageLoad)  Failed to save sample station information!");
                 return false;
             }
             return true;

OTSIncAMeasureApp/7-OTSProgMgrInfo/Stage/DlgStageMgr.cs

@@ -157,7 +157,7 @@ namespace OTSModelSharp.Measure.GetStageInfo
         {
             loger.Info("OnClickedBtnDel: the selected stage will be deleted.");
 
-            if (DialogResult.Cancel == MessageBox.Show("确定删除该样品台吗？", "警告", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning))
+            if (DialogResult.Cancel == MessageBox.Show("Are you sure to delete this sample station?", "Warning", MessageBoxButtons.OKCancel, MessageBoxIcon.Warning))
             {
                 loger.Info("OnClickedBtnDel: user cancled.");
                 return;

OTSIncAMeasureApp/7-OTSProgMgrInfo/Stage/DlgStageRename.cs

@@ -36,7 +36,7 @@ namespace OTSModelSharp.Measure.GetStageInfo
             //校验不允许输入空字符串和空格
             if (cstr == "")
             {
-                MessageBox.Show("输入的样品台名不可以为空!","提示", MessageBoxButtons.OK);
+                MessageBox.Show("The sample station name entered cannot be empty!", "Tip", MessageBoxButtons.OK);
                 return;
             }
             m_sEditName = cstr;

OTSIncAMeasureApp/Program.cs

@@ -21,7 +21,7 @@ namespace OTSMeasureApp
             //第三个参数:返回值,如果调用线程已被授予互斥体的初始所属权,则返回true  
             if (!flag)
             {
-                MessageBox.Show("只能运行一个测量程序！", "请确定", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
+                MessageBox.Show("Only one measurement program can be run!", "please confirm", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
                 Environment.Exit(0);//退出程序  
             }
 

OTSIncAReportApp/1-UI/Control_Grids/ParticlesGridDevidePage.cs

@@ -81,8 +81,6 @@ namespace OTSIncAReportGrids
 		DataTable particlesAll;
         ParticleData Particledata;
 
-        private string m_filename = "";
-
         #region 分页器相关
 
         #region 分页字段和属性