修改导出设置界面显示方式

Bin/x64/Debug/Config/ReportTemplate/Inca_Template/ReportTemplateConfig.xml

@@ -32,7 +32,7 @@
     <index_cb_jzwfl_klfw>0</index_cb_jzwfl_klfw>
     <str_cb_klcc_jsfs>ECD</str_cb_klcc_jsfs>
     <b_ck_klcc_xsddt>False</b_ck_klcc_xsddt>
-    <b_ck_klcc_dfl>False</b_ck_klcc_dfl>
+    <b_ck_klcc_dfl>True</b_ck_klcc_dfl>
     <b_ck_klcc_xfl>True</b_ck_klcc_xfl>
     <str_cb_klcc_ljb>lj.psf</str_cb_klcc_ljb>
   </M_KLFXJG>

Bin/x64/Debug/Config/ReportTemplate/ReportTemplateConfig.xml

@@ -1,8 +1,7 @@
 <XmlConfig>
   <M_SY>
     <str_tb_ZBT>Cleanness Report</str_tb_ZBT>
-    <str_tb_FBT>
-    </str_tb_FBT>
+    <str_tb_FBT>宁德时代</str_tb_FBT>
     <str_tb_YPBH>0001</str_tb_YPBH>
     <str_tb_CKBZ>
     </str_tb_CKBZ>
@@ -30,7 +29,7 @@
     <index_cb_jzwfl_ljb>0</index_cb_jzwfl_ljb>
     <index_cb_jzwfl_klfw>0</index_cb_jzwfl_klfw>
     <str_cb_klcc_jsfs>ECD</str_cb_klcc_jsfs>
-    <b_ck_klcc_xsddt>True</b_ck_klcc_xsddt>
+    <b_ck_klcc_xsddt>False</b_ck_klcc_xsddt>
     <b_ck_klcc_dfl>False</b_ck_klcc_dfl>
     <b_ck_klcc_xfl>False</b_ck_klcc_xfl>
   </M_KLFXJG>

OTSIncAReportApp/1-UI/OTSReportExport/DataIntegration/TernaryDiagram.cs

@@ -35,7 +35,7 @@ namespace OTSIncAReportApp._1_UI.OTSReportExport.DataIntegration
             g.FillRectangle(sbrush_White, 0, 0, 260, 115);
             Font myFont = new Font("Arial", 10, FontStyle.Regular);
             Font myFont2 = new Font("Arial", 10, FontStyle.Regular);
-            g.DrawString("图例(length,μm)", myFont, sbrush, 70, 3);
+            g.DrawString("(length,μm)", myFont, sbrush, 88, 3);
             //legend(length,microns)
             Pen mypen = new Pen(Color.Black, 1);
             g.DrawLine(mypen, 70, 19, 170, 19);

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

@@ -56,8 +56,6 @@
             this.cb_klcc_jsfs = new System.Windows.Forms.ComboBox();
             this.label15 = new System.Windows.Forms.Label();
             this.label14 = new System.Windows.Forms.Label();
-            this.button3 = new System.Windows.Forms.Button();
-            this.comboBox_PeriodicTable = new System.Windows.Forms.ComboBox();
             this.tb_ysfx_xsys = new System.Windows.Forms.TextBox();
             this.button4 = new System.Windows.Forms.Button();
             this.ck_ysfx_xsmk = new System.Windows.Forms.CheckBox();
@@ -141,10 +139,10 @@
             // 
             // button1
             // 
-            this.button1.Location = new System.Drawing.Point(208, 57);
+            this.button1.Location = new System.Drawing.Point(460, 434);
             this.button1.Margin = new System.Windows.Forms.Padding(2);
             this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(55, 22);
+            this.button1.Size = new System.Drawing.Size(70, 30);
             this.button1.TabIndex = 60;
             this.button1.Text = "另存";
             this.button1.UseVisualStyleBackColor = true;
