报告程序中英文（界面已没有未转换语言和提示）20211201

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

@@ -262,9 +262,25 @@
     <Controls>
       <Control name="Triangulation_List" text="Ternary phase diagram template list" />
 	  <Control name="button1" text="add" />
-	
 	  <Control name="button2" text="close" />
-	
+    </Controls>
+ </Form>
+   <Form>
+    <Name>Triangulation_Edit</Name>
+    <Controls>
+      <Control name="Triangulation_Edit" text="Ternary phase diagram template editing" />
+    </Controls>
+ </Form>
+  <Form>
+    <Name>frmSampleImage</Name>
+    <Controls>
+      <Control name="GeneralParameters" text="General parameters" />
+    </Controls>
+ </Form>
+  <Form>
+    <Name>frmTables</Name>
+    <Controls>
+      <Control name="GeneralParameters" text="General parameters" />
     </Controls>
  </Form>
  <Form>
@@ -300,6 +316,13 @@
 	  <Control name="label6" text="TemplateFolder" />
 	  <Control name="groupBox8" text="TemplateFile" />
 	  <Control name="frmReportSysConfig" text="ProgramManagement" />
+	  <Control name="cb_PERP" text="Orthogonal diameter" />
+	  <Control name="cb_PERI" text="Perimeter" />
+	  <Control name="cb_INSCR" text="Inscribed circle diameter" />
+	  <Control name="cb_MEAN" text="Average diameter of inscribed circle" />
+	  <Control name="cb_ELONG" text="Expansion length" />
+	  <Control name="cb_ASPECT_ELONG" text="Expanded aspect ratio" />
+	  <Control name="cb_Orientation" text="Orientation angle" />
     </Controls>
  </Form>
  <Form>

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

@@ -258,9 +258,25 @@
     <Controls>
       <Control name="Triangulation_List" text="三元相图模板列表" />
 	  <Control name="button1" text="添  加" />
-
 	  <Control name="button2" text="返  回" />
-	 
+    </Controls>
+ </Form>
+  <Form>
+    <Name>Triangulation_Edit</Name>
+    <Controls>
+      <Control name="Triangulation_Edit" text="三元相图模板编辑" />
+    </Controls>
+ </Form>
+  <Form>
+    <Name>frmSampleImage</Name>
+    <Controls>
+      <Control name="GeneralParameters" text="常规参数" />
+    </Controls>
+ </Form>
+  <Form>
+    <Name>frmTables</Name>
+    <Controls>
+      <Control name="GeneralParameters" text="常规参数" />
     </Controls>
  </Form>
 <Form>
@@ -296,6 +312,13 @@
 	  <Control name="label6" text="文件夹" />
 	  <Control name="groupBox8" text="报告导出模板设置" />
 	  <Control name="frmReportSysConfig" text="程序管理" />
+	  <Control name="cb_PERP" text="正交直径um" />
+	  <Control name="cb_PERI" text="周长um" />
+	  <Control name="cb_INSCR" text="内接圆直径um" />
+	  <Control name="cb_MEAN" text="内接圆平均直径" />
+	  <Control name="cb_ELONG" text="展开长度um" />
+	  <Control name="cb_ASPECT_ELONG" text="展开长宽比" />
+	  <Control name="cb_Orientation" text="朝向角度°" />
     </Controls>
  </Form>
 <Form>

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

@@ -1,4 +1,4 @@
 <?xml version="1.0" standalone="yes"?>
 <Language>
-  <DefaultLanguage>ZH</DefaultLanguage>
+  <DefaultLanguage>EN</DefaultLanguage>
 </Language>

OTSIncAReportApp/1-UI/OTSMgrInfo/Triangulation_List.cs

