报告程序增加颗粒列表的数量控制，报告图标读取Config\ReportTemplate\\ReportIdentification.bmp文件

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

@@ -29,6 +29,8 @@
     <index_cb_jzwfl_ljb>0</index_cb_jzwfl_ljb>
     <index_cb_jzwfl_klfw>0</index_cb_jzwfl_klfw>
     <str_cb_klcc_jsfs>CIRCLE</str_cb_klcc_jsfs>
+    <b_ck_klcc_dfl>True</b_ck_klcc_dfl>
+    <b_ck_klcc_xfl>True</b_ck_klcc_xfl>
   </M_KLFXJG>
   <M_YSFXJG>
     <b_ck_ysfx_xsmk>False</b_ck_ysfx_xsmk>
@@ -60,17 +62,21 @@
     </list_str_tb_yscf_ysxx>
   </M_YSFXJG>
   <M_SYXT>
-    <b_ck_syxt_xsmk>False</b_ck_syxt_xsmk>
+    <b_ck_syxt_xsmk>True</b_ck_syxt_xsmk>
     <index_cb_syxt_jsfs>0</index_cb_syxt_jsfs>
     <index_cb_syxt_klfw>0</index_cb_syxt_klfw>
     <str_cb_syxt_mhxssl>2</str_cb_syxt_mhxssl>
     <list_lbv_syxt_mblb>
       <MB0>MgO.CaO.Al₂O₃</MB0>
-      <MB1>CaO.SiO₂.Al₂O₃</MB1>
+      <MB1>CaO.S.Al₂O₃</MB1>
+      <MB2>CaO.SiO₂.Al₂O₃</MB2>
+      <MB3>MnO.S.Al₂O₃</MB3>
     </list_lbv_syxt_mblb>
     <list_lbv_syxt_mblb_index>
       <MBIndex0>0</MBIndex0>
-      <MBIndex1>2</MBIndex1>
+      <MBIndex1>1</MBIndex1>
+      <MBIndex2>2</MBIndex2>
+      <MBIndex3>3</MBIndex3>
     </list_lbv_syxt_mblb_index>
   </M_SYXT>
   <M_KLLBXX>
@@ -101,8 +107,8 @@
     <index_cb_kllb_sort_p3>3</index_cb_kllb_sort_p3>
     <str_cb_kllb_chartSort_p1>Area</str_cb_kllb_chartSort_p1>
     <index_cb_kllb_chartSort_p1>0</index_cb_kllb_chartSort_p1>
-    <str_cb_kllb_chartSort_p2>DMAX</str_cb_kllb_chartSort_p2>
-    <index_cb_kllb_chartSort_p2>1</index_cb_kllb_chartSort_p2>
+    <str_cb_kllb_chartSort_p2>AveGray</str_cb_kllb_chartSort_p2>
+    <index_cb_kllb_chartSort_p2>3</index_cb_kllb_chartSort_p2>
     <str_cb_kllb_chartSort_p3>AveGray</str_cb_kllb_chartSort_p3>
     <index_cb_kllb_chartSort_p3>3</index_cb_kllb_chartSort_p3>
     <str_cb_kllb_sort_p1>DMAX</str_cb_kllb_sort_p1>
@@ -115,6 +121,7 @@
     <list_str_kllb_DeleteClass>
       <YS0>misc</YS0>
     </list_str_kllb_DeleteClass>
+    <list_int_kllb_number>40</list_int_kllb_number>
   </M_KLLBXX>
   <M_address>
     <Path>./Config/ReportTemplate/ReportTemplateConfig.xml</Path>

OTSIncAReportApp/1-UI/OTSTemplateDesigner/Export_ReportTemplate.cs

@@ -1060,8 +1060,10 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                     if (str_fieldid == "-1")
                         continue;
 
-                    if (serialNumber > 20)
-                        continue;
+                    
+                    //if (serialNumber > 20)
+                    if (serialNumber > m_mbszclass.M_KLLBXX.list_int_kllb_number)
+                            continue;
 
                     Rectangle rectangle = new Rectangle() { X = Convert.ToInt32(dt_ParticlesGridDevidePage.Rows[i_row]["RectLeft"]), Y = Convert.ToInt32(dt_ParticlesGridDevidePage.Rows[i_row]["RectTop"]), Width = Convert.ToInt32(dt_ParticlesGridDevidePage.Rows[i_row]["RectWidth"]), Height = Convert.ToInt32(dt_ParticlesGridDevidePage.Rows[i_row]["RectHeight"]) };
                     Bitmap bp_field = fielddata.ReadImageFile(str_imagePath);
@@ -1759,8 +1761,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             }
             dt1 = dataTable.Copy();
             dt2 = dt_ElementalSubstance.Copy();
-            //m_list_dt.Add(dataTable);
-            //m_list_dt.Add(dt_ElementalSubstance);
+          
             return true;
         }
 
@@ -1983,17 +1984,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
 
                 PositionJeight = PositionJeight + 15;
             }
-
-
-            //g.DrawRectangle(mypen, 26, 27, 8, 8);
-            //g.DrawString("50-100 microns", myFont, sbrush, 38, 25);
-
-            //g.DrawRectangle(mypen, 170, 27, 8, 8);
-            //g.DrawString("50-100 microns", myFont, sbrush, 182, 25);
-
-            //g.DrawRectangle(mypen, 314, 27, 8, 8);
-            //g.DrawString("50-100 microns", myFont, sbrush, 326, 25);
-            //map.Save("D://2.bmp");
+      
             return map;
         }
 

OTSIncAReportApp/1-UI/OTSTemplateDesigner/OTSReport_Export.cs

@@ -220,6 +220,15 @@ namespace OTSIncAReportApp
             #region 颗粒分析结果部份
             public class KLFXJG
             {
+                /// <summary>
+                /// 大分类是否显示
+                /// </summary>
+                public bool b_ck_klcc_dfl { get; set; }
+                /// <summary>
+                /// 小分类是否显示
+                /// </summary>
+                public bool b_ck_klcc_xfl { get; set; }
+
                 /// <summary>
                 /// 是否显示颗粒尺寸分析结果表
                 /// </summary>
@@ -577,6 +586,11 @@ namespace OTSIncAReportApp
                 /// 颗粒列表去除不要的物质分类
                 /// </summary>
                 public List<string> list_str_kllb_DeleteClass { get; set; }
+
+                /// <summary>
+                /// 显示颗粒数量
+                /// </summary>
+                public int list_int_kllb_number { get; set; }
             }
             #endregion
             #region 夹杂物占比
@@ -669,6 +683,12 @@ namespace OTSIncAReportApp
             m_mbszclass.M_KLFXJG.index_cb_jzwfl_ljb = Convert.ToInt32(xmlutil2.Read("M_KLFXJG", "index_cb_jzwfl_ljb"));//粒级表
             m_mbszclass.M_KLFXJG.index_cb_jzwfl_klfw = Convert.ToInt32(xmlutil2.Read("M_KLFXJG", "index_cb_jzwfl_klfw"));//颗粒范围
 
+
+            m_mbszclass.M_KLFXJG.b_ck_klcc_dfl = Convert.ToBoolean(xmlutil2.Read("M_KLFXJG", "b_ck_klcc_dfl"));//大分类是否显示
+            m_mbszclass.M_KLFXJG.b_ck_klcc_xfl = Convert.ToBoolean(xmlutil2.Read("M_KLFXJG", "b_ck_klcc_xfl"));//小分类是否显示
+
+
+
             //元素分析结果
             m_mbszclass.M_YSFXJG.b_ck_ysfx_xsmk = Convert.ToBoolean(xmlutil2.Read("M_YSFXJG", "b_ck_ysfx_xsmk"));    //是否显示模块
             m_mbszclass.M_YSFXJG.index_cb_yxfx_jsfs = Convert.ToInt32(xmlutil2.Read("M_YSFXJG", "index_cb_yxfx_jsfs"));    //计算方式