@@ -388,38 +386,18 @@
             this.label14.TabIndex = 41;
             this.label14.Text = "计算方式";
             // 
-            // button3
-            // 
-            this.button3.Location = new System.Drawing.Point(159, 181);
-            this.button3.Name = "button3";
-            this.button3.Size = new System.Drawing.Size(55, 23);
-            this.button3.TabIndex = 60;
-            this.button3.Text = "Delete";
-            this.button3.UseVisualStyleBackColor = true;
-            this.button3.Click += new System.EventHandler(this.button3_Click_1);
-            // 
-            // comboBox_PeriodicTable
-            // 
-            this.comboBox_PeriodicTable.FormattingEnabled = true;
-            this.comboBox_PeriodicTable.Location = new System.Drawing.Point(21, 210);
-            this.comboBox_PeriodicTable.Name = "comboBox_PeriodicTable";
-            this.comboBox_PeriodicTable.Size = new System.Drawing.Size(84, 20);
-            this.comboBox_PeriodicTable.TabIndex = 59;
-            this.comboBox_PeriodicTable.SelectedIndexChanged += new System.EventHandler(this.comboBox_PeriodicTable_SelectedIndexChanged);
-            this.comboBox_PeriodicTable.KeyDown += new System.Windows.Forms.KeyEventHandler(this.comboBox_PeriodicTable_KeyDown);
-            // 
             // tb_ysfx_xsys
             // 
             this.tb_ysfx_xsys.Location = new System.Drawing.Point(21, 183);
             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;
-            this.tb_ysfx_xsys.Size = new System.Drawing.Size(129, 21);
+            this.tb_ysfx_xsys.Size = new System.Drawing.Size(198, 21);
             this.tb_ysfx_xsys.TabIndex = 58;
             // 
             // button4
             // 
-            this.button4.Location = new System.Drawing.Point(142, 209);
+            this.button4.Location = new System.Drawing.Point(147, 208);
             this.button4.Margin = new System.Windows.Forms.Padding(2);
             this.button4.Name = "button4";
             this.button4.Size = new System.Drawing.Size(72, 20);
@@ -492,7 +470,7 @@
             this.groupBox_zt.Size = new System.Drawing.Size(292, 79);
             this.groupBox_zt.TabIndex = 55;
             this.groupBox_zt.TabStop = false;
-            this.groupBox_zt.Text = "帧图表";
+            this.groupBox_zt.Text = "帧图显示排序设置";
             // 
             // ParticleList_5
             // 
@@ -547,7 +525,7 @@
             this.groupBox_px.Size = new System.Drawing.Size(292, 83);
             this.groupBox_px.TabIndex = 54;
             this.groupBox_px.TabStop = false;
-            this.groupBox_px.Text = "最大排序表";
+            this.groupBox_px.Text = "颗粒显示排序设置";
             // 
             // comboBox_p3
             // 
@@ -669,10 +647,10 @@
             // 
             // button6
             // 
-            this.button6.Location = new System.Drawing.Point(149, 57);
+            this.button6.Location = new System.Drawing.Point(386, 434);
             this.button6.Margin = new System.Windows.Forms.Padding(2);
             this.button6.Name = "button6";
-            this.button6.Size = new System.Drawing.Size(55, 22);
+            this.button6.Size = new System.Drawing.Size(70, 30);
             this.button6.TabIndex = 72;
             this.button6.Text = "保存";
             this.button6.UseVisualStyleBackColor = true;
@@ -711,9 +689,9 @@
             // cb_ParticleRange
             // 
             this.cb_ParticleRange.FormattingEnabled = true;
-            this.cb_ParticleRange.Location = new System.Drawing.Point(23, 59);
+            this.cb_ParticleRange.Location = new System.Drawing.Point(13, 59);
             this.cb_ParticleRange.Name = "cb_ParticleRange";
-            this.cb_ParticleRange.Size = new System.Drawing.Size(121, 20);
+            this.cb_ParticleRange.Size = new System.Drawing.Size(124, 20);
             this.cb_ParticleRange.TabIndex = 76;
             // 
             // groupBox2
