添加部分中英文

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

@@ -1144,6 +1144,19 @@
 	  <Control name="m_DefaultSampleName" text="sample" />
 	  <Control name="message1" text="Are you sure you want to delete it?" />
     </Controls>
+ </Form>
+ <Form>
+    <Name>DlgStageEdit</Name>
+    <Controls>
+      <Control name="str1" text="HoleName" />
+	  <Control name="str2" text="HoleShape" />
+	  <Control name="str3" text="Center X coordinate" />
+	  <Control name="str4" text="Center Y coordinate" />
+	  <Control name="str5" text="WidthorDiameter" />
+	  <Control name="str6" text="Heightor0" />
+	  <Control name="m_DefaultSampleName" text="sample" />
+	  <Control name="message1" text="Are you sure you want to delete it?" />
+    </Controls>
  </Form>
   <Form>
     <Name>OTSPropertyWindow</Name>

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

@@ -1140,6 +1140,19 @@
 	  <Control name="message1" text="是否确定删除？" />
     </Controls>
  </Form>
+ <Form>
+    <Name>DlgStageEdit</Name>
+    <Controls>
+      <Control name="str1" text="样品孔名称" />
+	  <Control name="str2" text="样品孔形状" />
+	  <Control name="str3" text="中心x坐标" />
+	  <Control name="str4" text="中心y坐标" />
+	  <Control name="str5" text="宽度或直径" />
+	  <Control name="str6" text="高度或0" />
+	  <Control name="m_DefaultSampleName" text="样品" />
+	  <Control name="message1" text="是否确定删除？" />
+    </Controls>
+ </Form>
  <Form>
     <Name>OTSPropertyWindow</Name>
     <Controls>

OTS.sln

@@ -5,7 +5,6 @@ VisualStudioVersion = 16.0.31229.75
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OTSSysMgrApp", "OTSSysMgrApp\OTSSysMgrApp.csproj", "{3FBF0B16-5E6C-4AA1-995B-471C47C5367D}"
 	ProjectSection(ProjectDependencies) = postProject
-		{BA8F9918-E809-4957-99D3-B2CD823BB236} = {BA8F9918-E809-4957-99D3-B2CD823BB236}
 		{3B7695AA-8231-45AC-B493-84390A945D02} = {3B7695AA-8231-45AC-B493-84390A945D02}
 	EndProjectSection
 EndProject

OTSIncAMeasureApp/7-OTSProgMgrInfo/Stage/DlgStageEdit.cs

@@ -20,6 +20,8 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
         CStageParam m_pStageFile;
         public CStage m_pStage;
         StageDisplayHelp stageDisplayHelp;
+        OTSSysMgrTools.Language lan;
+        System.Collections.Hashtable hashtable;
         public DlgStageEdit()
         {
             InitializeComponent();
@@ -33,20 +35,30 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
         ComboBox cmb_Temp = new ComboBox();
         private void DlgStageEdit_Load(object sender, EventArgs e)
         {
+            lan = new OTSSysMgrTools.Language(this);
+            hashtable = lan.GetNameTable(this.Name);
             radioButton_OTS.Checked = true;
             radioButton_BoundarySquare.Checked = true;
             radioButton_StandardsampleSqare.Checked = true;
-            dataGridView_Holes.Columns.Add("HoleName", "样品孔名称");
-            dataGridView_Holes.Columns.Add("HoleShape", "样品孔形状");
-            dataGridView_Holes.Columns.Add("CenterCoordinatesX", "中心x坐标");
-            dataGridView_Holes.Columns.Add("CenterCoordinatesY", "中心y坐标");
-            dataGridView_Holes.Columns.Add("Param1", "宽度或直径");
-            dataGridView_Holes.Columns.Add("Param2", "高度或0");
-            dataGridView_Holes.Rows.Add("1", "圆形", -4250, -16000, 12000, 0);
+            string str = hashtable["str1"].ToString();
+            dataGridView_Holes.Columns.Add("HoleName", str);
+            str = hashtable["str2"].ToString();
+            dataGridView_Holes.Columns.Add("HoleShape", str);
+            str = hashtable["str3"].ToString();
+            dataGridView_Holes.Columns.Add("CenterCoordinatesX", str);
+            str = hashtable["str4"].ToString();
+            dataGridView_Holes.Columns.Add("CenterCoordinatesY", str);
+            str = hashtable["str5"].ToString();
+            dataGridView_Holes.Columns.Add("Param1", str);
+            str = hashtable["str6"].ToString();
+            dataGridView_Holes.Columns.Add("Param2", str);
+            str = hashtable["str7"].ToString();
+            dataGridView_Holes.Rows.Add("1", str, -4250, -16000, 12000, 0);
             //SetDataGridViewStyle();
             cmb_Temp.Visible = false;
-            cmb_Temp.Items.Add("圆形");
-            cmb_Temp.Items.Add("方形");
+            cmb_Temp.Items.Add(str);
+            str = hashtable["str8"].ToString();
+            cmb_Temp.Items.Add(str);
             cmb_Temp.SelectedIndexChanged += new EventHandler(cmb_Temp_SelectedIndexChanged);
             dataGridView_Holes.Controls.Add(cmb_Temp);
             stageDisplayHelp = new StageDisplayHelp();
@@ -66,6 +78,7 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
         }
         void SetHelp()
         {
+            string str = hashtable["str9"].ToString();
             helpProvider1.SetHelpString(label1, "样品台名不能为空字串，不能含\',\'字符!");
             helpProvider1.SetHelpString(groupBox1, "样品台边框行有5个数值参数。形状参数，中心x坐标，中心y坐标，宽度或直径，高度或0");
             helpProvider1.SetHelpString(groupBox2, "标样信息行有5个数值参数。形状参数，中心x坐标，中心y坐标，宽度或直径，高度或0");
@@ -182,7 +195,7 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
                 cmb_Temp.Top = rect.Top;
                 cmb_Temp.Width = rect.Width;
                 cmb_Temp.SelectedIndex = 0;
-                cmb_Temp.Visible = true;
+                cmb_Temp.Visible = true;   
             }
             else
             {