@@ -813,6 +833,8 @@ namespace OTSIncAReportApp
             //夹杂物占比
             m_mbszclass.M_JZWZB.b_ck_surface = Convert.ToBoolean(xmlutil2.Read("M_JZWZB", "b_ck_surface"));//夹杂物占比表
             m_mbszclass.M_JZWZB.b_ck_chart= Convert.ToBoolean(xmlutil2.Read("M_JZWZB", "b_ck_chart"));//夹杂物占比图
+
+            m_mbszclass.M_KLLBXX.list_int_kllb_number = Convert.ToInt32(xmlutil2.Read("M_KLLBXX", "list_int_kllb_number"));//保存显示颗粒数量
         }
         /// <summary>
         /// 从配置文件中读取报告模板路径
@@ -1533,7 +1555,11 @@ namespace OTSIncAReportApp
                     {
 
                         if (m_mbszclass.M_KLFXJG.b_ck_klcc_xsmk)
-                            DEVReport.setParticleSizeTable(true,false);
+                        {
+                            //DEVReport.setParticleSizeTable(true, false);
+                            DEVReport.setParticleSizeTable(m_mbszclass.M_KLFXJG.b_ck_klcc_dfl, m_mbszclass.M_KLFXJG.b_ck_klcc_xfl);
+                        }
+                            //DEVReport.setParticleSizeTable(true,false);
                         lock (m_thread_flag)
                             m_thread_flag = strNill;
                     }
@@ -1767,6 +1793,7 @@ namespace OTSIncAReportApp
                 m_mbszclass.M_KLLBXX.index_cb_kllb_chartSort_p2 = Convert.ToInt32(xmlutil.Read("M_KLLBXX", "index_cb_kllb_chartSort_p2"));
                 //m_mbszclass.M_KLLBXX.str_cb_kllb_chartSort_p3 = Convert.ToString(xmlutil.Read("M_KLLBXX", "str_cb_kllb_chartSort_p3"));//帧图表列中第三个可选参数
                 //m_mbszclass.M_KLLBXX.index_cb_kllb_chartSort_p3 = Convert.ToInt32(xmlutil.Read("M_KLLBXX", "index_cb_kllb_chartSort_p3"));
+                m_mbszclass.M_KLLBXX.list_int_kllb_number= Convert.ToInt32(xmlutil.Read("M_KLLBXX", "list_int_kllb_number"));//保存显示颗粒数量
             }
         }
 

OTSIncAReportApp/1-UI/OTSTemplateDesigner/OTSReport_TemplateDesignerRM.Designer.cs

@@ -95,13 +95,7 @@
             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_npxx = new System.Windows.Forms.CheckBox();
-            this.ck_kllb_fdtx = new System.Windows.Forms.CheckBox();
-            this.ck_kllb_ystx = new System.Windows.Forms.CheckBox();
             this.ck_kllb_xsmk = new System.Windows.Forms.CheckBox();
-            this.label32 = new System.Windows.Forms.Label();
-            this.label31 = new System.Windows.Forms.Label();
-            this.label30 = new System.Windows.Forms.Label();
             this.label34 = new System.Windows.Forms.Label();
             this.button6 = new System.Windows.Forms.Button();
             this.panel2 = new System.Windows.Forms.Panel();
@@ -123,6 +117,12 @@
             this.groupBox9 = new System.Windows.Forms.GroupBox();
             this.label39 = new System.Windows.Forms.Label();
             this.cb_ParticleRange = new System.Windows.Forms.ComboBox();
+            this.label112121 = new System.Windows.Forms.Label();
+            this.numericMin = new System.Windows.Forms.NumericUpDown();
+            this.label1121ad = new System.Windows.Forms.Label();
+            this.label11zxc = new System.Windows.Forms.Label();
+            this.checkBox1 = new System.Windows.Forms.CheckBox();
+            this.checkBox2 = new System.Windows.Forms.CheckBox();
             this.groupBox1.SuspendLayout();
             this.groupBox4.SuspendLayout();
             this.groupBox6.SuspendLayout();
@@ -142,6 +142,7 @@
             this.groupBox211.SuspendLayout();
             this.groupBZ.SuspendLayout();
             this.groupBox9.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.numericMin)).BeginInit();
             this.SuspendLayout();
             // 
             // tb_FBT
@@ -377,6 +378,10 @@
             // 
             // groupBox4
             // 
+            this.groupBox4.Controls.Add(this.checkBox2);
+            this.groupBox4.Controls.Add(this.checkBox1);
+            this.groupBox4.Controls.Add(this.label11zxc);
+            this.groupBox4.Controls.Add(this.label1121ad);
             this.groupBox4.Controls.Add(this.ck_klcc_xsmk);
             this.groupBox4.Controls.Add(this.label17);
             this.groupBox4.Controls.Add(this.cb_klcc_ljb);
@@ -387,7 +392,7 @@
             this.groupBox4.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox4.Name = "groupBox4";
             this.groupBox4.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox4.Size = new System.Drawing.Size(268, 158);
+            this.groupBox4.Size = new System.Drawing.Size(268, 188);
             this.groupBox4.TabIndex = 2;
             this.groupBox4.TabStop = false;
             this.groupBox4.Text = "颗粒尺寸分析结果";
@@ -405,7 +410,7 @@
             // label17
             // 
             this.label17.AutoSize = true;
-            this.label17.Location = new System.Drawing.Point(9, 25);
+            this.label17.Location = new System.Drawing.Point(12, 25);
             this.label17.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label17.Name = "label17";
             this.label17.Size = new System.Drawing.Size(65, 12);
@@ -416,7 +421,7 @@
             // 
             this.cb_klcc_ljb.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cb_klcc_ljb.FormattingEnabled = true;
-            this.cb_klcc_ljb.Location = new System.Drawing.Point(19, 112);
+            this.cb_klcc_ljb.Location = new System.Drawing.Point(23, 156);
             this.cb_klcc_ljb.Margin = new System.Windows.Forms.Padding(2);
             this.cb_klcc_ljb.Name = "cb_klcc_ljb";
             this.cb_klcc_ljb.Size = new System.Drawing.Size(216, 20);
@@ -426,7 +431,7 @@
             // 
             this.cb_klcc_jsfs.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cb_klcc_jsfs.FormattingEnabled = true;
-            this.cb_klcc_jsfs.Location = new System.Drawing.Point(19, 67);
+            this.cb_klcc_jsfs.Location = new System.Drawing.Point(23, 111);
             this.cb_klcc_jsfs.Margin = new System.Windows.Forms.Padding(2);
             this.cb_klcc_jsfs.Name = "cb_klcc_jsfs";
             this.cb_klcc_jsfs.Size = new System.Drawing.Size(216, 20);
@@ -435,7 +440,7 @@
             // label15
             // 
             this.label15.AutoSize = true;
-            this.label15.Location = new System.Drawing.Point(19, 97);
+            this.label15.Location = new System.Drawing.Point(23, 141);
             this.label15.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label15.Name = "label15";
             this.label15.Size = new System.Drawing.Size(65, 12);
@@ -445,7 +450,7 @@
             // label14
             // 
             this.label14.AutoSize = true;
-            this.label14.Location = new System.Drawing.Point(17, 53);
+            this.label14.Location = new System.Drawing.Point(21, 97);
             this.label14.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label14.Name = "label14";
             this.label14.Size = new System.Drawing.Size(53, 12);
@@ -460,7 +465,7 @@
             this.groupBox6.Controls.Add(this.button4);
             this.groupBox6.Controls.Add(this.ck_ysfx_xsmk);
             this.groupBox6.Controls.Add(this.label25);
-            this.groupBox6.Location = new System.Drawing.Point(3, 614);
+            this.groupBox6.Location = new System.Drawing.Point(3, 640);
             this.groupBox6.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox6.Name = "groupBox6";
             this.groupBox6.Padding = new System.Windows.Forms.Padding(2);
@@ -539,7 +544,7 @@
             this.groupBox7.Controls.Add(this.label38);
             this.groupBox7.Controls.Add(this.label33);
             this.groupBox7.Controls.Add(this.label42);