@@ -771,10 +749,10 @@
             this.groupBox3.Controls.Add(this.numericMin);
             this.groupBox3.Controls.Add(this.groupBox_zt);
             this.groupBox3.Controls.Add(this.label112121);
+            this.groupBox3.Controls.Add(this.button6);
             this.groupBox3.Controls.Add(this.groupBox_px);
-            this.groupBox3.Controls.Add(this.button3);
+            this.groupBox3.Controls.Add(this.button1);
             this.groupBox3.Controls.Add(this.label2);
-            this.groupBox3.Controls.Add(this.comboBox_PeriodicTable);
             this.groupBox3.Controls.Add(this.ck_klcc_xsddt);
             this.groupBox3.Controls.Add(this.tb_ysfx_xsys);
             this.groupBox3.Controls.Add(this.button4);
@@ -812,8 +790,6 @@
             this.Controls.Add(this.groupBox3);
             this.Controls.Add(this.groupBox2);
             this.Controls.Add(this.cb_ParticleRange);
-            this.Controls.Add(this.button6);
-            this.Controls.Add(this.button1);
             this.Controls.Add(this.label39);
             this.Controls.Add(this.groupBox9);
             this.Controls.Add(this.groupBox1);
@@ -876,8 +852,6 @@
         private System.Windows.Forms.Label label39;
         private System.Windows.Forms.TextBox tb_ysfx_xsys;
         private System.Windows.Forms.Button button4;
-        public System.Windows.Forms.ComboBox comboBox_PeriodicTable;
-        private System.Windows.Forms.Button button3;
         private System.Windows.Forms.GroupBox groupBox_px;
         private System.Windows.Forms.GroupBox groupBox_zt;
         private System.Windows.Forms.Label ParticleList_5;

OTSIncAReportApp/1-UI/OTSReportExport/OTSReport_Template_CleannessA.cs

@@ -46,12 +46,10 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             cb_ParticleRange.Items.Add("选择颗粒");
             #region 元素选择
             string[] PeriodicTable = { "H", "He", "Li", "Be", "B", "C", "N", "O", "F", "Ne", "Na", "Mg", "Al", "Si", "P", "S", "Cl", "Ar", "K", "Ca", "Sc", "Ti", "V", "Cr", "Mn", "Fe", "Co", "Ni", "Cu", "Zn", "Ga", "Ge", "As", "Se", "Br", "Kr", "Rb", "Sr", "Y", "Zr", "Nb", "Mo", "Tc", "Ru", "Rh", "Pd", "Ag", "Cd", "In", "Sn", "Sb", "Te", "I", "Xe", "Cs", "Ba", "La", "Ce", "Pr", "Nd", "Pm", "Sm", "Eu", "Gd", "Tb", "Dy", "Ho", "Er", "Tm", "Yb", "Lu", "Hf", "Ta", "W", "Re", "Os", "Ir", "Pt", "Au", "Hq", "TI", "Pb", "Bi", "Po", "At", "Rn", "Fr", "Ra", "Ac", "Th", "Pa", "U", "Np", "Pu", "Am", "Cm", "Bk", "Cf", "Es", "Fm", "Mc", "No", "Lr", "Rf", "Db", "Sg", "Bh", "Hs", "Mt", "Ds", "Rg", "Unb" };
-            comboBox_PeriodicTable.Items.AddRange(PeriodicTable);
+           
             AutoCompleteStringCollection sc = new AutoCompleteStringCollection();
             sc.AddRange(PeriodicTable);
-            this.comboBox_PeriodicTable.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest;
-            this.comboBox_PeriodicTable.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.CustomSource;
-            this.comboBox_PeriodicTable.AutoCompleteCustomSource = sc;
+        
             #endregion
             #region 颗粒尺寸分析结果
             BindComboBox(cb_klcc_jsfs, OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE);
