中英文完善

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

@@ -1337,13 +1337,14 @@
     <Name>OTSMeasureStatusWindow</Name>
     <Controls>
       <Control name="SampleParaLock" text="GetBSEDiagram" />
-	  <Control name="ViewStripMenuItem" text="Set the visual gray range of BSE image" />
+	  <Control name="VisualAdjustingMenu" text="Set the visual gray range of BSE image" />
 	  <Control name="toolStripMenuItem1" text="Set the grayscale range of special particles for visualization" />
 	  <Control name="ChangeDiffImageShow" text="SwitchToBSE" />
 	  <Control name="ToolStripMenuItem" text="De-backgroundImage " />
+	  <Control name="ToolStripMenuItem2" text="De-backgroundcolorImage " />
 	  <Control name="grayToolStripMenuItem" text="DisplayB-GrayCurve" />
 	  <Control name="AbandonGrayStripMenuItem" text="DisplayBackground-freeGray-scaleCurve" />
-	  <Control name="MenuItemLineScam" text="LineScanningCurve" />
+	  <Control name="MenuItemLineScan" text="LineScanningCurve" />
 	  <Control name="PointScanElementMenuItem" text="PointScanElement" />
 	  <Control name="ExportScanInfoMenuItem" text="ExportScanInfo" />
 	  <Control name="message1" text="SwitchBSEDiagram" />
@@ -1385,6 +1386,7 @@
 	  <Control name="DriveSEMToCurrentLocation" text="DriveSEMToCurrentLocation" />
 	  <Control name="ShootBSEPicture" text="ShootBSEPicture" />
 	  <Control name="DeleteBSEPicture" text="DeleteBSEPicture" />
+	  <Control name="DeleteSampleData" text="DeleteTheTestedData" />
 	  <Control name="SlopFocusMenuItem" text="InclinedPlaneFocus" />
 	  <Control name="message1" text="Start acquiring frame information " />
 	  <Control name="message2" text="Error log" />
@@ -1407,6 +1409,16 @@
 	  <Control name="ShootBSEPicture2" text="MeasureMode" />
     </Controls>
  </Form>
+ <Form>
+    <Name>RingGdiDataInput</Name>
+    <Controls>
+      <Control name="RingGdiDataInput" text="RingConfiguration" />
+	  <Control name="label1" text="Enter the outer diameter(micron) :" />
+	  <Control name="label2" text="Enter the ring width (micron) :" />
+	  <Control name="button1" text="OK" />
+	  <Control name="button2" text="Cancel" />
+    </Controls>
+ </Form>
  <Form>
     <Name>SampleGrid</Name>
     <Controls>

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

@@ -1279,13 +1279,14 @@
     <Name>OTSMeasureStatusWindow</Name>
     <Controls>
       <Control name="SampleParaLock" text="获取BSE图" />
-	  <Control name="ViewStripMenuItem" text="设置BSE图可视化灰度范围" />
+	  <Control name="VisualAdjustingMenu" text="设置BSE图可视化灰度范围" />
 	  <Control name="toolStripMenuItem1" text="可视化设置特殊颗粒灰度范围" />
 	  <Control name="ChangeDiffImageShow" text="切换至BSE图" />
 	  <Control name="ToolStripMenuItem" text="BSE去背景图" />
+	  <Control name="ToolStripMenuItem2" text="BSE去背景彩色图" />
 	  <Control name="grayToolStripMenuItem" text="显示BSE灰度曲线图" />
 	  <Control name="AbandonGrayStripMenuItem" text="显示BSE去背景灰度曲线图" />
-	  <Control name="MenuItemLineScam" text="线扫描曲线" />
+	  <Control name="MenuItemLineScan" text="线扫描曲线" />
 	  <Control name="PointScanElementMenuItem" text="单点采集" />
 	  <Control name="ExportScanInfoMenuItem" text="导出采集信息" />
 	  <Control name="message1" text="切换显示至BSE图" />
@@ -1327,6 +1328,7 @@
 	  <Control name="DriveSEMToCurrentLocation" text="驱动SEM到当前位置" />
 	  <Control name="ShootBSEPicture" text="拍摄样品孔BSE照片" />
 	  <Control name="DeleteBSEPicture" text="删除BSE照片" />
