报告程序中英文补充

Bin/x64/Debug/Config/ProData/HardwareConfig.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XMLData PathName="HardwareConfig.xml" ID="1">
-  <Member RegName="SemControllerName" Value="Bruker" ImageInputSources="SE" />
-  <Member RegName="EDSName" Value="Bruker" DelayQuantify="true" />
+  <Member RegName="SemControllerName" Value="OffLine" ImageInputSources="SE" />
+  <Member RegName="EDSName" Value="OffLine" DelayQuantify="true" />
   <Member RegName="BrukerDllVersion" Version="Bruker.API.Esprit64.dll" />
   <Member RegName="FEIIP" Value="192.168.0.1" />
   <Member RegName="FEIPORT" Value="7520" />

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

@@ -172,8 +172,25 @@
 	  <Control name="AnalysisDataSheet" text="Analysis data sheet" />
 	  <Control name="AnalysisDataChart" text="Analysis data chart" />
 	  
+	  <COntrol name="dpbTemplateEditing" text="Template Editing"/>
+	  
     </Controls>
  </Form>
+ 
+  <Form>
+	<Name>Category</Name>
+	<Controls>
+		<Control name="label1" text="Selected category:"/>
+		<Control name="label2" text="Database classification:"/>
+		<Control name="button1" text="Add"/>
+		<Control name="button2" text="Delete"/>
+		<Control name="button3" text="Save"/>
+		<Control name="button4" text="Exit"/>
+		<Control name="Category" text="Classification"/>
+	
+	</Controls>
+ </Form>
+ 
   <Form>
     <Name>frmPartSizeEditorNew</Name>
     <Controls>
@@ -411,14 +428,14 @@
 			<Control name="label8312" text="LOG icon"/>
 			<Control name="button1217" text="Select Picture"/>
 			<Control name="groupBox2" text="Remove information"/>
-			<Control name="label11111" text="Remove element information"/>
+			<Control name="label11111" text="ShieldingElements："/>
 			<Control name="button5" text="Select"/>
 			<Control name="label_delete_Class" text="Remove specified substance classification"/>
 			<Control name="label_zypxss" text="Main sorting display"/>
 			<Control name="label_cypxss" text="Secondary sorting display"/>
 			<Control name="groupBox3" text="Particle screening"/>
 			<Control name="ck_klcc_xsmk" text="particle size"/>
-			<Control name="ck_ysfx_xsmk" text="Elemental analysis"/>
+			<Control name="ck_ysfx_xsmk" text="Element parsing"/>
 			<Control name="ck_syxt_xsmk" text="Ternary diagram"/>
 			<Control name="ck_jzwzb_surface" text="Inclusion proportion"/>
 			<Control name="ck_kllb_xsmk" text="Particle List"/>
@@ -427,8 +444,8 @@
 			<Control name="label15" text="Particle size table"/>
 			<Control name="checkBox1" text="Classification chart"/>
 			<Control name="checkBox2" text="Subdivision chart"/>
-			<Control name="label112121" text="Particle display quantity"/>
-			<Control name="label2" text="Element selection settings"/>
+			<Control name="label112121" text="Display quantity"/>
+			<Control name="label2" text="Select Settings:"/>
 			<Control name="groupBox_px" text="Particle display sorting settings"/>
 			<Control name="ParticleList_1" text="Parameter 1"/>
 			<Control name="ParticleList_2" text="Parameter 2"/>
@@ -441,6 +458,15 @@
 			<Control name="button1" text="Save As"/>
 			<Control name="whole" text="All particles"/>
 			<Control name="select" text="Select particles"/>
+			<Control name="groupBox4" text="Specific selection"/>
+			<Control name="label7" text="Library:"/>
+			<Control name="button3" text="Select"/>
+			<Control name="button7" text="Exit"/>
+			<Control name="button4" text="Library:"/>
+			
+			<Control name="standardlibrary" text="Current standard library:"/>
+			
+
 		</Controls>
  </Form>
   <Form>
@@ -449,7 +475,7 @@
 		<Control name="FileNameSelect" text="File list" />
 		<Control name="button1" text="Confirm" />
 		<Control name="file_name" text="File name" />
-		
+		<Control name="button2" text="Exit" />
 	</Controls>
  
  </Form>
@@ -488,7 +514,7 @@
 		<Control name="label8312" text="LOG icon"/>
 		<Control name="button1217" text="Select Picture"/>
 		<Control name="groupBox2" text="Remove information"/>