-            this.groupBox7.Location = new System.Drawing.Point(3, 752);
+            this.groupBox7.Location = new System.Drawing.Point(3, 778);
             this.groupBox7.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox7.Name = "groupBox7";
             this.groupBox7.Padding = new System.Windows.Forms.Padding(2);
@@ -636,6 +641,8 @@
             // 
             // groupBox8
             // 
+            this.groupBox8.Controls.Add(this.numericMin);
+            this.groupBox8.Controls.Add(this.label112121);
             this.groupBox8.Controls.Add(this.label_delete_Class);
             this.groupBox8.Controls.Add(this.delete_Class);
             this.groupBox8.Controls.Add(this.label11111);
@@ -645,19 +652,13 @@
             this.groupBox8.Controls.Add(this.label111);
             this.groupBox8.Controls.Add(this.groupBox_zt);
             this.groupBox8.Controls.Add(this.groupBox_px);
-            this.groupBox8.Controls.Add(this.ck_kllb_npxx);
-            this.groupBox8.Controls.Add(this.ck_kllb_fdtx);
-            this.groupBox8.Controls.Add(this.ck_kllb_ystx);
             this.groupBox8.Controls.Add(this.ck_kllb_xsmk);
-            this.groupBox8.Controls.Add(this.label32);
-            this.groupBox8.Controls.Add(this.label31);
-            this.groupBox8.Controls.Add(this.label30);
             this.groupBox8.Controls.Add(this.label34);
-            this.groupBox8.Location = new System.Drawing.Point(3, 1227);
+            this.groupBox8.Location = new System.Drawing.Point(3, 1253);
             this.groupBox8.Margin = new System.Windows.Forms.Padding(2);
             this.groupBox8.Name = "groupBox8";
             this.groupBox8.Padding = new System.Windows.Forms.Padding(2);
-            this.groupBox8.Size = new System.Drawing.Size(263, 501);
+            this.groupBox8.Size = new System.Drawing.Size(263, 529);
             this.groupBox8.TabIndex = 6;
             this.groupBox8.TabStop = false;
             this.groupBox8.Text = "颗粒列表";
@@ -665,7 +666,7 @@
             // label_delete_Class
             // 
             this.label_delete_Class.AutoSize = true;
-            this.label_delete_Class.Location = new System.Drawing.Point(12, 440);
+            this.label_delete_Class.Location = new System.Drawing.Point(7, 471);
             this.label_delete_Class.Name = "label_delete_Class";
             this.label_delete_Class.Size = new System.Drawing.Size(101, 12);
             this.label_delete_Class.TabIndex = 63;
@@ -673,7 +674,7 @@
             // 
             // delete_Class
             // 
-            this.delete_Class.Location = new System.Drawing.Point(11, 464);
+            this.delete_Class.Location = new System.Drawing.Point(6, 495);
             this.delete_Class.Name = "delete_Class";
             this.delete_Class.Size = new System.Drawing.Size(181, 21);
             this.delete_Class.TabIndex = 62;
@@ -681,7 +682,7 @@
             // label11111
             // 
             this.label11111.AutoSize = true;
-            this.label11111.Location = new System.Drawing.Point(14, 382);
+            this.label11111.Location = new System.Drawing.Point(9, 413);
             this.label11111.Name = "label11111";
             this.label11111.Size = new System.Drawing.Size(77, 12);
             this.label11111.TabIndex = 61;
@@ -689,7 +690,7 @@
             // 
             // button5
             // 
-            this.button5.Location = new System.Drawing.Point(181, 403);
+            this.button5.Location = new System.Drawing.Point(176, 434);
             this.button5.Name = "button5";
             this.button5.Size = new System.Drawing.Size(76, 23);
             this.button5.TabIndex = 60;
@@ -699,7 +700,7 @@
             // 
             // tb_RemoveElements
             // 
-            this.tb_RemoveElements.Location = new System.Drawing.Point(11, 405);
+            this.tb_RemoveElements.Location = new System.Drawing.Point(6, 436);
             this.tb_RemoveElements.Margin = new System.Windows.Forms.Padding(2);
             this.tb_RemoveElements.Name = "tb_RemoveElements";
             this.tb_RemoveElements.ReadOnly = true;
@@ -718,7 +719,7 @@
             // label111
             // 
             this.label111.AutoSize = true;
-            this.label111.Location = new System.Drawing.Point(7, 47);
+            this.label111.Location = new System.Drawing.Point(7, 51);
             this.label111.Name = "label111";
             this.label111.Size = new System.Drawing.Size(53, 12);
             this.label111.TabIndex = 56;
@@ -730,7 +731,7 @@
             this.groupBox_zt.Controls.Add(this.cb_FrameChart_p2);
             this.groupBox_zt.Controls.Add(this.ParticleList_4);
             this.groupBox_zt.Controls.Add(this.cb_FrameChart_p1);
-            this.groupBox_zt.Location = new System.Drawing.Point(8, 239);
+            this.groupBox_zt.Location = new System.Drawing.Point(8, 276);
             this.groupBox_zt.Name = "groupBox_zt";
             this.groupBox_zt.Size = new System.Drawing.Size(249, 125);
             this.groupBox_zt.TabIndex = 55;
@@ -785,7 +786,7 @@
             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(8, 67);
+            this.groupBox_px.Location = new System.Drawing.Point(8, 104);
             this.groupBox_px.Name = "groupBox_px";
             this.groupBox_px.Size = new System.Drawing.Size(249, 166);
             this.groupBox_px.TabIndex = 54;
@@ -852,39 +853,6 @@
             this.comboBox_p1.Size = new System.Drawing.Size(216, 20);
             this.comboBox_p1.TabIndex = 43;
             // 
-            // ck_kllb_npxx
-            // 
-            this.ck_kllb_npxx.AutoSize = true;
-            this.ck_kllb_npxx.Location = new System.Drawing.Point(229, 440);
-            this.ck_kllb_npxx.Margin = new System.Windows.Forms.Padding(2);
-            this.ck_kllb_npxx.Name = "ck_kllb_npxx";
-            this.ck_kllb_npxx.Size = new System.Drawing.Size(15, 14);
-            this.ck_kllb_npxx.TabIndex = 53;
-            this.ck_kllb_npxx.UseVisualStyleBackColor = true;
-            this.ck_kllb_npxx.Visible = false;
-            // 
-            // ck_kllb_fdtx
-            // 
-            this.ck_kllb_fdtx.AutoSize = true;
-            this.ck_kllb_fdtx.Location = new System.Drawing.Point(229, 412);
-            this.ck_kllb_fdtx.Margin = new System.Windows.Forms.Padding(2);
-            this.ck_kllb_fdtx.Name = "ck_kllb_fdtx";
-            this.ck_kllb_fdtx.Size = new System.Drawing.Size(15, 14);
-            this.ck_kllb_fdtx.TabIndex = 53;
-            this.ck_kllb_fdtx.UseVisualStyleBackColor = true;
-            this.ck_kllb_fdtx.Visible = false;
-            // 
-            // ck_kllb_ystx
-            // 
-            this.ck_kllb_ystx.AutoSize = true;
-            this.ck_kllb_ystx.Location = new System.Drawing.Point(229, 386);
-            this.ck_kllb_ystx.Margin = new System.Windows.Forms.Padding(2);
-            this.ck_kllb_ystx.Name = "ck_kllb_ystx";
-            this.ck_kllb_ystx.Size = new System.Drawing.Size(15, 14);
-            this.ck_kllb_ystx.TabIndex = 53;
-            this.ck_kllb_ystx.UseVisualStyleBackColor = true;
-            this.ck_kllb_ystx.Visible = false;
-            // 
             // ck_kllb_xsmk
             // 
             this.ck_kllb_xsmk.AutoSize = true;
@@ -895,39 +863,6 @@
             this.ck_kllb_xsmk.TabIndex = 53;
             this.ck_kllb_xsmk.UseVisualStyleBackColor = true;
             // 