@@ -104,7 +104,7 @@ namespace OTSIncAReportApp.OTSMgrInfo
             {
                 //先删除，dt表中的记录，然后再删除clr对应底层中的数据
 
-                if (MessageBox.Show("确定是否要删除该三元相图模板选项？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+                if (MessageBox.Show("Are you sure you want to delete the ternary phase diagram template option？", "Tips", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
                 {
                     if (str_mobanid != "")
                     {
@@ -113,11 +113,11 @@ namespace OTSIncAReportApp.OTSMgrInfo
                         int ret = XMLoperate.DeleteByAttribute(pathe, "TemplateId", str_mobanid);
                         if (ret == 1)
                         {
-                            MessageBox.Show("删除成功！");
+                            MessageBox.Show("Delete succeeded！");
                         }
                         else
                         {
-                            MessageBox.Show("保存失败！");
+                            MessageBox.Show("Save failed！");
                         }
                     }
 

OTSIncAReportApp/1-UI/OTSMgrInfo/frmPartSizeEditorNew.cs

@@ -128,7 +128,7 @@ namespace OTSIncAReportApp
                 return false;
             }
 
-            string tipstr = "粒级值输入错误，请输入粒级的阶段，中间使用“,”号进行分隔，例如：\r\n “1,5,10,15,20,30,40,50” \r\n或可带有小数,例如: \r\n “0.5,1.0,2.22,5.55,8.55,10.33,15,30,40” \r\n如果出现错误，请详细检查输入的格式是否正确，\r\n符号“,”与“.”的输入法是否为英文，及是否半角格式。";
+            string tipstr = "The input of particle size value is wrong. Please enter the phase of particle size, separated by “,” in the middle, for example: \r\n “1,5,10,15,20,30,40,50” \r\nor can it contain decimal points, for example:\r\n “0.5,1.0,2.22,5.55,8.55,10.33,15,30,40” \r\n IF there is an error, please check whether the input format is correct, and whether the input methods of symbols “,” and “.” are in English, And whether half width format.";
             //粒级值判断
             if (tb_ljz.Text == "")
             {

OTSIncAReportApp/1-UI/OTSMgrInfo/frmReportSysConfig.Designer.cs

@@ -132,7 +132,7 @@ namespace OTSIncAReprotCharts
             this.comboBox6.FormattingEnabled = true;
             this.comboBox6.Location = new System.Drawing.Point(88, 128);
             this.comboBox6.Name = "comboBox6";
-            this.comboBox6.Size = new System.Drawing.Size(227, 26);
+            this.comboBox6.Size = new System.Drawing.Size(227, 20);
             this.comboBox6.TabIndex = 1;
             // 
             // comboBox5
@@ -140,7 +140,7 @@ namespace OTSIncAReprotCharts
             this.comboBox5.FormattingEnabled = true;
             this.comboBox5.Location = new System.Drawing.Point(88, 174);
             this.comboBox5.Name = "comboBox5";
-            this.comboBox5.Size = new System.Drawing.Size(227, 26);
+            this.comboBox5.Size = new System.Drawing.Size(227, 20);
             this.comboBox5.TabIndex = 1;
             // 
             // comboBox4
@@ -148,14 +148,14 @@ namespace OTSIncAReprotCharts
             this.comboBox4.FormattingEnabled = true;
             this.comboBox4.Location = new System.Drawing.Point(88, 223);
             this.comboBox4.Name = "comboBox4";
-            this.comboBox4.Size = new System.Drawing.Size(227, 26);
+            this.comboBox4.Size = new System.Drawing.Size(227, 20);
             this.comboBox4.TabIndex = 1;
             // 
             // textBox9
             // 
             this.textBox9.Location = new System.Drawing.Point(88, 81);
             this.textBox9.Name = "textBox9";
-            this.textBox9.Size = new System.Drawing.Size(227, 28);
+            this.textBox9.Size = new System.Drawing.Size(227, 21);
             this.textBox9.TabIndex = 1;
             // 
             // button18
@@ -199,18 +199,21 @@ namespace OTSIncAReprotCharts
             this.groupBox3.Controls.Add(this.btn_PartSize);
             this.groupBox3.Controls.Add(this.tb_PartiSizeFileFolder);
             this.groupBox3.Controls.Add(this.label4);
-            this.groupBox3.Location = new System.Drawing.Point(12, 12);
+            this.groupBox3.Location = new System.Drawing.Point(8, 8);
+            this.groupBox3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Size = new System.Drawing.Size(752, 64);
+            this.groupBox3.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.groupBox3.Size = new System.Drawing.Size(501, 43);
             this.groupBox3.TabIndex = 0;
             this.groupBox3.TabStop = false;
             this.groupBox3.Text = "粒级设置";
             // 
             // btn_PartSize
             // 
-            this.btn_PartSize.Location = new System.Drawing.Point(694, 26);
+            this.btn_PartSize.Location = new System.Drawing.Point(463, 17);
+            this.btn_PartSize.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.btn_PartSize.Name = "btn_PartSize";
-            this.btn_PartSize.Size = new System.Drawing.Size(50, 28);
+            this.btn_PartSize.Size = new System.Drawing.Size(33, 19);
             this.btn_PartSize.TabIndex = 4;
             this.btn_PartSize.Text = "...";
             this.btn_PartSize.UseVisualStyleBackColor = true;
@@ -219,41 +222,46 @@ namespace OTSIncAReprotCharts
             // tb_PartiSizeFileFolder
             // 
             this.tb_PartiSizeFileFolder.Enabled = false;
-            this.tb_PartiSizeFileFolder.Location = new System.Drawing.Point(188, 26);
+            this.tb_PartiSizeFileFolder.Location = new System.Drawing.Point(125, 17);
+            this.tb_PartiSizeFileFolder.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.tb_PartiSizeFileFolder.Name = "tb_PartiSizeFileFolder";
-            this.tb_PartiSizeFileFolder.Size = new System.Drawing.Size(502, 28);
+            this.tb_PartiSizeFileFolder.Size = new System.Drawing.Size(336, 21);
             this.tb_PartiSizeFileFolder.TabIndex = 3;
             // 
             // label4
             // 
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(15, 32);
+            this.label4.Location = new System.Drawing.Point(10, 21);
+            this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(62, 18);
+            this.label4.Size = new System.Drawing.Size(41, 12);
             this.label4.TabIndex = 2;
             this.label4.Text = "文件夹";
             // 
             // tb_sjtmbwj
             // 
             this.tb_sjtmbwj.Enabled = false;
-            this.tb_sjtmbwj.Location = new System.Drawing.Point(188, 56);
+            this.tb_sjtmbwj.Location = new System.Drawing.Point(125, 37);
+            this.tb_sjtmbwj.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.tb_sjtmbwj.Name = "tb_sjtmbwj";
-            this.tb_sjtmbwj.Size = new System.Drawing.Size(500, 28);
+            this.tb_sjtmbwj.Size = new System.Drawing.Size(335, 21);
             this.tb_sjtmbwj.TabIndex = 3;
             // 
             // tb_sjtmb
             // 
             this.tb_sjtmb.Enabled = false;
-            this.tb_sjtmb.Location = new System.Drawing.Point(188, 21);
+            this.tb_sjtmb.Location = new System.Drawing.Point(125, 14);
+            this.tb_sjtmb.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.tb_sjtmb.Name = "tb_sjtmb";
-            this.tb_sjtmb.Size = new System.Drawing.Size(558, 28);
+            this.tb_sjtmb.Size = new System.Drawing.Size(373, 21);
             this.tb_sjtmb.TabIndex = 3;
             // 
             // btn_ybcsqx
             // 
-            this.btn_ybcsqx.Location = new System.Drawing.Point(666, 478);
+            this.btn_ybcsqx.Location = new System.Drawing.Point(444, 319);
+            this.btn_ybcsqx.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.btn_ybcsqx.Name = "btn_ybcsqx";
-            this.btn_ybcsqx.Size = new System.Drawing.Size(100, 33);
+            this.btn_ybcsqx.Size = new System.Drawing.Size(67, 22);
             this.btn_ybcsqx.TabIndex = 76;
             this.btn_ybcsqx.Text = "取  消";
             this.btn_ybcsqx.UseVisualStyleBackColor = true;
@@ -261,9 +269,10 @@ namespace OTSIncAReprotCharts
             // 
             // btn_ybcsbc
             // 
-            this.btn_ybcsbc.Location = new System.Drawing.Point(527, 478);
+            this.btn_ybcsbc.Location = new System.Drawing.Point(351, 319);
+            this.btn_ybcsbc.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.btn_ybcsbc.Name = "btn_ybcsbc";
-            this.btn_ybcsbc.Size = new System.Drawing.Size(100, 33);
+            this.btn_ybcsbc.Size = new System.Drawing.Size(67, 22);
             this.btn_ybcsbc.TabIndex = 77;
             this.btn_ybcsbc.Text = "确   定";
             this.btn_ybcsbc.UseVisualStyleBackColor = true;
@@ -271,9 +280,10 @@ namespace OTSIncAReprotCharts
             // 
             // btn_sjtmbwj
             // 
-            this.btn_sjtmbwj.Location = new System.Drawing.Point(694, 56);
+            this.btn_sjtmbwj.Location = new System.Drawing.Point(463, 37);
+            this.btn_sjtmbwj.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.btn_sjtmbwj.Name = "btn_sjtmbwj";
-            this.btn_sjtmbwj.Size = new System.Drawing.Size(50, 28);
+            this.btn_sjtmbwj.Size = new System.Drawing.Size(33, 19);
             this.btn_sjtmbwj.TabIndex = 4;
             this.btn_sjtmbwj.Text = "...";
             this.btn_sjtmbwj.UseVisualStyleBackColor = true;
@@ -282,18 +292,20 @@ namespace OTSIncAReprotCharts
             // label17
             // 
             this.label17.AutoSize = true;
-            this.label17.Location = new System.Drawing.Point(15, 62);
+            this.label17.Location = new System.Drawing.Point(10, 41);
+            this.label17.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label17.Name = "label17";
-            this.label17.Size = new System.Drawing.Size(44, 18);
+            this.label17.Size = new System.Drawing.Size(29, 12);
             this.label17.TabIndex = 2;
             this.label17.Text = "文件";
             // 
             // label5
             // 
             this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(15, 28);
+            this.label5.Location = new System.Drawing.Point(10, 19);
+            this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(62, 18);
+            this.label5.Size = new System.Drawing.Size(41, 12);
             this.label5.TabIndex = 2;
             this.label5.Text = "文件夹";
             // 
@@ -304,27 +316,31 @@ namespace OTSIncAReprotCharts
             this.groupBox6.Controls.Add(this.tb_sjtmbwj);
             this.groupBox6.Controls.Add(this.btn_sjtmbwj);
             this.groupBox6.Controls.Add(this.label17);
-            this.groupBox6.Location = new System.Drawing.Point(12, 82);
+            this.groupBox6.Location = new System.Drawing.Point(8, 55);
+            this.groupBox6.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.groupBox6.Name = "groupBox6";
-            this.groupBox6.Size = new System.Drawing.Size(752, 98);
+            this.groupBox6.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.groupBox6.Size = new System.Drawing.Size(501, 65);
             this.groupBox6.TabIndex = 1;
             this.groupBox6.TabStop = false;
             this.groupBox6.Text = "三元相图模板设置";
             // 
             // tb_blyz
             // 
-            this.tb_blyz.Location = new System.Drawing.Point(188, 21);
+            this.tb_blyz.Location = new System.Drawing.Point(125, 14);
+            this.tb_blyz.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.tb_blyz.Name = "tb_blyz";
-            this.tb_blyz.Size = new System.Drawing.Size(560, 28);
+            this.tb_blyz.Size = new System.Drawing.Size(375, 21);
             this.tb_blyz.TabIndex = 1;
             this.tb_blyz.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.tb_blyz_KeyPress);
             // 
             // label22
             // 
             this.label22.AutoSize = true;
-            this.label22.Location = new System.Drawing.Point(15, 32);
+            this.label22.Location = new System.Drawing.Point(10, 21);
+            this.label22.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label22.Name = "label22";
-            this.label22.Size = new System.Drawing.Size(80, 18);
+            this.label22.Size = new System.Drawing.Size(53, 12);
             this.label22.TabIndex = 0;
             this.label22.Text = "比例因子";
             // 
@@ -354,9 +370,11 @@ namespace OTSIncAReprotCharts
             this.groupBox2.Controls.Add(this.btn_xsys);
             this.groupBox2.Controls.Add(this.tb_blyz);
             this.groupBox2.Controls.Add(this.label22);
-            this.groupBox2.Location = new System.Drawing.Point(12, 186);
+            this.groupBox2.Location = new System.Drawing.Point(8, 124);
+            this.groupBox2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(754, 285);
+            this.groupBox2.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.groupBox2.Size = new System.Drawing.Size(503, 190);
             this.groupBox2.TabIndex = 85;
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "显示信息设置";
@@ -364,9 +382,10 @@ namespace OTSIncAReprotCharts
             // cb_ELONG
             // 
             this.cb_ELONG.AutoSize = true;
-            this.cb_ELONG.Location = new System.Drawing.Point(382, 209);
+            this.cb_ELONG.Location = new System.Drawing.Point(324, 89);
+            this.cb_ELONG.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cb_ELONG.Name = "cb_ELONG";
-            this.cb_ELONG.Size = new System.Drawing.Size(124, 22);
+            this.cb_ELONG.Size = new System.Drawing.Size(84, 16);
             this.cb_ELONG.TabIndex = 103;
             this.cb_ELONG.Text = "展开长度um";
             this.cb_ELONG.UseVisualStyleBackColor = true;
@@ -374,9 +393,10 @@ namespace OTSIncAReprotCharts
             // cb_PERI
             // 
             this.cb_PERI.AutoSize = true;
-            this.cb_PERI.Location = new System.Drawing.Point(382, 171);
+            this.cb_PERI.Location = new System.Drawing.Point(185, 114);
+            this.cb_PERI.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cb_PERI.Name = "cb_PERI";
-            this.cb_PERI.Size = new System.Drawing.Size(88, 22);
+            this.cb_PERI.Size = new System.Drawing.Size(60, 16);
             this.cb_PERI.TabIndex = 101;
             this.cb_PERI.Text = "周长um";
             this.cb_PERI.UseVisualStyleBackColor = true;
@@ -384,9 +404,10 @@ namespace OTSIncAReprotCharts
             // cb_EquivalentCircleDiameter
             // 
             this.cb_EquivalentCircleDiameter.AutoSize = true;
-            this.cb_EquivalentCircleDiameter.Location = new System.Drawing.Point(382, 134);
+            this.cb_EquivalentCircleDiameter.Location = new System.Drawing.Point(85, 139);
+            this.cb_EquivalentCircleDiameter.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cb_EquivalentCircleDiameter.Name = "cb_EquivalentCircleDiameter";
-            this.cb_EquivalentCircleDiameter.Size = new System.Drawing.Size(142, 22);
+            this.cb_EquivalentCircleDiameter.Size = new System.Drawing.Size(96, 16);
             this.cb_EquivalentCircleDiameter.TabIndex = 100;
             this.cb_EquivalentCircleDiameter.Text = "等效圆直径um";
             this.cb_EquivalentCircleDiameter.UseVisualStyleBackColor = true;
@@ -394,9 +415,10 @@ namespace OTSIncAReprotCharts
             // cb_ASPECT_ELONG
             // 
             this.cb_ASPECT_ELONG.AutoSize = true;
-            this.cb_ASPECT_ELONG.Location = new System.Drawing.Point(589, 209);
+            this.cb_ASPECT_ELONG.Location = new System.Drawing.Point(326, 137);
+            this.cb_ASPECT_ELONG.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cb_ASPECT_ELONG.Name = "cb_ASPECT_ELONG";
-            this.cb_ASPECT_ELONG.Size = new System.Drawing.Size(124, 22);
+            this.cb_ASPECT_ELONG.Size = new System.Drawing.Size(84, 16);
             this.cb_ASPECT_ELONG.TabIndex = 99;
             this.cb_ASPECT_ELONG.Text = "展开长宽比";
             this.cb_ASPECT_ELONG.UseVisualStyleBackColor = true;
@@ -404,9 +426,10 @@ namespace OTSIncAReprotCharts
             // cb_Orientation
             // 
             this.cb_Orientation.AutoSize = true;
-            this.cb_Orientation.Location = new System.Drawing.Point(189, 248);
+            this.cb_Orientation.Location = new System.Drawing.Point(185, 139);
+            this.cb_Orientation.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cb_Orientation.Name = "cb_Orientation";
-            this.cb_Orientation.Size = new System.Drawing.Size(124, 22);
+            this.cb_Orientation.Size = new System.Drawing.Size(84, 16);
             this.cb_Orientation.TabIndex = 98;
             this.cb_Orientation.Text = "朝向角度°";
             this.cb_Orientation.UseVisualStyleBackColor = true;
@@ -414,9 +437,10 @@ namespace OTSIncAReprotCharts
             // cb_MEAN
             // 
             this.cb_MEAN.AutoSize = true;
-            this.cb_MEAN.Location = new System.Drawing.Point(189, 209);
+            this.cb_MEAN.Location = new System.Drawing.Point(85, 170);
+            this.cb_MEAN.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cb_MEAN.Name = "cb_MEAN";
-            this.cb_MEAN.Size = new System.Drawing.Size(160, 22);
+            this.cb_MEAN.Size = new System.Drawing.Size(108, 16);
             this.cb_MEAN.TabIndex = 97;
             this.cb_MEAN.Text = "内接圆平均直径";
             this.cb_MEAN.UseVisualStyleBackColor = true;
@@ -424,9 +448,10 @@ namespace OTSIncAReprotCharts
             // cb_INSCR
             // 
             this.cb_INSCR.AutoSize = true;
-            this.cb_INSCR.Location = new System.Drawing.Point(589, 171);
+            this.cb_INSCR.Location = new System.Drawing.Point(326, 112);
+            this.cb_INSCR.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cb_INSCR.Name = "cb_INSCR";
-            this.cb_INSCR.Size = new System.Drawing.Size(142, 22);
+            this.cb_INSCR.Size = new System.Drawing.Size(96, 16);
             this.cb_INSCR.TabIndex = 96;
             this.cb_INSCR.Text = "内接圆直径um";
             this.cb_INSCR.UseVisualStyleBackColor = true;
@@ -434,9 +459,10 @@ namespace OTSIncAReprotCharts
             // cb_PERP
             // 
             this.cb_PERP.AutoSize = true;
-            this.cb_PERP.Location = new System.Drawing.Point(189, 171);
+            this.cb_PERP.Location = new System.Drawing.Point(324, 64);
+            this.cb_PERP.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cb_PERP.Name = "cb_PERP";
-            this.cb_PERP.Size = new System.Drawing.Size(124, 22);
+            this.cb_PERP.Size = new System.Drawing.Size(84, 16);
             this.cb_PERP.TabIndex = 102;
             this.cb_PERP.Text = "正交直径um";
             this.cb_PERP.UseVisualStyleBackColor = true;
@@ -444,9 +470,10 @@ namespace OTSIncAReprotCharts
             // cb_FerretDiameter
             // 
             this.cb_FerretDiameter.AutoSize = true;
-            this.cb_FerretDiameter.Location = new System.Drawing.Point(589, 134);
+            this.cb_FerretDiameter.Location = new System.Drawing.Point(185, 89);
+            this.cb_FerretDiameter.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cb_FerretDiameter.Name = "cb_FerretDiameter";
-            this.cb_FerretDiameter.Size = new System.Drawing.Size(142, 22);
+            this.cb_FerretDiameter.Size = new System.Drawing.Size(96, 16);
             this.cb_FerretDiameter.TabIndex = 95;
             this.cb_FerretDiameter.Text = "费雷特直径um";
             this.cb_FerretDiameter.UseVisualStyleBackColor = true;
@@ -454,9 +481,10 @@ namespace OTSIncAReprotCharts
             // cb_DiameterRatio
             // 
             this.cb_DiameterRatio.AutoSize = true;
-            this.cb_DiameterRatio.Location = new System.Drawing.Point(189, 134);
+            this.cb_DiameterRatio.Location = new System.Drawing.Point(85, 89);
+            this.cb_DiameterRatio.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cb_DiameterRatio.Name = "cb_DiameterRatio";
-            this.cb_DiameterRatio.Size = new System.Drawing.Size(124, 22);
+            this.cb_DiameterRatio.Size = new System.Drawing.Size(84, 16);
             this.cb_DiameterRatio.TabIndex = 94;
             this.cb_DiameterRatio.Text = "长短直径比";
             this.cb_DiameterRatio.UseVisualStyleBackColor = true;
@@ -464,9 +492,10 @@ namespace OTSIncAReprotCharts
             // cb_MinDiameter
             // 
             this.cb_MinDiameter.AutoSize = true;
-            this.cb_MinDiameter.Location = new System.Drawing.Point(589, 99);
+            this.cb_MinDiameter.Location = new System.Drawing.Point(185, 66);
+            this.cb_MinDiameter.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cb_MinDiameter.Name = "cb_MinDiameter";
-            this.cb_MinDiameter.Size = new System.Drawing.Size(124, 22);
+            this.cb_MinDiameter.Size = new System.Drawing.Size(84, 16);
             this.cb_MinDiameter.TabIndex = 93;
             this.cb_MinDiameter.Text = "最短直径um";
             this.cb_MinDiameter.UseVisualStyleBackColor = true;
@@ -474,9 +503,10 @@ namespace OTSIncAReprotCharts
             // cb_MaxDiameter
             // 
             this.cb_MaxDiameter.AutoSize = true;
-            this.cb_MaxDiameter.Location = new System.Drawing.Point(382, 99);
+            this.cb_MaxDiameter.Location = new System.Drawing.Point(85, 114);
+            this.cb_MaxDiameter.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cb_MaxDiameter.Name = "cb_MaxDiameter";
-            this.cb_MaxDiameter.Size = new System.Drawing.Size(124, 22);
+            this.cb_MaxDiameter.Size = new System.Drawing.Size(84, 16);
             this.cb_MaxDiameter.TabIndex = 92;
             this.cb_MaxDiameter.Text = "最长直径um";
             this.cb_MaxDiameter.UseVisualStyleBackColor = true;
@@ -484,43 +514,48 @@ namespace OTSIncAReprotCharts
             // cb_Area
             // 
             this.cb_Area.AutoSize = true;
-            this.cb_Area.Location = new System.Drawing.Point(189, 99);
+            this.cb_Area.Location = new System.Drawing.Point(85, 66);
+            this.cb_Area.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.cb_Area.Name = "cb_Area";
-            this.cb_Area.Size = new System.Drawing.Size(97, 22);
+            this.cb_Area.Size = new System.Drawing.Size(66, 16);
             this.cb_Area.TabIndex = 91;
             this.cb_Area.Text = "面积um²";
             this.cb_Area.UseVisualStyleBackColor = true;
             // 
             // tb_xsys
             // 
-            this.tb_xsys.Location = new System.Drawing.Point(189, 57);
+            this.tb_xsys.Location = new System.Drawing.Point(125, 40);
+            this.tb_xsys.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.tb_xsys.Name = "tb_xsys";
-            this.tb_xsys.Size = new System.Drawing.Size(502, 28);
+            this.tb_xsys.Size = new System.Drawing.Size(336, 21);
             this.tb_xsys.TabIndex = 89;
             // 
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(16, 65);
+            this.label1.Location = new System.Drawing.Point(11, 43);
+            this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(80, 18);
+            this.label1.Size = new System.Drawing.Size(53, 12);
             this.label1.TabIndex = 87;
             this.label1.Text = "显示元素";
             // 
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(16, 99);
+            this.label2.Location = new System.Drawing.Point(11, 66);
+            this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(80, 18);
+            this.label2.Size = new System.Drawing.Size(53, 12);
             this.label2.TabIndex = 88;
             this.label2.Text = "显示类型";
             // 
             // btn_xsys
             // 
-            this.btn_xsys.Location = new System.Drawing.Point(699, 57);
+            this.btn_xsys.Location = new System.Drawing.Point(466, 38);
+            this.btn_xsys.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.btn_xsys.Name = "btn_xsys";
-            this.btn_xsys.Size = new System.Drawing.Size(50, 28);
+            this.btn_xsys.Size = new System.Drawing.Size(33, 19);
             this.btn_xsys.TabIndex = 90;
             this.btn_xsys.Text = "...";
             this.btn_xsys.UseVisualStyleBackColor = true;
@@ -528,9 +563,9 @@ namespace OTSIncAReprotCharts
             // 
             // frmReportSysConfig
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(782, 522);
+            this.ClientSize = new System.Drawing.Size(521, 348);
             this.Controls.Add(this.groupBox2);
             this.Controls.Add(this.groupBox6);
             this.Controls.Add(this.groupBox3);
@@ -538,6 +573,7 @@ namespace OTSIncAReprotCharts
             this.Controls.Add(this.btn_ybcsbc);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+            this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
             this.MaximizeBox = false;
             this.MinimizeBox = false;
             this.Name = "frmReportSysConfig";

OTSIncAReportApp/1-UI/frmSampleImage.cs

@@ -1,7 +1,9 @@
 using OTS.WinFormsUI.Docking;
 using OTSIncAReportApp.OTSDataMgrFunction;
 using OTSIncAReportApp.OTSSampleReportInfo;
+using OTSIncAReportApp.SysMgrTools;
 using System;
+using System.Collections;
 
 namespace OTSIncAReportApp
 {
@@ -12,6 +14,7 @@ namespace OTSIncAReportApp
     {
         #region 变量定义
         private frmReportApp m_ReportApp = null;
+        Hashtable table;
         #endregion
 
         #region 构造函数
@@ -19,6 +22,10 @@ namespace OTSIncAReportApp
         {
             InitializeComponent();
             m_ReportApp = ReportApp;
+            #region 国际化语言
+            Language lan = new Language(this);
+            table = lan.GetNameTable(this.Name);
+            #endregion
         }
         #endregion
 
@@ -27,7 +34,7 @@ namespace OTSIncAReportApp
         {
             OTSSourceGrid m_SampleImage = m_ReportApp.m_conditionChoose.m_ConditionGrid;
             m_SampleImage.InitGrid();
-            m_SampleImage.InitGroupTitle(0, "常规参数");
+            m_SampleImage.InitGroupTitle(0, table["generalparameters"].ToString());
 
 
             m_SampleImage.SetPictureType(DisplayPicutureType.AnalyzeImg);

OTSIncAReportApp/1-UI/frmTables.cs

@@ -1,7 +1,9 @@
 using OTS.WinFormsUI.Docking;
 using OTSIncAReportApp.OTSDataMgrFunction;
 using OTSIncAReportApp.OTSSampleReportInfo;
+using OTSIncAReportApp.SysMgrTools;
 using System;
+using System.Collections;
 
 namespace OTSIncAReportApp
 {
@@ -12,6 +14,7 @@ namespace OTSIncAReportApp
     {
         #region 变量定义
         private frmReportApp m_ReportApp = null;
+        Hashtable table;
         #endregion
 
         #region 构造函数
@@ -19,6 +22,10 @@ namespace OTSIncAReportApp
         {
             InitializeComponent();
             m_ReportApp = ReportApp;
+            #region 国际化语言
+            Language lan = new Language(this);
+            table = lan.GetNameTable(this.Name);
+            #endregion
         }
         #endregion
 
@@ -28,7 +35,7 @@ namespace OTSIncAReportApp
             OTSSourceGrid m_SampleGrid = m_ReportApp.m_conditionChoose.m_ConditionGrid;
 
             m_SampleGrid.InitGrid();
-            m_SampleGrid.InitGroupTitle(0, "常规参数");
+            m_SampleGrid.InitGroupTitle(0, table["generalparameters"].ToString());
 
             m_SampleGrid.SetPictureType(DisplayPicutureType.AnalyzeDataTable);
             m_ReportApp.m_conditionChoose.DisCurrentPicProperty();//先添加属性