-		<Control name="label11111" text="Remove element information"/>
+		<Control name="label11111" text="ShieldingElements："/>
 		<Control name="button5" text="select"/>
 		<Control name="label_delete_Class" text="Remove specified substance classification"/>
 		<Control name="label_zypxss" text="Main sorting display"/>
@@ -501,10 +527,10 @@
 		<Control name="ck_klcc_xsddt" text="Stacking diagram"/>
 		<Control name="checkBox1" text="classification chart"/>
 		<Control name="checkBox2" text="Subdivision chart"/>
-		<Control name="label112121" text="Number of particles"/>
+		<Control name="label112121" text="Display quantity"/>
 		<Control name="label14" text="Calculation method"/>
 		<Control name="label15" text="Grain size information"/>
-		<Control name="label2" text="Element selection settings"/>
+		<Control name="label2" text="Select Settings:"/>
 		<Control name="groupBox_px" text="Particle display sorting settings"/>
 		<Control name="ParticleList_1" text="Parameter 1"/>
 		<Control name="ParticleList_2" text="Parameter 2"/>
@@ -520,6 +546,15 @@
 		
 		<Control name="no_database" text="Database not found!"/>
 		<Control name="image_opened" text="The image has been opened！"/>
+		
+		<Control name="groupBox4" text="Specific selection"/>
+		<Control name="label7" text="Library:"/>
+	    <Control name="button3" text="Select"/>
+		<Control name="button4" text="Select"/>
+	    <Control name="button7" text="Exit"/>
+		
+		
+		<Control name="standardlibrary" text="Current standard library:"/>
 	</Controls>
  </Form>
  

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

@@ -170,8 +170,26 @@
 	  <Control name="AnalysisDiagram" text="分析图" />
 	  <Control name="AnalysisDataSheet" text="分析数据表" />
 	  <Control name="AnalysisDataChart" text="分析数据图" />
+	  
+	  <COntrol name="dpbTemplateEditing" text="摸板编辑"/>
     </Controls>
  </Form>
+ 
+ <Form>
+	<Name>Category</Name>
+	<Controls>
+		<Control name="label1" text="已选择分类："/>
+		<Control name="label2" text="数据库分类："/>
+		<Control name="button1" text="添加"/>
+		<Control name="button2" text="删除"/>
+		<Control name="button3" text="确定"/>
+		<Control name="button4" text="取消"/>
+		<Control name="Category" text="分类选择"/>
+	
+	</Controls>
+ </Form>
+ 
+ 
    <Form>
     <Name>frmPartSizeEditorNew</Name>
     <Controls>
@@ -434,6 +452,14 @@
 			<Control name="button1" text="另存"/>
 			<Control name="whole" text="全部颗粒"/>
 			<Control name="select" text="选择颗粒"/>
+			
+			<Control name="groupBox4" text="特定选择"/>
+			<Control name="label7" text="标准库选择:"/>
+			<Control name="button3" text="元素选择"/>
+			<Control name="button7" text="取消"/>
+			<Control name="button4" text="元素选择"/>
+			
+			<Control name="standardlibrary" text="当前标准库："/>
 		</Controls>
  </Form>
  <Form>
@@ -482,6 +508,15 @@
 		
 		<Control name="no_database" text="未找到数据库！"/>
 		<Control name="image_opened" text="图片已被打开，请关闭改图片！"/>
+		
+		<Control name="groupBox4" text="特定选择"/>
+		<Control name="label7" text="标准库选择："/>
+	    <Control name="button3" text="编辑选择"/>
+		<Control name="button4" text="元素选择"/>
+	    <Control name="button7" text="取消"/>
+		
+		
+		<Control name="standardlibrary" text="当前标准库："/>
 	</Controls>
  </Form>
  
@@ -491,7 +526,7 @@
 		<Control name="FileNameSelect" text="文件列表" />
 		<Control name="button1" text="确认选择" />
 		<Control name="file_name" text="文件名称" />
-		
+		<Control name="button2" text="取消" />
 	</Controls>
  
  </Form>

OTSIncAReportApp/1-UI/OTSReportExport/Category.cs

@@ -1,5 +1,6 @@
 using SourceGrid;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -16,12 +17,12 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport
         List<string> select = new List<string>();
         List<string> ElementList = new List<string>();
         public List<string> OutElementList = new List<string>();