@@ -583,26 +581,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
 
         private void comboBox_PeriodicTable_SelectedIndexChanged(object sender, EventArgs e)
         {
-            if (comboBox_PeriodicTable.Text != null && comboBox_PeriodicTable.SelectedItem != null)
-            {
-                string newStr = comboBox_PeriodicTable.SelectedItem.ToString();
-                string[] after = tb_ysfx_xsys.Text.Split(new char[] { ',' });
-                for (int i=0;i< after.Length;i++)
-                {
-                    if (after[i] == newStr)
-                    {
-                        MessageBox.Show("Element already exists!");
-                        return;
-                    }
-                }
-                if (tb_ysfx_xsys.Text == "")
-                    tb_ysfx_xsys.Text = tb_ysfx_xsys.Text + newStr;
-                else if (tb_ysfx_xsys.Text.Substring(tb_ysfx_xsys.Text.Length - 1) != ",")
-                    tb_ysfx_xsys.Text = tb_ysfx_xsys.Text + "," + newStr;
-                else
-                    tb_ysfx_xsys.Text = tb_ysfx_xsys.Text + newStr;
-                comboBox_PeriodicTable.Text = null;
-            }
+            
         }
 
         private void comboBox_PeriodicTable_KeyDown(object sender, KeyEventArgs e)

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

@@ -55,8 +55,6 @@
             this.cb_klcc_jsfs = new System.Windows.Forms.ComboBox();
             this.label15 = new System.Windows.Forms.Label();
             this.label14 = new System.Windows.Forms.Label();
-            this.button3 = new System.Windows.Forms.Button();
-            this.comboBox_PeriodicTable = new System.Windows.Forms.ComboBox();
             this.tb_ysfx_xsys = new System.Windows.Forms.TextBox();
             this.button4 = new System.Windows.Forms.Button();
             this.ck_ysfx_xsmk = new System.Windows.Forms.CheckBox();
@@ -94,8 +92,8 @@
             this.textBox_zypxss = new System.Windows.Forms.TextBox();
             this.label_zypxss = new System.Windows.Forms.Label();
             this.groupBox3 = new System.Windows.Forms.GroupBox();
-            this.ck_syxt_xsmk = new System.Windows.Forms.CheckBox();
             this.label2 = new System.Windows.Forms.Label();
+            this.ck_syxt_xsmk = new System.Windows.Forms.CheckBox();
             this.groupBox1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.numericMin)).BeginInit();
@@ -144,10 +142,10 @@
             // 
             // button1
             // 
-            this.button1.Location = new System.Drawing.Point(208, 57);
+            this.button1.Location = new System.Drawing.Point(487, 402);
             this.button1.Margin = new System.Windows.Forms.Padding(2);
             this.button1.Name = "button1";
-            this.button1.Size = new System.Drawing.Size(55, 22);
+            this.button1.Size = new System.Drawing.Size(70, 30);
             this.button1.TabIndex = 60;
             this.button1.Text = "另存";
             this.button1.UseVisualStyleBackColor = true;
@@ -380,38 +378,18 @@
             this.label14.TabIndex = 41;
             this.label14.Text = "计算方式";
             // 
-            // button3
-            // 
-            this.button3.Location = new System.Drawing.Point(172, 141);
-            this.button3.Name = "button3";
-            this.button3.Size = new System.Drawing.Size(55, 23);
-            this.button3.TabIndex = 60;
-            this.button3.Text = "Delete";
-            this.button3.UseVisualStyleBackColor = true;
-            this.button3.Click += new System.EventHandler(this.button3_Click_1);
-            // 
-            // comboBox_PeriodicTable
-            // 
-            this.comboBox_PeriodicTable.FormattingEnabled = true;
-            this.comboBox_PeriodicTable.Location = new System.Drawing.Point(16, 174);
-            this.comboBox_PeriodicTable.Name = "comboBox_PeriodicTable";
-            this.comboBox_PeriodicTable.Size = new System.Drawing.Size(116, 20);
-            this.comboBox_PeriodicTable.TabIndex = 59;
-            this.comboBox_PeriodicTable.SelectedIndexChanged += new System.EventHandler(this.comboBox_PeriodicTable_SelectedIndexChanged);
-            this.comboBox_PeriodicTable.KeyDown += new System.Windows.Forms.KeyEventHandler(this.comboBox_PeriodicTable_KeyDown);
-            // 
             // tb_ysfx_xsys
             // 
             this.tb_ysfx_xsys.Location = new System.Drawing.Point(16, 143);
             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;