+	  <Control name="DeleteSampleData" text="删除已测数据" />
 	  <Control name="SlopFocusMenuItem" text="斜面焦距" />
 	  <Control name="message1" text="开始获取帧图信息" />
 	  <Control name="message2" text="错误日志" />
@@ -1348,6 +1350,16 @@
       <Control name="ShootBSEPicture1" text="拍摄样品孔BSE照片" />
 	  <Control name="ShootBSEPicture2" text="拍摄测量区域BSE照片" />
     </Controls>
+ </Form>
+ <Form>
+    <Name>RingGdiDataInput</Name>
+    <Controls>
+      <Control name="RingGdiDataInput" text="环形配置" />
+	  <Control name="label1" text="请输入环形外径（微米）：" />
+	  <Control name="label2" text="请输入环形宽度（微米）：" />
+	  <Control name="button1" text="确定" />
+	  <Control name="button2" text="取消" />
+    </Controls>
  </Form>
   <Form>
     <Name>SampleGrid</Name>

OTSIncAMeasureApp/1-OTSMeasure/Measure/ParamData/DIALOG_CHECK_PARAM_RESULT.cs

@@ -64,9 +64,10 @@ namespace OTSModelSharp
           
             IDOK.Text = XmlResourceData.GetInstance().GetStringByKey(GrpOtherParam, DlgCheckParam_OKBtn);
 
-        
+            this.Text = XmlResourceData.GetInstance().GetStringByKey(GrpOtherParam, DlgCheckParam_Title);
             IDCANCEL.Text = XmlResourceData.GetInstance().GetStringByKey(GrpOtherParam, DlgCheckParam_CancelBtn);
 
+
           
         }
 

OTSIncAMeasureApp/1-OTSMeasure/OTSMeasureResultWindow.cs