-            // label32
-            // 
-            this.label32.AutoSize = true;
-            this.label32.Location = new System.Drawing.Point(21, 440);
-            this.label32.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.label32.Name = "label32";
-            this.label32.Size = new System.Drawing.Size(53, 12);
-            this.label32.TabIndex = 52;
-            this.label32.Text = "能谱信息";
-            this.label32.Visible = false;
-            // 
-            // label31
-            // 
-            this.label31.AutoSize = true;
-            this.label31.Location = new System.Drawing.Point(19, 414);
-            this.label31.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.label31.Name = "label31";
-            this.label31.Size = new System.Drawing.Size(53, 12);
-            this.label31.TabIndex = 52;
-            this.label31.Text = "放大图像";
-            this.label31.Visible = false;
-            // 
-            // label30
-            // 
-            this.label30.AutoSize = true;
-            this.label30.Location = new System.Drawing.Point(19, 388);
-            this.label30.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.label30.Name = "label30";
-            this.label30.Size = new System.Drawing.Size(53, 12);
-            this.label30.TabIndex = 52;
-            this.label30.Text = "原始图像";
-            this.label30.Visible = false;
-            // 
             // label34
             // 
             this.label34.AutoSize = true;
@@ -1050,7 +985,7 @@
             this.groupBox211.Controls.Add(this.label1311);
             this.groupBox211.Controls.Add(this.label1211);
             this.groupBox211.Controls.Add(this.ck_jzwzb_surface);
-            this.groupBox211.Location = new System.Drawing.Point(3, 1749);
+            this.groupBox211.Location = new System.Drawing.Point(3, 1787);
             this.groupBox211.Name = "groupBox211";
             this.groupBox211.Size = new System.Drawing.Size(263, 81);
             this.groupBox211.TabIndex = 8;
@@ -1097,7 +1032,7 @@
             // groupBZ
             // 
             this.groupBZ.Controls.Add(this.textBox_strBZ);
-            this.groupBZ.Location = new System.Drawing.Point(5, 1838);
+            this.groupBZ.Location = new System.Drawing.Point(3, 1874);
             this.groupBZ.Name = "groupBZ";
             this.groupBZ.Size = new System.Drawing.Size(263, 139);
             this.groupBZ.TabIndex = 7;
@@ -1154,6 +1089,77 @@
             this.cb_ParticleRange.Size = new System.Drawing.Size(121, 20);
             this.cb_ParticleRange.TabIndex = 76;
             // 
+            // label112121
+            // 
+            this.label112121.AutoSize = true;
+            this.label112121.Location = new System.Drawing.Point(7, 77);
+            this.label112121.Name = "label112121";
+            this.label112121.Size = new System.Drawing.Size(53, 12);
+            this.label112121.TabIndex = 64;
+            this.label112121.Text = "显示数量";
+            // 
+            // numericMin
+            // 
+            this.numericMin.Increment = new decimal(new int[] {
+            10,
+            0,
+            0,
+            0});
+            this.numericMin.Location = new System.Drawing.Point(167, 68);
+            this.numericMin.Maximum = new decimal(new int[] {
+            99999,
+            0,
+            0,
+            0});
+            this.numericMin.Name = "numericMin";
+            this.numericMin.Size = new System.Drawing.Size(72, 21);
+            this.numericMin.TabIndex = 66;
+            this.numericMin.Value = new decimal(new int[] {
+            10,
+            0,
+            0,
+            0});
+            // 
+            // label1121ad
+            // 
+            this.label1121ad.AutoSize = true;
+            this.label1121ad.Location = new System.Drawing.Point(12, 48);
+            this.label1121ad.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label1121ad.Name = "label1121ad";
+            this.label1121ad.Size = new System.Drawing.Size(65, 12);
+            this.label1121ad.TabIndex = 54;
+            this.label1121ad.Text = "显示大分类";
+            // 
+            // label11zxc
+            // 
+            this.label11zxc.AutoSize = true;
+            this.label11zxc.Location = new System.Drawing.Point(12, 71);
+            this.label11zxc.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label11zxc.Name = "label11zxc";
+            this.label11zxc.Size = new System.Drawing.Size(65, 12);
+            this.label11zxc.TabIndex = 55;
+            this.label11zxc.Text = "显示小分类";
+            // 
+            // checkBox1
+            // 
+            this.checkBox1.AutoSize = true;
+            this.checkBox1.Location = new System.Drawing.Point(224, 48);
+            this.checkBox1.Margin = new System.Windows.Forms.Padding(2);
+            this.checkBox1.Name = "checkBox1";
+            this.checkBox1.Size = new System.Drawing.Size(15, 14);
+            this.checkBox1.TabIndex = 56;
+            this.checkBox1.UseVisualStyleBackColor = true;
+            // 
+            // checkBox2
+            // 
+            this.checkBox2.AutoSize = true;
+            this.checkBox2.Location = new System.Drawing.Point(224, 71);
+            this.checkBox2.Margin = new System.Windows.Forms.Padding(2);
+            this.checkBox2.Name = "checkBox2";
+            this.checkBox2.Size = new System.Drawing.Size(15, 14);
+            this.checkBox2.TabIndex = 57;
+            this.checkBox2.UseVisualStyleBackColor = true;
+            // 
             // OTSReport_TemplateDesignerRM
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -1204,6 +1210,7 @@
             this.groupBZ.PerformLayout();
             this.groupBox9.ResumeLayout(false);
             this.groupBox9.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.numericMin)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -1248,13 +1255,7 @@
         private System.Windows.Forms.ComboBox cb_syxt_mhxssl;
         private System.Windows.Forms.Label label42;
         private System.Windows.Forms.GroupBox groupBox8;
-        private System.Windows.Forms.CheckBox ck_kllb_npxx;
-        private System.Windows.Forms.CheckBox ck_kllb_fdtx;
-        private System.Windows.Forms.CheckBox ck_kllb_ystx;
         private System.Windows.Forms.CheckBox ck_kllb_xsmk;
-        private System.Windows.Forms.Label label32;
-        private System.Windows.Forms.Label label31;
-        private System.Windows.Forms.Label label30;
         private System.Windows.Forms.Label label34;
         private System.Windows.Forms.CheckBox ck_ym;
         private System.Windows.Forms.Label label33;
@@ -1304,5 +1305,11 @@
         private System.Windows.Forms.Label label11111;
         private System.Windows.Forms.Label label_delete_Class;
         private System.Windows.Forms.TextBox delete_Class;
+        private System.Windows.Forms.Label label112121;
+        private System.Windows.Forms.NumericUpDown numericMin;
+        private System.Windows.Forms.CheckBox checkBox2;
+        private System.Windows.Forms.CheckBox checkBox1;
+        private System.Windows.Forms.Label label11zxc;
+        private System.Windows.Forms.Label label1121ad;
     }
 }

OTSIncAReportApp/1-UI/OTSTemplateDesigner/OTSReport_TemplateDesignerRM.cs

@@ -433,6 +433,12 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_KLFXJG.index_cb_jzwfl_jsfs.ToString(), "M_KLFXJG", "index_cb_jzwfl_jsfs");//计算方式
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_KLFXJG.index_cb_jzwfl_ljb.ToString(), "M_KLFXJG", "index_cb_jzwfl_ljb");//粒级表
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_KLFXJG.index_cb_jzwfl_klfw.ToString(), "M_KLFXJG", "index_cb_jzwfl_klfw");//颗粒范围
+
+                xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_KLFXJG.b_ck_klcc_dfl.ToString(), "M_KLFXJG", "b_ck_klcc_dfl");//大分类是否显示
+                xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_KLFXJG.b_ck_klcc_xfl.ToString(), "M_KLFXJG", "b_ck_klcc_xfl");//小分类是否显示
+              
+
+
                 //元素分析结果
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_YSFXJG.b_ck_ysfx_xsmk.ToString(), "M_YSFXJG", "b_ck_ysfx_xsmk");    //是否显示模块
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_YSFXJG.index_cb_yxfx_jsfs.ToString(), "M_YSFXJG", "index_cb_yxfx_jsfs");    //计算方式
@@ -573,6 +579,8 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                                                                                                                                                        //xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_KLLBXX.str_cb_kllb_chartSort_p3.ToString(), "M_KLLBXX", "str_cb_kllb_chartSort_p3");//帧图表列第三个可选参数（string）
                                                                                                                                                        //xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_KLLBXX.index_cb_kllb_chartSort_p3.ToString(), "M_KLLBXX", "index_cb_kllb_chartSort_p3");//帧图表列第三个可选参数（index）
 