-            this.tb_ysfx_xsys.Size = new System.Drawing.Size(137, 21);
+            this.tb_ysfx_xsys.Size = new System.Drawing.Size(235, 21);
             this.tb_ysfx_xsys.TabIndex = 58;
             // 
             // button4
             // 
-            this.button4.Location = new System.Drawing.Point(155, 175);
+            this.button4.Location = new System.Drawing.Point(179, 168);
             this.button4.Margin = new System.Windows.Forms.Padding(2);
             this.button4.Name = "button4";
             this.button4.Size = new System.Drawing.Size(72, 20);
@@ -507,7 +485,7 @@
             this.groupBox_zt.Size = new System.Drawing.Size(290, 67);
             this.groupBox_zt.TabIndex = 55;
             this.groupBox_zt.TabStop = false;
-            this.groupBox_zt.Text = "帧图表";
+            this.groupBox_zt.Text = "帧图显示排序设置";
             // 
             // ParticleList_5
             // 
@@ -562,7 +540,7 @@
             this.groupBox_px.Size = new System.Drawing.Size(290, 70);
             this.groupBox_px.TabIndex = 54;
             this.groupBox_px.TabStop = false;
-            this.groupBox_px.Text = "最大排序表";
+            this.groupBox_px.Text = "颗粒显示排序设置";
             // 
             // comboBox_p3
             // 
@@ -682,10 +660,10 @@
             // 
             // button6
             // 
-            this.button6.Location = new System.Drawing.Point(149, 57);
+            this.button6.Location = new System.Drawing.Point(413, 402);
             this.button6.Margin = new System.Windows.Forms.Padding(2);
             this.button6.Name = "button6";
-            this.button6.Size = new System.Drawing.Size(55, 22);
+            this.button6.Size = new System.Drawing.Size(70, 30);
             this.button6.TabIndex = 72;
             this.button6.Text = "保存";
             this.button6.UseVisualStyleBackColor = true;
@@ -735,9 +713,9 @@
             // cb_ParticleRange
             // 
             this.cb_ParticleRange.FormattingEnabled = true;
-            this.cb_ParticleRange.Location = new System.Drawing.Point(23, 59);
+            this.cb_ParticleRange.Location = new System.Drawing.Point(13, 60);
             this.cb_ParticleRange.Name = "cb_ParticleRange";
-            this.cb_ParticleRange.Size = new System.Drawing.Size(121, 20);
+            this.cb_ParticleRange.Size = new System.Drawing.Size(124, 20);
             this.cb_ParticleRange.TabIndex = 76;
             // 
             // groupBox2
@@ -795,13 +773,13 @@
             this.groupBox3.Controls.Add(this.label2);
             this.groupBox3.Controls.Add(this.groupBox_zt);
             this.groupBox3.Controls.Add(this.numericMin);
+            this.groupBox3.Controls.Add(this.button6);
             this.groupBox3.Controls.Add(this.groupBox_px);
+            this.groupBox3.Controls.Add(this.button1);
             this.groupBox3.Controls.Add(this.label112121);
             this.groupBox3.Controls.Add(this.lbv_syxt_mblb);
             this.groupBox3.Controls.Add(this.label33);
             this.groupBox3.Controls.Add(this.ck_kllb_fjzt);