+        Hashtable table;
         private string str_Select_All;
         private string str_Select;
         public Category(List<string> a_ElementList, List<string> AllList)
         {
             select = a_ElementList;
-            
             for (int i=0;i< AllList.Count();i++)
             {
                 bool bl = false;
@@ -36,6 +37,11 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport
                     ElementList.Add(AllList[i]);
             }
             InitializeComponent();
+
+            #region 国际化语言
+            OTSCommon.Language lan = new OTSCommon.Language(this);
+            table = lan.GetNameTable(this.Name);
+            #endregion
         }
 
         private void Category_Load(object sender, EventArgs e)

OTSIncAReportApp/1-UI/OTSReportExport/OTSReport_Template_CleannessA.Designer.cs

@@ -59,8 +59,11 @@
             this.label112121 = new System.Windows.Forms.Label();
             this.ck_kllb_fjzt = new System.Windows.Forms.CheckBox();
             this.groupBox_px = new System.Windows.Forms.GroupBox();
+            this.tb_RemoveElements = new System.Windows.Forms.TextBox();
+            this.button5 = new System.Windows.Forms.Button();
             this.comboBox_p3 = new System.Windows.Forms.ComboBox();
             this.ParticleList_3 = new System.Windows.Forms.Label();
+            this.label11111 = new System.Windows.Forms.Label();
             this.comboBox_p2 = new System.Windows.Forms.ComboBox();
             this.ParticleList_2 = new System.Windows.Forms.Label();
             this.ParticleList_1 = new System.Windows.Forms.Label();
@@ -68,9 +71,6 @@
             this.ck_kllb_xsmk = new System.Windows.Forms.CheckBox();
             this.label_delete_Class = new System.Windows.Forms.Label();
             this.delete_Class = new System.Windows.Forms.TextBox();
-            this.label11111 = new System.Windows.Forms.Label();
-            this.button5 = new System.Windows.Forms.Button();
-            this.tb_RemoveElements = new System.Windows.Forms.TextBox();
             this.button6 = new System.Windows.Forms.Button();
             this.groupBox9 = new System.Windows.Forms.GroupBox();
             this.groupBox2 = new System.Windows.Forms.GroupBox();
@@ -80,9 +80,9 @@
             this.label2 = new System.Windows.Forms.Label();
             this.button7 = new System.Windows.Forms.Button();
             this.groupBox4 = new System.Windows.Forms.GroupBox();
-            this.label_StandardLibraryName = new System.Windows.Forms.Label();
-            this.comboBox1 = new System.Windows.Forms.ComboBox();
             this.label7 = new System.Windows.Forms.Label();
+            this.comboBox1 = new System.Windows.Forms.ComboBox();
+            this.label_StandardLibraryName = new System.Windows.Forms.Label();
             this.groupBox1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.numericMin)).BeginInit();
@@ -131,7 +131,7 @@
             // 
             // button1
             // 
-            this.button1.Location = new System.Drawing.Point(756, 580);
+            this.button1.Location = new System.Drawing.Point(815, 580);
             this.button1.Margin = new System.Windows.Forms.Padding(2);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(70, 30);
@@ -340,7 +340,7 @@
             // 
             // tb_ysfx_xsys
             // 
-            this.tb_ysfx_xsys.Location = new System.Drawing.Point(196, 138);
+            this.tb_ysfx_xsys.Location = new System.Drawing.Point(255, 138);
             this.tb_ysfx_xsys.Margin = new System.Windows.Forms.Padding(2);
             this.tb_ysfx_xsys.Name = "tb_ysfx_xsys";
             this.tb_ysfx_xsys.ReadOnly = true;
@@ -349,7 +349,7 @@
             // 
             // button4
             // 
-            this.button4.Location = new System.Drawing.Point(537, 138);
+            this.button4.Location = new System.Drawing.Point(597, 138);
             this.button4.Margin = new System.Windows.Forms.Padding(2);
             this.button4.Name = "button4";
             this.button4.Size = new System.Drawing.Size(72, 20);
@@ -376,7 +376,7 @@
             0,
             0,
             0});