+
+                xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_KLLBXX.list_int_kllb_number.ToString(), "M_KLLBXX", "list_int_kllb_number");//保存显示颗粒数量
                 xmlutil.Write(m_OTSReport_Export.m_mbszclass.M_KLLBXX.str_kllb_qcys.ToString(), "M_KLLBXX", "str_kllb_qcys");
                 
                 for (int i = 0; i < m_OTSReport_Export.m_mbszclass.M_KLLBXX.list_str_kllb_qcys.Count; i++)                              //去除元素列表
@@ -648,7 +656,15 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             m_OTSReport_Export.m_mbszclass.M_KLFXJG.index_cb_klcc_jsfs = cb_klcc_jsfs.SelectedIndex;
             m_OTSReport_Export.m_mbszclass.M_KLFXJG.str_cb_klcc_ljb = cb_klcc_ljb.Text;//粒级表
             m_OTSReport_Export.m_mbszclass.M_KLFXJG.index_cb_klcc_ljb = cb_klcc_ljb.SelectedIndex;
-           
+
+
+            //是否显示大分类
+            m_OTSReport_Export.m_mbszclass.M_KLFXJG.b_ck_klcc_dfl = checkBox1.Checked;
+            //是否显示小分类
+            m_OTSReport_Export.m_mbszclass.M_KLFXJG.b_ck_klcc_xfl = checkBox2.Checked;
+
+
+
 
             //元素分析结果
             m_OTSReport_Export.m_mbszclass.M_YSFXJG.b_ck_ysfx_xsmk = ck_ysfx_xsmk.Checked;
@@ -682,7 +698,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             //颗粒列表信息
             m_OTSReport_Export.m_mbszclass.M_KLLBXX.b_ck_kllb_xsmk = ck_kllb_xsmk.Checked;
             m_OTSReport_Export.m_mbszclass.M_KLLBXX.b_ck_kllb_fjzt = ck_kllb_fjzt.Checked;
-
+            m_OTSReport_Export.m_mbszclass.M_KLLBXX.list_int_kllb_number = Convert.ToInt32(numericMin.Text);
 
             m_OTSReport_Export.m_mbszclass.M_KLLBXX.str_cb_kllb_sort_p1 = comboBox_p1.Text;//颗粒列表行第一个字段的可选参数
             m_OTSReport_Export.m_mbszclass.M_KLLBXX.index_cb_kllb_sort_p1 = comboBox_p1.SelectedIndex;
@@ -710,9 +726,13 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
 
 
             //m_OTSReport_Export.m_mbszclass.M_KLLBXX.str_tb_kllb_sxys = tb_kllb_sxys.Text;//显示元素
-            m_OTSReport_Export.m_mbszclass.M_KLLBXX.b_ck_kllb_ystx = ck_kllb_ystx.Checked;//原始图像
-            m_OTSReport_Export.m_mbszclass.M_KLLBXX.b_ck_kllb_fdtx = ck_kllb_fdtx.Checked;//放大图像
-            m_OTSReport_Export.m_mbszclass.M_KLLBXX.b_ck_kllb_npxx = ck_kllb_npxx.Checked;//能谱图像
+            //m_OTSReport_Export.m_mbszclass.M_KLLBXX.b_ck_kllb_ystx = ck_kllb_ystx.Checked;//原始图像
+            //m_OTSReport_Export.m_mbszclass.M_KLLBXX.b_ck_kllb_fdtx = ck_kllb_fdtx.Checked;//放大图像
+            //m_OTSReport_Export.m_mbszclass.M_KLLBXX.b_ck_kllb_npxx = ck_kllb_npxx.Checked;//能谱图像
+
+            m_OTSReport_Export.m_mbszclass.M_KLLBXX.b_ck_kllb_ystx = true;//原始图像
+            m_OTSReport_Export.m_mbszclass.M_KLLBXX.b_ck_kllb_fdtx =false;//放大图像
+            m_OTSReport_Export.m_mbszclass.M_KLLBXX.b_ck_kllb_npxx = true;//能谱图像
             //备注
             m_OTSReport_Export.m_mbszclass.M_SY.str_bz = textBox_strBZ.Text;
 
@@ -752,7 +772,11 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             cb_klcc_jsfs.SelectedIndex = m_OTSReport_Export.m_mbszclass.M_KLFXJG.index_cb_klcc_jsfs;
             //cb_klcc_ljb.Text = m_OTSReport_Export.m_mbszclass.M_KLFXJG.str_cb_klcc_ljb;//粒级表
             cb_klcc_ljb.SelectedIndex = m_OTSReport_Export.m_mbszclass.M_KLFXJG.index_cb_klcc_ljb;
-           
+            //是否显示大分类
+            checkBox1.Checked = m_OTSReport_Export.m_mbszclass.M_KLFXJG.b_ck_klcc_dfl;
+            //是否显示小分类
+            checkBox2.Checked = m_OTSReport_Export.m_mbszclass.M_KLFXJG.b_ck_klcc_xfl;
+
 
             //元素分析结果
             ck_ysfx_xsmk.Checked = m_OTSReport_Export.m_mbszclass.M_YSFXJG.b_ck_ysfx_xsmk;
@@ -786,11 +810,11 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
 
             tb_RemoveElements.Text = m_OTSReport_Export.m_mbszclass.M_KLLBXX.str_kllb_qcys;
 
-            ck_kllb_ystx.Checked = m_OTSReport_Export.m_mbszclass.M_KLLBXX.b_ck_kllb_ystx;//原始图像
-            ck_kllb_fdtx.Checked = m_OTSReport_Export.m_mbszclass.M_KLLBXX.b_ck_kllb_fdtx;//放大图像
-            ck_kllb_npxx.Checked = m_OTSReport_Export.m_mbszclass.M_KLLBXX.b_ck_kllb_npxx;//能谱图像
+            //ck_kllb_ystx.Checked = m_OTSReport_Export.m_mbszclass.M_KLLBXX.b_ck_kllb_ystx;//原始图像
+            //ck_kllb_fdtx.Checked = m_OTSReport_Export.m_mbszclass.M_KLLBXX.b_ck_kllb_fdtx;//放大图像
+            //ck_kllb_npxx.Checked = m_OTSReport_Export.m_mbszclass.M_KLLBXX.b_ck_kllb_npxx;//能谱图像
 
-           
+            numericMin.Value = Convert.ToInt32(m_OTSReport_Export.m_mbszclass.M_KLLBXX.list_int_kllb_number);
             comboBox_p1.SelectedIndex = m_OTSReport_Export.m_mbszclass.M_KLLBXX.index_cb_kllb_sort_p1;
             comboBox_p2.SelectedIndex = m_OTSReport_Export.m_mbszclass.M_KLLBXX.index_cb_kllb_sort_p2;
             comboBox_p3.SelectedIndex = m_OTSReport_Export.m_mbszclass.M_KLLBXX.index_cb_kllb_sort_p3;
@@ -803,6 +827,8 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             //夹杂物占比
             ck_jzwzb_surface.Checked = m_OTSReport_Export.m_mbszclass.M_JZWZB.b_ck_surface;//夹杂物占比表
             ck_jzwzb_chart.Checked = m_OTSReport_Export.m_mbszclass.M_JZWZB.b_ck_chart;//夹杂物占比图
+
+            numericMin.Text = m_OTSReport_Export.m_mbszclass.M_KLLBXX.list_int_kllb_number.ToString();
         }
 
         /// <summary>

OTSIncAReportApp/Properties/licenses.licx

@@ -0,0 +1 @@
+DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v21.2, Version=21.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

OTSIncAReportApp/ReportTemplate/OTS_DEVReport.Designer.cs

@@ -39,6 +39,8 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.xrLine2 = new DevExpress.XtraReports.UI.XRLine();
             this.dev_yj = new DevExpress.XtraReports.UI.XRLabel();
             this.Detail = new DevExpress.XtraReports.UI.DetailBand();