@@ -11,10 +11,9 @@ using OTSModelSharp;
 
 namespace OTSMeasureApp
 {
+
     public partial class OTSMeasureResultWindow : DockContent
     {
-    
-
         #region 全局变量
         OTSIncAMeasureAppForm m_MeasureAppForm;
         //进度条最大值

OTSIncAMeasureApp/3-OTSDisplaySourceGridData/OTSPropertyWindow.cs

@@ -344,6 +344,7 @@ namespace OTSMeasureApp
             m_cgenparam.SetSTDSelect(WSample.GetMsrParams().GetSTDName().ToString());
             m_cotsprogmgrparamfile.SetGenParam(m_cgenparam);
             m_cotsprogmgrparamfile.SaveInfoToProgMgrFile();
+            MessageBox.Show("Done!","Tip");
         }
 
         private void TSEdit_Click(object sender, EventArgs e)

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceGraphicsPanelFun.cs

@@ -4,8 +4,6 @@ namespace OTSMeasureApp
 {
     public class OTSSamplespaceGraphicsPanelFun
     {
-      
-
         #region 根据颜色枚举 获取颜色值
         public static string GetColorValue(ColorType ColorEnum)
         {

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/RingGdiDataInput.Designer.cs

@@ -57,19 +57,21 @@ namespace OTSMeasureApp._4_OTSSamplespaceGraphicsPanel
             // 
             // txtDiameter
             // 
-            this.txtDiameter.Location = new System.Drawing.Point(190, 24);
+            this.txtDiameter.Location = new System.Drawing.Point(238, 30);
             this.txtDiameter.Name = "txtDiameter";
-            this.txtDiameter.Size = new System.Drawing.Size(123, 21);
+            this.txtDiameter.Size = new System.Drawing.Size(75, 21);
             this.txtDiameter.TabIndex = 1;
             this.txtDiameter.Text = "10000";
+            this.txtDiameter.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
             // txtWidth
             // 
-            this.txtWidth.Location = new System.Drawing.Point(190, 69);
+            this.txtWidth.Location = new System.Drawing.Point(238, 75);
             this.txtWidth.Name = "txtWidth";
-            this.txtWidth.Size = new System.Drawing.Size(123, 21);
+            this.txtWidth.Size = new System.Drawing.Size(75, 21);
             this.txtWidth.TabIndex = 1;
             this.txtWidth.Text = "1000";
+            this.txtWidth.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             // 
             // button1
             // 
@@ -105,6 +107,7 @@ namespace OTSMeasureApp._4_OTSSamplespaceGraphicsPanel
             this.Controls.Add(this.label2);
             this.Controls.Add(this.label1);
             this.Name = "RingGdiDataInput";
+            this.ShowIcon = false;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
             this.Text = "RingGdiDataInput";
             this.ResumeLayout(false);

OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/RingGdiDataInput.cs

@@ -1,4 +1,6 @@
-using System;
+using OTSCommon;
+using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -14,9 +16,13 @@ namespace OTSMeasureApp._4_OTSSamplespaceGraphicsPanel
     {
         public float Diameter;
         public float RingWidth;
+        Hashtable table;
+
         public RingGdiDataInput()
         {
             InitializeComponent();
+            Language lan = new Language(this);
+            table = lan.GetNameTable(this.Name);
         }
 
         private void button1_Click(object sender, EventArgs e)

OTSIncAMeasureApp/5-OTSMeasureStatuImageFun/Control_XRayTable.cs

@@ -6,7 +6,6 @@ using System.Windows.Forms;
 using System.Collections;
 using OTSPeriodicTable;
 
-
 namespace OTSIncAGraph.Controls
 {
     /// <summary>
@@ -45,6 +44,7 @@ namespace OTSIncAGraph.Controls
         float m_i_draw_start = 0;//整个界面绘制的起始点
         float m_i_draw_end = 1004;//整个界面绘制的边界
 
+
         //float m_Y_draw_start = 0;//Y轴的起始点
         //float m_Y_draw_Lenght = 10;//Y轴的刻度长度
         float m_Y_draw_TopDiff = 15;//Y轴距离顶部距离

OTSIncAMeasureApp/5-OTSMeasureStatuImageFun/OTSMeasureStatusWindow.cs

@@ -1,22 +1,19 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Windows.Forms;
-using OTS.WinFormsUI.Docking;
-using System.IO;
-
-
-using System.Reflection;
+using OTS.WinFormsUI.Docking;
 using OTSCLRINTERFACE;
-
-using System.Data;
-using System.Collections;
-using System.Drawing.Imaging;
+using OTSDataType;
 using OTSIncAGraph.Controls;
+using OTSMeasureApp._0_OTSModel.OTSDataType;
 using OTSModelSharp;
-using OTSDataType;
 using OTSModelSharp.ServiceCenter;
-using OTSMeasureApp._0_OTSModel.OTSDataType;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Data;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.IO;
+using System.Reflection;
+using System.Windows.Forms;
 //using OTSMeasureApp._0_OTSModel.Measure.ParamData;
 
 namespace OTSMeasureApp
@@ -158,14 +155,14 @@ namespace OTSMeasureApp
             m_ElementPointGDIObjects = new List<CRectangleGDIObject>();
 
 
-            if (OTSCommon.Language.ReadDefaultLanguage() == "ZH")
-            {
-                contextMenuStrip1.Items[(int)MeasureStateMenuType.ChangeDiffImageShow].Text = "显示至BSE原图";
-            }
-            else
-            {
-                contextMenuStrip1.Items[(int)MeasureStateMenuType.ChangeDiffImageShow].Text = "SwitchDisplayToBSEDiagram";
-            }
+            //if (OTSCommon.Language.ReadDefaultLanguage() == "ZH")
+            //{
+            //    contextMenuStrip1.Items[(int)MeasureStateMenuType.ChangeDiffImageShow].Text = "显示至BSE原图";
+            //}
+            //else
+            //{
+            //    contextMenuStrip1.Items[(int)MeasureStateMenuType.ChangeDiffImageShow].Text = "SwitchDisplayToBSEDiagram";
+            //}
 
             //进入时首先对XRayTable进行隐藏
             panelXray.Visible = false;

OTSIncAMeasureApp/5-OTSMeasureStatuImageFun/SlopFocus.Designer.cs

@@ -368,6 +368,7 @@ namespace OTSMeasureApp._5_OTSMeasureStatuImageFun
             this.MaximumSize = new System.Drawing.Size(596, 430);
             this.MinimumSize = new System.Drawing.Size(596, 430);
             this.Name = "SlopFocus";
+            this.ShowIcon = false;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "SlopFocus";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.SlopFocus_FormClosing);