-            this.groupBox3.Controls.Add(this.button3);
-            this.groupBox3.Controls.Add(this.comboBox_PeriodicTable);
             this.groupBox3.Controls.Add(this.ck_syxt_xsmk);
             this.groupBox3.Controls.Add(this.ck_jzwzb_surface);
             this.groupBox3.Controls.Add(this.tb_ysfx_xsys);
@@ -822,6 +800,15 @@
             this.groupBox3.TabStop = false;
             this.groupBox3.Text = "颗粒筛选";
             // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(16, 121);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(77, 12);
+            this.label2.TabIndex = 67;
+            this.label2.Text = "元素选择设置";
+            // 
             // ck_syxt_xsmk
             // 
             this.ck_syxt_xsmk.AutoSize = true;
@@ -833,15 +820,6 @@
             this.ck_syxt_xsmk.Text = "三元图";
             this.ck_syxt_xsmk.UseVisualStyleBackColor = true;
             // 
-            // label2
-            // 
-            this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(16, 121);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(77, 12);
-            this.label2.TabIndex = 67;
-            this.label2.Text = "元素选择设置";
-            // 
             // OTSReport_Template_INCA
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -850,8 +828,6 @@
             this.Controls.Add(this.groupBox3);
             this.Controls.Add(this.groupBox2);
             this.Controls.Add(this.cb_ParticleRange);
-            this.Controls.Add(this.button6);
-            this.Controls.Add(this.button1);
             this.Controls.Add(this.label39);
             this.Controls.Add(this.groupBox9);
             this.Controls.Add(this.groupBox1);
@@ -916,8 +892,6 @@
         private System.Windows.Forms.Label label39;
         private System.Windows.Forms.TextBox tb_ysfx_xsys;
         private System.Windows.Forms.Button button4;
-        public System.Windows.Forms.ComboBox comboBox_PeriodicTable;
-        private System.Windows.Forms.Button button3;
         private System.Windows.Forms.GroupBox groupBox_px;
         private System.Windows.Forms.GroupBox groupBox_zt;
         private System.Windows.Forms.Label ParticleList_5;

OTSIncAReportApp/1-UI/OTSReportExport/OTSReport_Template_INCA.cs

@@ -44,12 +44,12 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             cb_ParticleRange.Items.Add("选择颗粒");
             #region 元素选择
             string[] PeriodicTable = { "H", "He", "Li", "Be", "B", "C", "N", "O", "F", "Ne", "Na", "Mg", "Al", "Si", "P", "S", "Cl", "Ar", "K", "Ca", "Sc", "Ti", "V", "Cr", "Mn", "Fe", "Co", "Ni", "Cu", "Zn", "Ga", "Ge", "As", "Se", "Br", "Kr", "Rb", "Sr", "Y", "Zr", "Nb", "Mo", "Tc", "Ru", "Rh", "Pd", "Ag", "Cd", "In", "Sn", "Sb", "Te", "I", "Xe", "Cs", "Ba", "La", "Ce", "Pr", "Nd", "Pm", "Sm", "Eu", "Gd", "Tb", "Dy", "Ho", "Er", "Tm", "Yb", "Lu", "Hf", "Ta", "W", "Re", "Os", "Ir", "Pt", "Au", "Hq", "TI", "Pb", "Bi", "Po", "At", "Rn", "Fr", "Ra", "Ac", "Th", "Pa", "U", "Np", "Pu", "Am", "Cm", "Bk", "Cf", "Es", "Fm", "Mc", "No", "Lr", "Rf", "Db", "Sg", "Bh", "Hs", "Mt", "Ds", "Rg", "Unb" };
-            comboBox_PeriodicTable.Items.AddRange(PeriodicTable);
+            //comboBox_PeriodicTable.Items.AddRange(PeriodicTable);
             AutoCompleteStringCollection sc = new AutoCompleteStringCollection();
             sc.AddRange(PeriodicTable);