+            this.xrLabel_size_IconQuestion_Subdivision = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrChart_ParticelSizeSubdivision = new DevExpress.XtraReports.UI.XRChart();
             this.xrPageBreak6 = new DevExpress.XtraReports.UI.XRPageBreak();
             this.xrTb_ElementAnalysis = new DevExpress.XtraReports.UI.XRTable();
             this.xrTableRow22 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -118,10 +120,8 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.xrCell_Element_s9 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrCell_Element_s10 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrPageBreak3 = new DevExpress.XtraReports.UI.XRPageBreak();
-            this.xrLabel_size_IconQuestion_Subdivision = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel_size_IconQuestion_Class = new DevExpress.XtraReports.UI.XRLabel();
             this.xrChart_ParticelSizeCalss = new DevExpress.XtraReports.UI.XRChart();
-            this.xrChart_ParticelSizeSubdivision = new DevExpress.XtraReports.UI.XRChart();
             this.xrPageBreak2 = new DevExpress.XtraReports.UI.XRPageBreak();
             this.xrTa_ParticleSizeTable = new DevExpress.XtraReports.UI.XRTable();
             this.xrTableRow8 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -179,6 +179,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.dev_fbt = new DevExpress.XtraReports.UI.XRLabel();
             this.dev_zbt = new DevExpress.XtraReports.UI.XRLabel();
             this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox();
+            ((System.ComponentModel.ISupportInitialize)(this.xrChart_ParticelSizeSubdivision)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTb_ElementAnalysis)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable_kllb_surface)).BeginInit();
@@ -187,7 +188,6 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             ((System.ComponentModel.ISupportInitialize)(this.xr_tbAreaOfInclusion)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTb_ElementAnalysisTable)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrChart_ParticelSizeCalss)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrChart_ParticelSizeSubdivision)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTa_ParticleSizeTable)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
@@ -223,6 +223,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             // 
             // xrPictureBox1
             // 
+            this.xrPictureBox1.ImageAlignment = DevExpress.XtraPrinting.ImageAlignment.MiddleCenter;
             this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource"));
             this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(10.0001F, 10.00001F);
             this.xrPictureBox1.Name = "xrPictureBox1";
@@ -303,6 +304,50 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.Detail.HeightF = 4296.916F;
             this.Detail.Name = "Detail";
             // 
+            // xrLabel_size_IconQuestion_Subdivision
+            // 
+            this.xrLabel_size_IconQuestion_Subdivision.LocationFloat = new DevExpress.Utils.PointFloat(30.41687F, 1483.25F);
+            this.xrLabel_size_IconQuestion_Subdivision.Multiline = true;
+            this.xrLabel_size_IconQuestion_Subdivision.Name = "xrLabel_size_IconQuestion_Subdivision";
+            this.xrLabel_size_IconQuestion_Subdivision.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel_size_IconQuestion_Subdivision.SizeF = new System.Drawing.SizeF(630F, 23F);
+            this.xrLabel_size_IconQuestion_Subdivision.StylePriority.UseTextAlignment = false;
+            this.xrLabel_size_IconQuestion_Subdivision.Text = "xrLabel_size_IconQuestion_Subdivision";
+            this.xrLabel_size_IconQuestion_Subdivision.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrLabel_size_IconQuestion_Subdivision.Visible = false;
+            // 
+            // xrChart_ParticelSizeSubdivision
+            // 
+            this.xrChart_ParticelSizeSubdivision.BorderColor = System.Drawing.Color.Black;
+            this.xrChart_ParticelSizeSubdivision.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.xrChart_ParticelSizeSubdivision.Legend.Name = "Default Legend";
+            this.xrChart_ParticelSizeSubdivision.LocationFloat = new DevExpress.Utils.PointFloat(30.41662F, 1506.25F);
+            this.xrChart_ParticelSizeSubdivision.Name = "xrChart_ParticelSizeSubdivision";
+            this.xrChart_ParticelSizeSubdivision.PaletteName = "Palette 1";
+            this.xrChart_ParticelSizeSubdivision.PaletteRepository.Add("Palette 1", new DevExpress.XtraCharts.Palette("Palette 1", DevExpress.XtraCharts.PaletteScaleMode.Repeat, new DevExpress.XtraCharts.PaletteEntry[] {
+                new DevExpress.XtraCharts.PaletteEntry(System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128))))), System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))))),
+                new DevExpress.XtraCharts.PaletteEntry(System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))), System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))))),
+                new DevExpress.XtraCharts.PaletteEntry(System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))), System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))))),
+                new DevExpress.XtraCharts.PaletteEntry(System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))), System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))))),
+                new DevExpress.XtraCharts.PaletteEntry(System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))), System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))))),
+                new DevExpress.XtraCharts.PaletteEntry(System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(128)))), ((int)(((byte)(255))))), System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(128)))), ((int)(((byte)(255)))))),
+                new DevExpress.XtraCharts.PaletteEntry(System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(192))))), System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(192)))))),
+                new DevExpress.XtraCharts.PaletteEntry(System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(255))))), System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(255)))))),
+                new DevExpress.XtraCharts.PaletteEntry(System.Drawing.Color.Red, System.Drawing.Color.Red),
+                new DevExpress.XtraCharts.PaletteEntry(System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(192))))), System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(192)))))),
+                new DevExpress.XtraCharts.PaletteEntry(System.Drawing.Color.Fuchsia, System.Drawing.Color.Fuchsia),
+                new DevExpress.XtraCharts.PaletteEntry(System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))), System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))))),
+                new DevExpress.XtraCharts.PaletteEntry(System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(64))))), System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(64)))))),
+                new DevExpress.XtraCharts.PaletteEntry(System.Drawing.Color.Green, System.Drawing.Color.Green),
+                new DevExpress.XtraCharts.PaletteEntry(System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(160))))), System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(160)))))),
+                new DevExpress.XtraCharts.PaletteEntry(System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(0)))), ((int)(((byte)(64))))), System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(0)))), ((int)(((byte)(64)))))),
+                new DevExpress.XtraCharts.PaletteEntry(System.Drawing.Color.Olive, System.Drawing.Color.Olive),
+                new DevExpress.XtraCharts.PaletteEntry(System.Drawing.Color.Gray, System.Drawing.Color.Gray),
+                new DevExpress.XtraCharts.PaletteEntry(System.Drawing.Color.Black, System.Drawing.Color.Black)}));
+            this.xrChart_ParticelSizeSubdivision.SeriesSerializable = new DevExpress.XtraCharts.Series[0];
+            this.xrChart_ParticelSizeSubdivision.SizeF = new System.Drawing.SizeF(630F, 478.3333F);
+            this.xrChart_ParticelSizeSubdivision.Visible = false;
+            // 
             // xrPageBreak6
             // 
             this.xrPageBreak6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 2109.292F);
@@ -1016,18 +1061,6 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.xrPageBreak3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 1999.917F);
             this.xrPageBreak3.Name = "xrPageBreak3";
             // 
-            // xrLabel_size_IconQuestion_Subdivision
-            // 
-            this.xrLabel_size_IconQuestion_Subdivision.LocationFloat = new DevExpress.Utils.PointFloat(30.41687F, 1483.25F);
-            this.xrLabel_size_IconQuestion_Subdivision.Multiline = true;
-            this.xrLabel_size_IconQuestion_Subdivision.Name = "xrLabel_size_IconQuestion_Subdivision";
-            this.xrLabel_size_IconQuestion_Subdivision.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel_size_IconQuestion_Subdivision.SizeF = new System.Drawing.SizeF(630F, 23F);
-            this.xrLabel_size_IconQuestion_Subdivision.StylePriority.UseTextAlignment = false;
-            this.xrLabel_size_IconQuestion_Subdivision.Text = "xrLabel_size_IconQuestion_Subdivision";
-            this.xrLabel_size_IconQuestion_Subdivision.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-            this.xrLabel_size_IconQuestion_Subdivision.Visible = false;
-            // 
             // xrLabel_size_IconQuestion_Class
             // 
             this.xrLabel_size_IconQuestion_Class.LocationFloat = new DevExpress.Utils.PointFloat(30.41662F, 1060.25F);