-            this.numericMin.Location = new System.Drawing.Point(304, 49);
+            this.numericMin.Location = new System.Drawing.Point(391, 49);
             this.numericMin.Maximum = new decimal(new int[] {
             99999,
             0,
@@ -394,7 +394,7 @@
             // label112121
             // 
             this.label112121.AutoSize = true;
-            this.label112121.Location = new System.Drawing.Point(299, 25);
+            this.label112121.Location = new System.Drawing.Point(386, 25);
             this.label112121.Name = "label112121";
             this.label112121.Size = new System.Drawing.Size(77, 12);
             this.label112121.TabIndex = 64;
@@ -424,18 +424,37 @@
             this.groupBox_px.Controls.Add(this.ParticleList_2);
             this.groupBox_px.Controls.Add(this.ParticleList_1);
             this.groupBox_px.Controls.Add(this.comboBox_p1);
-            this.groupBox_px.Location = new System.Drawing.Point(126, 179);
+            this.groupBox_px.Location = new System.Drawing.Point(156, 184);
             this.groupBox_px.Name = "groupBox_px";
-            this.groupBox_px.Size = new System.Drawing.Size(417, 125);
+            this.groupBox_px.Size = new System.Drawing.Size(513, 125);
             this.groupBox_px.TabIndex = 54;
             this.groupBox_px.TabStop = false;
             this.groupBox_px.Text = "颗粒显示排序设置";
             // 
+            // tb_RemoveElements
+            // 
+            this.tb_RemoveElements.Location = new System.Drawing.Point(141, 86);
+            this.tb_RemoveElements.Margin = new System.Windows.Forms.Padding(2);
+            this.tb_RemoveElements.Name = "tb_RemoveElements";
+            this.tb_RemoveElements.ReadOnly = true;
+            this.tb_RemoveElements.Size = new System.Drawing.Size(213, 21);
+            this.tb_RemoveElements.TabIndex = 59;
+            // 
+            // button5
+            // 
+            this.button5.Location = new System.Drawing.Point(387, 84);
+            this.button5.Name = "button5";
+            this.button5.Size = new System.Drawing.Size(76, 23);
+            this.button5.TabIndex = 60;
+            this.button5.Text = "元素选择";
+            this.button5.UseVisualStyleBackColor = true;
+            this.button5.Click += new System.EventHandler(this.button5_Click);
+            // 
             // comboBox_p3
             // 
             this.comboBox_p3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comboBox_p3.FormattingEnabled = true;
-            this.comboBox_p3.Location = new System.Drawing.Point(191, 50);
+            this.comboBox_p3.Location = new System.Drawing.Point(269, 50);
             this.comboBox_p3.Margin = new System.Windows.Forms.Padding(2);
             this.comboBox_p3.Name = "comboBox_p3";
             this.comboBox_p3.Size = new System.Drawing.Size(85, 20);
@@ -445,7 +464,7 @@
             // ParticleList_3
             // 
             this.ParticleList_3.AutoSize = true;
-            this.ParticleList_3.Location = new System.Drawing.Point(193, 26);
+            this.ParticleList_3.Location = new System.Drawing.Point(267, 26);
             this.ParticleList_3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ParticleList_3.Name = "ParticleList_3";
             this.ParticleList_3.Size = new System.Drawing.Size(35, 12);
@@ -453,11 +472,20 @@
             this.ParticleList_3.Text = "参数3";
             this.ParticleList_3.Click += new System.EventHandler(this.ParticleList_3_Click);
             // 
+            // label11111
+            // 
+            this.label11111.AutoSize = true;
+            this.label11111.Location = new System.Drawing.Point(11, 91);
+            this.label11111.Name = "label11111";
+            this.label11111.Size = new System.Drawing.Size(89, 12);
+            this.label11111.TabIndex = 61;
+            this.label11111.Text = "去除元素信息：";
+            // 
             // comboBox_p2
             // 
             this.comboBox_p2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comboBox_p2.FormattingEnabled = true;
-            this.comboBox_p2.Location = new System.Drawing.Point(102, 50);
+            this.comboBox_p2.Location = new System.Drawing.Point(141, 50);
             this.comboBox_p2.Margin = new System.Windows.Forms.Padding(2);
             this.comboBox_p2.Name = "comboBox_p2";
             this.comboBox_p2.Size = new System.Drawing.Size(85, 20);
@@ -466,7 +494,7 @@
             // ParticleList_2
             // 
             this.ParticleList_2.AutoSize = true;
-            this.ParticleList_2.Location = new System.Drawing.Point(100, 26);
+            this.ParticleList_2.Location = new System.Drawing.Point(139, 26);
             this.ParticleList_2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ParticleList_2.Name = "ParticleList_2";
             this.ParticleList_2.Size = new System.Drawing.Size(35, 12);
@@ -519,40 +547,12 @@
             this.delete_Class.Location = new System.Drawing.Point(6, 32);
             this.delete_Class.Multiline = true;
             this.delete_Class.Name = "delete_Class";
-            this.delete_Class.Size = new System.Drawing.Size(605, 49);
+            this.delete_Class.Size = new System.Drawing.Size(672, 49);
             this.delete_Class.TabIndex = 62;
             // 
-            // label11111
-            // 
-            this.label11111.AutoSize = true;
-            this.label11111.Location = new System.Drawing.Point(11, 91);
-            this.label11111.Name = "label11111";
-            this.label11111.Size = new System.Drawing.Size(89, 12);
-            this.label11111.TabIndex = 61;
-            this.label11111.Text = "去除元素信息：";
-            // 
-            // button5
-            // 
-            this.button5.Location = new System.Drawing.Point(304, 86);
-            this.button5.Name = "button5";
-            this.button5.Size = new System.Drawing.Size(76, 23);
-            this.button5.TabIndex = 60;
-            this.button5.Text = "元素选择";
-            this.button5.UseVisualStyleBackColor = true;
-            this.button5.Click += new System.EventHandler(this.button5_Click);
-            // 
-            // tb_RemoveElements
-            // 
-            this.tb_RemoveElements.Location = new System.Drawing.Point(105, 86);
-            this.tb_RemoveElements.Margin = new System.Windows.Forms.Padding(2);
-            this.tb_RemoveElements.Name = "tb_RemoveElements";
-            this.tb_RemoveElements.ReadOnly = true;
-            this.tb_RemoveElements.Size = new System.Drawing.Size(171, 21);
-            this.tb_RemoveElements.TabIndex = 59;
-            // 
             // button6
             // 
-            this.button6.Location = new System.Drawing.Point(682, 580);
+            this.button6.Location = new System.Drawing.Point(741, 580);
             this.button6.Margin = new System.Windows.Forms.Padding(2);
             this.button6.Name = "button6";
             this.button6.Size = new System.Drawing.Size(70, 30);
@@ -586,14 +586,14 @@
             this.groupBox2.Controls.Add(this.delete_Class);
             this.groupBox2.Location = new System.Drawing.Point(281, 12);
             this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(618, 87);
+            this.groupBox2.Size = new System.Drawing.Size(684, 87);
             this.groupBox2.TabIndex = 77;
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "排除分类";
             // 
             // button3
             // 
-            this.button3.Location = new System.Drawing.Point(528, 61);
+            this.button3.Location = new System.Drawing.Point(578, 61);
             this.button3.Name = "button3";
             this.button3.Size = new System.Drawing.Size(83, 22);
             this.button3.TabIndex = 68;
@@ -606,7 +606,7 @@
             this.textBox_zypxss.Location = new System.Drawing.Point(6, 14);
             this.textBox_zypxss.Multiline = true;
             this.textBox_zypxss.Name = "textBox_zypxss";
-            this.textBox_zypxss.Size = new System.Drawing.Size(606, 41);
+            this.textBox_zypxss.Size = new System.Drawing.Size(672, 41);
             this.textBox_zypxss.TabIndex = 65;
             // 
             // groupBox3
@@ -624,7 +624,7 @@
             this.groupBox3.Controls.Add(this.ck_kllb_xsmk);
             this.groupBox3.Location = new System.Drawing.Point(281, 206);
             this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Size = new System.Drawing.Size(618, 369);
+            this.groupBox3.Size = new System.Drawing.Size(684, 369);
             this.groupBox3.TabIndex = 78;
             this.groupBox3.TabStop = false;
             this.groupBox3.Text = "模块设定";
@@ -632,7 +632,7 @@
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(99, 141);
+            this.label2.Location = new System.Drawing.Point(154, 141);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(83, 12);
             this.label2.TabIndex = 68;
@@ -640,7 +640,7 @@
             // 
             // button7
             // 
-            this.button7.Location = new System.Drawing.Point(830, 580);
+            this.button7.Location = new System.Drawing.Point(889, 580);
             this.button7.Margin = new System.Windows.Forms.Padding(2);
             this.button7.Name = "button7";
             this.button7.Size = new System.Drawing.Size(70, 30);
@@ -657,45 +657,45 @@
             this.groupBox4.Controls.Add(this.textBox_zypxss);
             this.groupBox4.Location = new System.Drawing.Point(281, 105);
             this.groupBox4.Name = "groupBox4";
-            this.groupBox4.Size = new System.Drawing.Size(618, 90);
+            this.groupBox4.Size = new System.Drawing.Size(684, 90);
             this.groupBox4.TabIndex = 79;
             this.groupBox4.TabStop = false;
             this.groupBox4.Text = "特定选择";
             this.groupBox4.Enter += new System.EventHandler(this.groupBox4_Enter);
             // 
-            // label_StandardLibraryName
+            // label7
             // 
-            this.label_StandardLibraryName.AutoSize = true;
-            this.label_StandardLibraryName.Location = new System.Drawing.Point(21, 598);
-            this.label_StandardLibraryName.Name = "label_StandardLibraryName";
-            this.label_StandardLibraryName.Size = new System.Drawing.Size(41, 12);
-            this.label_StandardLibraryName.TabIndex = 69;
-            this.label_StandardLibraryName.Text = "label7";
+            this.label7.AutoSize = true;
+            this.label7.Location = new System.Drawing.Point(299, 66);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(77, 12);
+            this.label7.TabIndex = 70;
+            this.label7.Text = "标准库选择：";
             // 
             // comboBox1
             // 
             this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comboBox1.FormattingEnabled = true;
-            this.comboBox1.Location = new System.Drawing.Point(331, 63);
+            this.comboBox1.Location = new System.Drawing.Point(381, 63);
             this.comboBox1.Margin = new System.Windows.Forms.Padding(2);
             this.comboBox1.Name = "comboBox1";
             this.comboBox1.Size = new System.Drawing.Size(192, 20);
             this.comboBox1.TabIndex = 69;
             // 
-            // label7
+            // label_StandardLibraryName
             // 
-            this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(249, 66);
-            this.label7.Name = "label7";
-            this.label7.Size = new System.Drawing.Size(77, 12);
-            this.label7.TabIndex = 70;
-            this.label7.Text = "标准库选择：";
+            this.label_StandardLibraryName.AutoSize = true;
+            this.label_StandardLibraryName.Location = new System.Drawing.Point(21, 598);
+            this.label_StandardLibraryName.Name = "label_StandardLibraryName";
+            this.label_StandardLibraryName.Size = new System.Drawing.Size(41, 12);
+            this.label_StandardLibraryName.TabIndex = 69;
+            this.label_StandardLibraryName.Text = "label7";
             // 
             // OTSReport_Template_CleannessA
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(911, 622);
+            this.ClientSize = new System.Drawing.Size(977, 622);
             this.Controls.Add(this.label_StandardLibraryName);
             this.Controls.Add(this.button7);
             this.Controls.Add(this.button6);

OTSIncAReportApp/1-UI/OTSReportExport/OTSReport_Template_CleannessA.cs

@@ -43,7 +43,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             BindControl();
             //读取默认值
             LoadControls();
-            label_StandardLibraryName.Text= "当前标准库："+ m_OTSReport_Export.m_mbszclass.M_SY.StandardLibraryName;
+            label_StandardLibraryName.Text= table["standardlibrary"].ToString() + m_OTSReport_Export.m_mbszclass.M_SY.StandardLibraryName;
             for (int i=0;i< m_OTSReport_Export.LibraryName.Count;i++)
             {
                 comboBox1.Items.Add(m_OTSReport_Export.LibraryName[i][0]);

OTSIncAReportApp/1-UI/OTSReportExport/OTSReport_Template_INCA.Designer.cs

@@ -60,18 +60,18 @@
             this.label112121 = new System.Windows.Forms.Label();
             this.ck_kllb_fjzt = new System.Windows.Forms.CheckBox();
             this.groupBox_px = new System.Windows.Forms.GroupBox();
+            this.tb_RemoveElements = new System.Windows.Forms.TextBox();
+            this.button5 = new System.Windows.Forms.Button();
             this.comboBox_p3 = new System.Windows.Forms.ComboBox();
             this.ParticleList_3 = new System.Windows.Forms.Label();
             this.comboBox_p2 = new System.Windows.Forms.ComboBox();
+            this.label11111 = new System.Windows.Forms.Label();
             this.ParticleList_2 = new System.Windows.Forms.Label();
             this.ParticleList_1 = new System.Windows.Forms.Label();
             this.comboBox_p1 = new System.Windows.Forms.ComboBox();
             this.ck_kllb_xsmk = new System.Windows.Forms.CheckBox();
             this.label_delete_Class = new System.Windows.Forms.Label();
             this.delete_Class = new System.Windows.Forms.TextBox();
-            this.label11111 = new System.Windows.Forms.Label();
-            this.button5 = new System.Windows.Forms.Button();
-            this.tb_RemoveElements = new System.Windows.Forms.TextBox();
             this.button6 = new System.Windows.Forms.Button();
             this.ck_jzwzb_surface = new System.Windows.Forms.CheckBox();
             this.groupBox9 = new System.Windows.Forms.GroupBox();
@@ -332,7 +332,7 @@
             // 
             // tb_ysfx_xsys
             // 
-            this.tb_ysfx_xsys.Location = new System.Drawing.Point(205, 120);
+            this.tb_ysfx_xsys.Location = new System.Drawing.Point(260, 119);
             this.tb_ysfx_xsys.Margin = new System.Windows.Forms.Padding(2);
             this.tb_ysfx_xsys.Name = "tb_ysfx_xsys";
             this.tb_ysfx_xsys.ReadOnly = true;
@@ -341,7 +341,7 @@
             // 
             // button4
             // 
-            this.button4.Location = new System.Drawing.Point(455, 120);
+            this.button4.Location = new System.Drawing.Point(510, 119);
             this.button4.Margin = new System.Windows.Forms.Padding(2);
             this.button4.Name = "button4";
             this.button4.Size = new System.Drawing.Size(72, 20);
@@ -366,7 +366,7 @@
             this.lbv_syxt_mblb.CheckBoxes = true;
             this.lbv_syxt_mblb.FullRowSelect = true;
             this.lbv_syxt_mblb.HideSelection = false;
-            this.lbv_syxt_mblb.Location = new System.Drawing.Point(109, 168);
+            this.lbv_syxt_mblb.Location = new System.Drawing.Point(161, 168);
             this.lbv_syxt_mblb.Margin = new System.Windows.Forms.Padding(2);
             this.lbv_syxt_mblb.Name = "lbv_syxt_mblb";
             this.lbv_syxt_mblb.Size = new System.Drawing.Size(236, 121);
@@ -378,7 +378,7 @@
             // label33
             // 
             this.label33.AutoSize = true;
-            this.label33.Location = new System.Drawing.Point(107, 154);
+            this.label33.Location = new System.Drawing.Point(159, 154);
             this.label33.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label33.Name = "label33";
             this.label33.Size = new System.Drawing.Size(101, 12);
@@ -393,7 +393,7 @@
             0,
             0,
             0});
-            this.numericMin.Location = new System.Drawing.Point(303, 39);
+            this.numericMin.Location = new System.Drawing.Point(318, 39);
             this.numericMin.Maximum = new decimal(new int[] {
             99999,
             0,
@@ -412,7 +412,7 @@
             // label112121
             // 
             this.label112121.AutoSize = true;
-            this.label112121.Location = new System.Drawing.Point(301, 21);
+            this.label112121.Location = new System.Drawing.Point(316, 21);
             this.label112121.Name = "label112121";
             this.label112121.Size = new System.Drawing.Size(77, 12);
             this.label112121.TabIndex = 64;
@@ -443,18 +443,37 @@
             this.groupBox_px.Controls.Add(this.ParticleList_2);
             this.groupBox_px.Controls.Add(this.ParticleList_1);
             this.groupBox_px.Controls.Add(this.comboBox_p1);
-            this.groupBox_px.Location = new System.Drawing.Point(109, 296);
+            this.groupBox_px.Location = new System.Drawing.Point(161, 296);
             this.groupBox_px.Name = "groupBox_px";
-            this.groupBox_px.Size = new System.Drawing.Size(402, 109);
+            this.groupBox_px.Size = new System.Drawing.Size(421, 109);
             this.groupBox_px.TabIndex = 54;
             this.groupBox_px.TabStop = false;
             this.groupBox_px.Text = "颗粒显示排序设置";
             // 
+            // tb_RemoveElements
+            // 
+            this.tb_RemoveElements.Location = new System.Drawing.Point(116, 72);
+            this.tb_RemoveElements.Margin = new System.Windows.Forms.Padding(2);
+            this.tb_RemoveElements.Name = "tb_RemoveElements";
+            this.tb_RemoveElements.ReadOnly = true;
+            this.tb_RemoveElements.Size = new System.Drawing.Size(191, 21);
+            this.tb_RemoveElements.TabIndex = 59;
+            // 
+            // button5
+            // 
+            this.button5.Location = new System.Drawing.Point(318, 71);
+            this.button5.Name = "button5";
+            this.button5.Size = new System.Drawing.Size(76, 23);
+            this.button5.TabIndex = 60;
+            this.button5.Text = "元素选择";
+            this.button5.UseVisualStyleBackColor = true;
+            this.button5.Click += new System.EventHandler(this.button5_Click);
+            // 
             // comboBox_p3
             // 
             this.comboBox_p3.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comboBox_p3.FormattingEnabled = true;
-            this.comboBox_p3.Location = new System.Drawing.Point(200, 40);
+            this.comboBox_p3.Location = new System.Drawing.Point(222, 40);
             this.comboBox_p3.Margin = new System.Windows.Forms.Padding(2);
             this.comboBox_p3.Name = "comboBox_p3";
             this.comboBox_p3.Size = new System.Drawing.Size(85, 20);
@@ -463,7 +482,7 @@
             // ParticleList_3
             // 
             this.ParticleList_3.AutoSize = true;
-            this.ParticleList_3.Location = new System.Drawing.Point(198, 25);
+            this.ParticleList_3.Location = new System.Drawing.Point(215, 25);
             this.ParticleList_3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ParticleList_3.Name = "ParticleList_3";
             this.ParticleList_3.Size = new System.Drawing.Size(35, 12);
@@ -474,16 +493,26 @@
             // 
             this.comboBox_p2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comboBox_p2.FormattingEnabled = true;
-            this.comboBox_p2.Location = new System.Drawing.Point(105, 40);
+            this.comboBox_p2.Location = new System.Drawing.Point(116, 40);
             this.comboBox_p2.Margin = new System.Windows.Forms.Padding(2);
             this.comboBox_p2.Name = "comboBox_p2";
             this.comboBox_p2.Size = new System.Drawing.Size(85, 20);
             this.comboBox_p2.TabIndex = 55;
             // 
+            // label11111
+            // 
+            this.label11111.AutoEllipsis = true;
+            this.label11111.AutoSize = true;
+            this.label11111.Location = new System.Drawing.Point(6, 75);
+            this.label11111.Name = "label11111";
+            this.label11111.Size = new System.Drawing.Size(89, 12);
+            this.label11111.TabIndex = 61;
+            this.label11111.Text = "去除元素信息：";
+            // 
             // ParticleList_2
             // 
             this.ParticleList_2.AutoSize = true;
-            this.ParticleList_2.Location = new System.Drawing.Point(103, 25);
+            this.ParticleList_2.Location = new System.Drawing.Point(109, 25);
             this.ParticleList_2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.ParticleList_2.Name = "ParticleList_2";
             this.ParticleList_2.Size = new System.Drawing.Size(35, 12);
@@ -539,34 +568,6 @@
             this.delete_Class.Size = new System.Drawing.Size(691, 41);
             this.delete_Class.TabIndex = 62;
             // 
-            // label11111
-            // 
-            this.label11111.AutoSize = true;
-            this.label11111.Location = new System.Drawing.Point(5, 75);
-            this.label11111.Name = "label11111";
-            this.label11111.Size = new System.Drawing.Size(89, 12);
-            this.label11111.TabIndex = 61;
-            this.label11111.Text = "去除元素信息：";
-            // 
-            // button5
-            // 
-            this.button5.Location = new System.Drawing.Point(303, 70);
-            this.button5.Name = "button5";
-            this.button5.Size = new System.Drawing.Size(76, 23);
-            this.button5.TabIndex = 60;
-            this.button5.Text = "元素选择";
-            this.button5.UseVisualStyleBackColor = true;
-            this.button5.Click += new System.EventHandler(this.button5_Click);
-            // 
-            // tb_RemoveElements
-            // 
-            this.tb_RemoveElements.Location = new System.Drawing.Point(105, 72);
-            this.tb_RemoveElements.Margin = new System.Windows.Forms.Padding(2);
-            this.tb_RemoveElements.Name = "tb_RemoveElements";
-            this.tb_RemoveElements.ReadOnly = true;
-            this.tb_RemoveElements.Size = new System.Drawing.Size(180, 21);
-            this.tb_RemoveElements.TabIndex = 59;
-            // 
             // button6
             // 
             this.button6.Location = new System.Drawing.Point(761, 645);
@@ -664,7 +665,7 @@
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(107, 123);
+            this.label2.Location = new System.Drawing.Point(159, 123);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(89, 12);
             this.label2.TabIndex = 67;

OTSIncAReportApp/1-UI/OTSReportExport/OTSReport_Template_INCA.cs

@@ -41,7 +41,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             BindControl();
             //读取默认值
             LoadControls();
-            label_StandardLibraryName.Text = "当前标准库：" + m_OTSReport_Export.m_mbszclass.M_SY.StandardLibraryName;
+            label_StandardLibraryName.Text = table["standardlibrary"].ToString() + m_OTSReport_Export.m_mbszclass.M_SY.StandardLibraryName;
             for (int i = 0; i < m_OTSReport_Export.LibraryName.Count; i++)
             {
                 comboBox1.Items.Add(m_OTSReport_Export.LibraryName[i][0]);