-            this.comboBox_PeriodicTable.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest;
-            this.comboBox_PeriodicTable.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.CustomSource;
-            this.comboBox_PeriodicTable.AutoCompleteCustomSource = sc;
+            //this.comboBox_PeriodicTable.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest;
+            //this.comboBox_PeriodicTable.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.CustomSource;
+            //this.comboBox_PeriodicTable.AutoCompleteCustomSource = sc;
             #endregion
             #region 颗粒尺寸分析结果
             BindComboBox(cb_klcc_jsfs, OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE);
@@ -106,6 +106,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             string strpath = newFileName.ChangePathName;
             SaveTemplateParameters();
             SaveFileToXml(strpath);
+            this.Close();
         }
 
 
@@ -343,6 +344,11 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                 }
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_KLFXJG.str_cb_klcc_ljb, "M_KLFXJG", "str_cb_klcc_ljb");
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_SYXT.str_cb_syxt_ljb, "M_SYXT", "str_cb_syxt_ljb");
+
+
+                //选择颗粒范围（全部颗粒，选择颗粒）
+                xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_SY.str_xzkl.ToString(), "M_SY", "str_xzkl");
+                xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_SY.int_xzkl.ToString(), "M_SY", "int_xzkl");
             }
         }
 
@@ -645,26 +651,26 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
 
         private void comboBox_PeriodicTable_SelectedIndexChanged(object sender, EventArgs e)
         {
-            if (comboBox_PeriodicTable.Text != null && comboBox_PeriodicTable.SelectedItem != null)
-            {
-                string newStr = comboBox_PeriodicTable.SelectedItem.ToString();
-                string[] after = tb_ysfx_xsys.Text.Split(new char[] { ',' });
-                for (int i=0;i< after.Length;i++)
-                {
-                    if (after[i] == newStr)
-                    {
-                        MessageBox.Show("Element already exists!");
-                        return;
-                    }
-                }
-                if (tb_ysfx_xsys.Text == "")
-                    tb_ysfx_xsys.Text = tb_ysfx_xsys.Text + newStr;
-                else if (tb_ysfx_xsys.Text.Substring(tb_ysfx_xsys.Text.Length - 1) != ",")
-                    tb_ysfx_xsys.Text = tb_ysfx_xsys.Text + "," + newStr;
-                else
-                    tb_ysfx_xsys.Text = tb_ysfx_xsys.Text + newStr;
-                comboBox_PeriodicTable.Text = null;
-            }
+            //if (comboBox_PeriodicTable.Text != null && comboBox_PeriodicTable.SelectedItem != null)
+            //{
+            //    string newStr = comboBox_PeriodicTable.SelectedItem.ToString();
+            //    string[] after = tb_ysfx_xsys.Text.Split(new char[] { ',' });
+            //    for (int i=0;i< after.Length;i++)
+            //    {
+            //        if (after[i] == newStr)
+            //        {
+            //            MessageBox.Show("Element already exists!");
+            //            return;
+            //        }
+            //    }
+            //    if (tb_ysfx_xsys.Text == "")
+            //        tb_ysfx_xsys.Text = tb_ysfx_xsys.Text + newStr;
+            //    else if (tb_ysfx_xsys.Text.Substring(tb_ysfx_xsys.Text.Length - 1) != ",")
+            //        tb_ysfx_xsys.Text = tb_ysfx_xsys.Text + "," + newStr;
+            //    else
+            //        tb_ysfx_xsys.Text = tb_ysfx_xsys.Text + newStr;
+            //    comboBox_PeriodicTable.Text = null;
+            //}
         }
 
         private void comboBox_PeriodicTable_KeyDown(object sender, KeyEventArgs e)

OTSIncAReportApp/1-UI/OTSReportExport/Template/DataTemplate.cs

@@ -225,7 +225,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                 }
                 total += Convert.ToInt32(surface_dt2.Rows[i]["total"]);
             }