@@ -1051,38 +1084,6 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.xrChart_ParticelSizeCalss.SizeF = new System.Drawing.SizeF(630F, 400F);
             this.xrChart_ParticelSizeCalss.Visible = false;
             // 
-            // xrChart_ParticelSizeSubdivision
-            // 
-            this.xrChart_ParticelSizeSubdivision.BorderColor = System.Drawing.Color.Black;
-            this.xrChart_ParticelSizeSubdivision.Borders = DevExpress.XtraPrinting.BorderSide.None;
-            this.xrChart_ParticelSizeSubdivision.Legend.Name = "Default Legend";
-            this.xrChart_ParticelSizeSubdivision.LocationFloat = new DevExpress.Utils.PointFloat(30.41662F, 1506.25F);
-            this.xrChart_ParticelSizeSubdivision.Name = "xrChart_ParticelSizeSubdivision";
-            this.xrChart_ParticelSizeSubdivision.PaletteName = "Palette 1";
-            this.xrChart_ParticelSizeSubdivision.PaletteRepository.Add("Palette 1", new DevExpress.XtraCharts.Palette("Palette 1", DevExpress.XtraCharts.PaletteScaleMode.Repeat, new DevExpress.XtraCharts.PaletteEntry[] {
-                new DevExpress.XtraCharts.PaletteEntry(System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128))))), System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(128)))))),
-                new DevExpress.XtraCharts.PaletteEntry(System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))), System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))))),
-                new DevExpress.XtraCharts.PaletteEntry(System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))), System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))))),
-                new DevExpress.XtraCharts.PaletteEntry(System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))), System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(255)))), ((int)(((byte)(128)))))),
-                new DevExpress.XtraCharts.PaletteEntry(System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))), System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))))),
-                new DevExpress.XtraCharts.PaletteEntry(System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(128)))), ((int)(((byte)(255))))), System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(128)))), ((int)(((byte)(255)))))),
-                new DevExpress.XtraCharts.PaletteEntry(System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(192))))), System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(192)))))),
-                new DevExpress.XtraCharts.PaletteEntry(System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(255))))), System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(255)))))),
-                new DevExpress.XtraCharts.PaletteEntry(System.Drawing.Color.Red, System.Drawing.Color.Red),
-                new DevExpress.XtraCharts.PaletteEntry(System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(192))))), System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(128)))), ((int)(((byte)(192)))))),
-                new DevExpress.XtraCharts.PaletteEntry(System.Drawing.Color.Fuchsia, System.Drawing.Color.Fuchsia),
-                new DevExpress.XtraCharts.PaletteEntry(System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))), System.Drawing.Color.FromArgb(((int)(((byte)(128)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))))),
-                new DevExpress.XtraCharts.PaletteEntry(System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(64))))), System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(128)))), ((int)(((byte)(64)))))),
-                new DevExpress.XtraCharts.PaletteEntry(System.Drawing.Color.Green, System.Drawing.Color.Green),
-                new DevExpress.XtraCharts.PaletteEntry(System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(160))))), System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(160)))))),
-                new DevExpress.XtraCharts.PaletteEntry(System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(0)))), ((int)(((byte)(64))))), System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(0)))), ((int)(((byte)(64)))))),
-                new DevExpress.XtraCharts.PaletteEntry(System.Drawing.Color.Olive, System.Drawing.Color.Olive),
-                new DevExpress.XtraCharts.PaletteEntry(System.Drawing.Color.Gray, System.Drawing.Color.Gray),
-                new DevExpress.XtraCharts.PaletteEntry(System.Drawing.Color.Black, System.Drawing.Color.Black)}));
-            this.xrChart_ParticelSizeSubdivision.SeriesSerializable = new DevExpress.XtraCharts.Series[0];
-            this.xrChart_ParticelSizeSubdivision.SizeF = new System.Drawing.SizeF(630F, 478.3333F);
-            this.xrChart_ParticelSizeSubdivision.Visible = false;
-            // 
             // xrPageBreak2
             // 
             this.xrPageBreak2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 1058.25F);
@@ -1693,7 +1694,8 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.Detail});
             this.Font = new System.Drawing.Font("Arial", 9.75F);
             this.Margins = new System.Drawing.Printing.Margins(77, 85, 73, 55);
-            this.Version = "20.1";
+            this.Version = "21.2";
+            ((System.ComponentModel.ISupportInitialize)(this.xrChart_ParticelSizeSubdivision)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTb_ElementAnalysis)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable_kllb_surface)).EndInit();
@@ -1702,7 +1704,6 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             ((System.ComponentModel.ISupportInitialize)(this.xr_tbAreaOfInclusion)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTb_ElementAnalysisTable)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrChart_ParticelSizeCalss)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrChart_ParticelSizeSubdivision)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTa_ParticleSizeTable)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();

OTSIncAReportApp/ReportTemplate/OTS_DEVReport.cs

@@ -21,11 +21,11 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
         Export_ReportTemplate export_ReportTemplate;
         //SizeF syx_Size = new SizeF(668f, 660.54f);
         SizeF syx_Size = new SizeF(668f, 616.67f);
-        
+
         //float LowPlace = 3120f;
         float NeueStartposition = 3300f;
 
-        ElementSubscript subscript=new ElementSubscript();
+        ElementSubscript subscript = new ElementSubscript();
 
         c_TemplateClass TemplateClass;
 
@@ -102,18 +102,25 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             setXRLabelData(xrLabel_inca_pic_class, GetlanguageData(xrLabel_inca_pic_class.Name.ToString(), languageData));//夹杂物面积比图
             setXRLabelData(xrLabel_inca_pic_subdivision, GetlanguageData(xrLabel_inca_pic_subdivision.Name.ToString(), languageData));//夹杂物面积比细分图
 
-            
-                 setXRLabelData(dev_DimensionTable, GetlanguageData(dev_DimensionTable.Name.ToString(), languageData));//颗粒尺寸分析结果
+
+            setXRLabelData(dev_DimensionTable, GetlanguageData(dev_DimensionTable.Name.ToString(), languageData));//颗粒尺寸分析结果
             setXRLabelData(dev_DimensionTable_2, GetlanguageData(dev_DimensionTable_2.Name.ToString(), languageData));//尺寸计算基于:
 
             //颗粒尺寸表
             setXRLabelData(dev_classify, GetlanguageData(dev_classify.Name.ToString(), languageData));//分类
             setXRLabelData(dev_subdivision, GetlanguageData(dev_subdivision.Name.ToString(), languageData));//二级分类（子分类）
             setXRLabelData(dev_quantity, GetlanguageData(dev_quantity.Name.ToString(), languageData));//数量
+
+
+            //xrPictureBox1.ImageSource= 
+            string str3 = System.IO.Directory.GetCurrentDirectory();
+            Bitmap bitmap = (Bitmap)Image.FromFile(str3 + "\\Config\\ReportTemplate\\ReportIdentification.bmp");
+            xrPictureBox1.ImageSource = new ImageSource(bitmap);
+            xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.Squeeze;
         }
         /// <summary>
         /// 首页部分数据插入