-            setXRLabelData(xrTable3.Rows[0].Cells[0], "总数量");
+            setXRLabelData(xrTable3.Rows[0].Cells[0], GetlanguageData("dev_total", languageData));
             //xrTable3.Rows[0].Cells[0].Text = "总数量";
             xrTable3.Rows[0].Cells[0].TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
             xrTable3.Rows[0].Cells[1].Text = total.ToString();
@@ -1071,7 +1071,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
         /// <param name="TemplateClass"></param>
         public void InsertReportTemplateChart_Trianglediagram()
         {
-            this.Detail.Controls.Add(add_label("三元图"));
+            this.Detail.Controls.Add(add_label(GetlanguageData("dev_Ternary_diagram", languageData)));
             List<Color> Color_list = new List<Color>();
             Color_list.Add(FromHex("#0f4471"));
             Color_list.Add(FromHex("#FFD700"));
@@ -1154,7 +1154,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             xrTable_kllb_surface.LocationF = new PointF(0, NeueStartposition + 5);
             xrTable_kllb_surface.Visible = true;
             NeueStartposition = xrTable_kllb_surface.LocationF.Y + xrTable_kllb_surface.SizeF.Height;
-            setXRLabelData(xrTable_kllb, "颗粒列表");
+            setXRLabelData(xrTable_kllb, GetlanguageData("dev_Particle_List", languageData));
             setXRLabelData(xrTableCell2, "Selected particles based on：" + TemplateClass.M_KLLBXX.str_cb_kllb_sort_p1.ToString() + "(μm)");
             
             ParticleList particleList = new ParticleList();
@@ -1208,7 +1208,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                 Template.Rows.Add(Template_Rows_1);
                 Template.Rows.Add(Template_Rows_2);
                 Template.SizeF = new SizeF(688f, 25f);
-                Template.Rows[0].Cells[0].Text = "帧图 " + dt_pic.Rows[i]["id"];
+                Template.Rows[0].Cells[0].Text = GetlanguageData("dev_Frame_diagram", languageData) + dt_pic.Rows[i]["id"];
                 Template.LocationF = new PointF(0, NeueStartposition);
                 Template.Borders = DevExpress.XtraPrinting.BorderSide.All;
                 Template.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
@@ -1236,9 +1236,9 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                         {
                             //数据表
                             XRTable xRTable = add_XRTable_frame();
-                            xRTable.Rows[0].Cells[0].Text = "图像";
+                            xRTable.Rows[0].Cells[0].Text = GetlanguageData("dev_image", languageData);
                             xRTable.Rows[0].Cells[0].Font = new Font(Schriftart_chinese, xRTable.Rows[0].Cells[0].Font.Size);
-                            xRTable.Rows[0].Cells[1].Text = "分类";
+                            xRTable.Rows[0].Cells[1].Text = GetlanguageData("dev_Class", languageData);
                             xRTable.Rows[0].Cells[1].Font = new Font(Schriftart_chinese, xRTable.Rows[0].Cells[1].Font.Size);
                             xRTable.Rows[0].Cells[2].Text = TemplateClass.M_KLLBXX.str_cb_kllb_chartSort_p1.ToString();
                             xRTable.Rows[0].Cells[3].Text = TemplateClass.M_KLLBXX.str_cb_kllb_chartSort_p2.ToString();
@@ -2226,7 +2226,8 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             {
                 xrLabel_pageinfo.Font = new Font(Schriftart_chinese, xrLabel_pageinfo.Font.Size);
                 this.xrLabel_pageinfo.Visible = true;
-                this.xrLabel_pageinfo.Text = string.Format("第{0}页，共{1}页", pageindex, pagecount - 1);
+                //this.xrLabel_pageinfo.Text = string.Format("第{0}页，共{1}页", pageindex, pagecount - 1);
+                this.xrLabel_pageinfo.Text = string.Format(GetlanguageData("dev_Page", languageData)+ " {0} "+ GetlanguageData("dev_of", languageData)+ " {1}" , pageindex, pagecount - 1);
             }
         }
     }