-        /// </summary>
+        /// </summary>ReportIdentification
         /// <param name="TemplateClass"></param>
         public void setResultGrid()
         {
@@ -159,13 +166,11 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
         /// <summary>
         /// 颗粒尺寸分析表
         /// </summary>
-        /// <param name="TemplateClass"></param>
+        /// <param name="a_pieSeriesClass">大分类</param>
+        /// <param name="a_pieSeries">小分类</param>
         public void setParticleSizeTable(bool a_pieSeriesClass,bool a_pieSeries)
         {
-            //ElementSubscript subscript = new ElementSubscript();
-            //    Export_ReportTemplate export_ReportTemplate = new Export_ReportTemplate(m_otsreport_export);
             export_ReportTemplate.ParticleSizeTable(TemplateClass, out DataTable surface_dt, out DataTable ls_partsize_dt, out DataTable class_dt, out DataTable subdivde_dt,out DataTable colid_data);
-
             for (int i=0;i< class_dt.Rows.Count;i++)
             {
                 class_dt.Rows[i]["Class"] = subscript.Getsubscriptstring(class_dt.Rows[i]["Class"].ToString());
@@ -175,16 +180,11 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                 subdivde_dt.Rows[i]["Name"] = subscript.Getsubscriptstring(subdivde_dt.Rows[i]["Name"].ToString());
                 subdivde_dt.Rows[i]["Class"] = subscript.Getsubscriptstring(subdivde_dt.Rows[i]["Class"].ToString());
             }
-
             #region 插入数据
             xrTa_ParticleSizeTable.Visible = true;
             xrChart_ParticelSizeCalss.Visible = true;
             xrChart_ParticelSizeSubdivision.Visible = true;
-            //xrLabel_size_IconQuestion_Class.Visible = true;
-            //xrLabel_size_IconQuestion_Subdivision.Visible = true;
             List<List<ParticleSizeDEVData>> list_ParticelSizeData = new List<List<ParticleSizeDEVData>>();
-
-           
             for (int i = 0; i < surface_dt.Rows.Count; i++)
             {
                 list_ParticelSizeData.Add(switch_ParticleSize(subscript.Getsubscriptstring(surface_dt.Rows[i]["Class"].ToString()) , subscript.Getsubscriptstring(surface_dt.Rows[i]["Name"].ToString()), surface_dt.Rows[i]["total"].ToString(), surface_dt.Rows[i]["c1"].ToString(), surface_dt.Rows[i]["c2"].ToString(), surface_dt.Rows[i]["c3"].ToString(),
@@ -276,7 +276,6 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                 this.xrChart_ParticelSizeCalss.Legend.VerticalIndent = 5;
                 this.xrChart_ParticelSizeCalss.Legend.Border.Color = Color.Red;//红色边框
             }
-         
             #endregion
             #region 细分chart图
             if(a_pieSeries)
@@ -341,7 +340,6 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             setXRLabelData(xrCell_Element_s10, dt1.Rows[0][11].ToString());
 
             List<List<ElementalAnalysisDEVData>> list_ElementalAnalysisData = new List<List<ElementalAnalysisDEVData>>();
-            //ElementSubscript subscript = new ElementSubscript();
             for (int i = 0; i < dt2.Rows.Count; i++)
             {
                 double quantity = 0;
@@ -356,13 +354,6 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                 list_ElementalAnalysisData.Add(set_ElementalAnalysis(subscript.Getsubscriptstring(dt2.Rows[i]["Class"].ToString()), subscript.Getsubscriptstring(dt2.Rows[i]["Name"].ToString()), dt2.Rows[i]["Area"].ToString(),
                    dt2.Rows[i][2].ToString(), dt2.Rows[i][3].ToString(), dt2.Rows[i][4].ToString(), dt2.Rows[i][5].ToString(), dt2.Rows[i][6].ToString(),
                    dt2.Rows[i][7].ToString(), dt2.Rows[i][8].ToString(), dt2.Rows[i][9].ToString(), dt2.Rows[i][10].ToString(), dt2.Rows[i][11].ToString()));
-
-                //list_ElementalAnalysisData.Add(set_ElementalAnalysis(subscript.Getsubscriptstring(dt2.Rows[i]["Class"].ToString()) , subscript.Getsubscriptstring(dt2.Rows[i]["Name"].ToString()), dt2.Rows[i]["Area"].ToString(),
-                //    export_ReportTemplate.ParameterNormalization(quantity,Convert.ToDouble(dt2.Rows[i][2].ToString())) , export_ReportTemplate.ParameterNormalization(quantity, Convert.ToDouble(dt2.Rows[i][3].ToString())),
-                //    export_ReportTemplate.ParameterNormalization(quantity, Convert.ToDouble(dt2.Rows[i][4].ToString())), export_ReportTemplate.ParameterNormalization(quantity, Convert.ToDouble(dt2.Rows[i][5].ToString())),
-                //    export_ReportTemplate.ParameterNormalization(quantity, Convert.ToDouble(dt2.Rows[i][6].ToString())), export_ReportTemplate.ParameterNormalization(quantity,Convert.ToDouble(dt2.Rows[i][7].ToString())),
-                //    export_ReportTemplate.ParameterNormalization(quantity,Convert.ToDouble(dt2.Rows[i][8].ToString())), export_ReportTemplate.ParameterNormalization(quantity, Convert.ToDouble(dt2.Rows[i][9].ToString())),
-                //    export_ReportTemplate.ParameterNormalization(quantity,Convert.ToDouble(dt2.Rows[i][10].ToString())), export_ReportTemplate.ParameterNormalization(quantity,Convert.ToDouble(dt2.Rows[i][11].ToString()))));
             }
             for (int i = 0; i < dt2.Rows.Count; i++)
             {
@@ -396,10 +387,6 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                 tCell_s10.WidthF = xrTb_ElementAnalysisTable.Rows[2].Cells[12].WidthF;
 
 
-                //tCell_classify.WidthF = 69f; tCell_subdivision.WidthF = 69f; tCell_area.WidthF = 50f; tCell_s1.WidthF = 50f; tCell_s2.WidthF = 50f;
-                //tCell_s3.WidthF = 50f; tCell_s4.WidthF = 50f; tCell_s5.WidthF = 50f; tCell_s6.WidthF = 50f; tCell_s7.WidthF = 50f; tCell_s8.WidthF = 50f;
-                //tCell_s9.WidthF = 50f; tCell_s10.WidthF = 50f;
-
 
                 XRTableCellData_ElementAnalysis(row, tCell_classify, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "classify");
                 XRTableCellData_ElementAnalysis(row, tCell_subdivision, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "subdivision");
@@ -468,7 +455,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
         /// <param name="TemplateClass"></param>
         public void setINCAtable()
         {
-            //ElementSubscript subscript = new ElementSubscript();
+           
             export_ReportTemplate.GenerateINCAtable(dev_scmj_text.Text, out DataTable dt);
             xr_tbAreaOfInclusion.Visible = true;
             List<List<AreaOfInclusionDEVData>> list_AreaOfInclusion = new List<List<AreaOfInclusionDEVData>>();
@@ -655,7 +642,6 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                 }
 
 
-                //set_syt_pic(TemplateClass, TemplateClass.M_SYXT.list_lbv_syxt_mblb_index[i], Color_list);
                 XRLine rLine = new XRLine();
                 rLine.SizeF = new SizeF(5f, 698.5f);
                 rLine.LineDirection = LineDirection.Vertical;
@@ -689,13 +675,8 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             xrTable_kllb_surface.Visible = true;
             NeueStartposition = xrTable_kllb_surface.LocationF.Y + xrTable_kllb_surface.SizeF.Height;
 
-
-            //     Export_ReportTemplate export_ReportTemplate = new Export_ReportTemplate(m_otsreport_export);
             DataTable dataTable = export_ReportTemplate.Get_dev_kllb_data(TemplateClass);
 
-           
-
-
             for (int i = 0; i < dataTable.Rows.Count; i++)
             {
                 dataTable.Rows[i]["Class"] = subscript.Getsubscriptstring(dataTable.Rows[i]["Class"].ToString());
@@ -714,7 +695,6 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
         /// <param name="TemplateClass"></param>
         public void set_kllb_data_frame()
         {
-            //   Export_ReportTemplate export_ReportTemplate = new Export_ReportTemplate(m_otsreport_export);
             export_ReportTemplate.Get_dev_kllb_data_frame(TemplateClass, out DataTable dt_pic, out List<DataTable> listData);
 
             for (int i=0;i< listData.Count;i++)
@@ -802,7 +782,6 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                             xRTable.LocationF = new PointF(0, NeueStartposition );
                             this.Detail.Controls.Add(xRTable);
                             NeueStartposition = NeueStartposition + xRTable.SizeF.Height +1 ;
-                            //NeueStartposition = NeueStartposition + xRTable.SizeF.Height + 5 + 2;
                         }
                     }
                 }