瀏覽代碼

整理ots报告导出,OTS_DEVReport文件代码,增加元素分析表元素,显示全部显示数据

zhangjiaxin 3 年之前
父節點
當前提交
dc9e5f94a5

+ 2 - 2
OTSIncAReportApp/1-UI/OTSTemplateDesigner/Export_ReportTemplate.cs

@@ -1538,7 +1538,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
 
         }
 
-        public bool InsertReportTemplateTable_ElementAvgGrid(c_TemplateClass m_mbszclass, out DataTable dt1, out DataTable dt2)
+        public bool InsertReportTemplateTable_ElementAvgGrid(c_TemplateClass m_mbszclass, out DataTable dt1, out DataTable dt2,out DataTable allElement_dt)
         {
             if (m_bt_DBData.Columns.Count == 0)
             {
@@ -1581,7 +1581,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             DataTable dt = MaterialElementComposition(dt_ElementalSubstance, 13);//导出14个元素成分信息
             //生成最后导出时物质元素细分表
             SubdivisionOfMaterialElements(dt_ElementSorting, 13, ClassName, dt, out dt1, out dt2);
-
+            allElement_dt = dt_ElementSorting.Copy();
 
             return true;
 

+ 20 - 20
OTSIncAReportApp/1-UI/OTSTemplateDesigner/OTSReport_Export.cs

@@ -1184,7 +1184,7 @@ namespace OTSIncAReportApp
         private void btn_preview_Click(object sender, EventArgs e)
         {
             
-            DEVReport = new OTS_DEVReport(this);
+            DEVReport = new OTS_DEVReport(this, m_mbszclass);
             //DEVReport.Dispose();
 
           
@@ -1477,7 +1477,7 @@ namespace OTSIncAReportApp
                     if (ls_str.IndexOf(table["result_information"].ToString()) > -1)//测量结果信息表
                     {
                         DEVReport.International_language(dev_internationalLanguage());
-                        DEVReport.setResultGrid(m_mbszclass);
+                        DEVReport.setResultGrid();
                         lock (m_thread_flag)
                             m_thread_flag = strNill;
                     }
@@ -1485,7 +1485,7 @@ namespace OTSIncAReportApp
                     {
 
                         if (m_mbszclass.M_KLFXJG.b_ck_klcc_xsmk)
-                            DEVReport.setParticleSizeTable(m_mbszclass);
+                            DEVReport.setParticleSizeTable();
                         lock (m_thread_flag)
                             m_thread_flag = strNill;
                     }
@@ -1493,7 +1493,7 @@ namespace OTSIncAReportApp
                     if (ls_str.IndexOf(table["element_analysis_table"].ToString()) > -1)//元素分析表
                     {
                         if (m_mbszclass.M_YSFXJG.b_ck_ysfx_xsmk)
-                            DEVReport.setElementAvgGrid(m_mbszclass);
+                            DEVReport.setElementAvgGrid();
                         lock (m_thread_flag)
                             m_thread_flag = strNill;
                     }
@@ -1501,7 +1501,7 @@ namespace OTSIncAReportApp
                     if (ls_str.IndexOf(table["inca_area_ratio_table"].ToString()) > -1)//夹杂物面积比表
                     {
                         if (m_mbszclass.M_JZWZB.b_ck_surface)
-                            DEVReport.setINCAtable(m_mbszclass);
+                            DEVReport.setINCAtable();
                         lock (m_thread_flag)
                             m_thread_flag = strNill;
                     }
@@ -1510,8 +1510,8 @@ namespace OTSIncAReportApp
                     {
                         if (m_mbszclass.M_JZWZB.b_ck_chart)
                         {
-                            DEVReport.set_incaPIC_classify(m_mbszclass);
-                            DEVReport.set_incaPIC_subdivision(m_mbszclass);
+                            DEVReport.set_incaPIC_classify();
+                            DEVReport.set_incaPIC_subdivision();
                         }
                         lock (m_thread_flag)
                             m_thread_flag = strNill;
@@ -1519,7 +1519,7 @@ namespace OTSIncAReportApp
                     if (ls_str.IndexOf(table["ternary_graph"].ToString()) > -1)//三元图
                     {
                         if (m_mbszclass.M_SYXT.b_ck_syxt_xsmk)
-                            DEVReport.InsertReportTemplateChart_Trianglediagram(m_mbszclass);
+                            DEVReport.InsertReportTemplateChart_Trianglediagram();
                         lock (m_thread_flag)
                             m_thread_flag = strNill;
                     }
@@ -1527,7 +1527,7 @@ namespace OTSIncAReportApp
                     if (ls_str.IndexOf(table["particle_list"].ToString()) > -1)//颗粒列表
                     {
                         if (m_mbszclass.M_KLLBXX.b_ck_kllb_xsmk)
-                            DEVReport.set_kllb_data(m_mbszclass);
+                            DEVReport.set_kllb_data();
                         lock (m_thread_flag)
                             m_thread_flag = strNill;
                     }
@@ -1535,7 +1535,7 @@ namespace OTSIncAReportApp
                     if (ls_str.IndexOf(table["particle_list_frame_diagram"].ToString()) > -1)//颗粒帧图列表
                     {
                         if (m_mbszclass.M_KLLBXX.b_ck_kllb_fjzt)
-                            DEVReport.set_kllb_data_frame(m_mbszclass);
+                            DEVReport.set_kllb_data_frame();
                         
                         lock (m_thread_flag)
                             m_thread_flag = strNill;
@@ -1743,22 +1743,22 @@ namespace OTSIncAReportApp
 
         private void button1_Click(object sender, EventArgs e)
         {
-            DEVReport = new OTS_DEVReport(this);
+            DEVReport = new OTS_DEVReport(this, m_mbszclass);
             //DEVReport.Dispose();
             //DEVReport = new OTS_DEVReport(this);
 
-            DEVReport.setResultGrid(m_mbszclass);
-            DEVReport.setParticleSizeTable(m_mbszclass);
-            DEVReport.setElementAvgGrid(m_mbszclass);
-            DEVReport.setINCAtable(m_mbszclass);
-            DEVReport.set_incaPIC_classify(m_mbszclass);
-            DEVReport.set_incaPIC_subdivision(m_mbszclass);
+            DEVReport.setResultGrid();
+            DEVReport.setParticleSizeTable();
+            DEVReport.setElementAvgGrid();
+            DEVReport.setINCAtable();
+            DEVReport.set_incaPIC_classify();
+            DEVReport.set_incaPIC_subdivision();
 
-            DEVReport.InsertReportTemplateChart_Trianglediagram(m_mbszclass);
-            DEVReport.set_kllb_data(m_mbszclass);
+            DEVReport.InsertReportTemplateChart_Trianglediagram();
+            DEVReport.set_kllb_data();
 
 
-            DEVReport.set_kllb_data_frame(m_mbszclass);
+            DEVReport.set_kllb_data_frame();
             DEVReport.International_language(dev_internationalLanguage());
 
 

+ 77 - 75
OTSIncAReportApp/ReportTemplate/OTS_DEVReport.Designer.cs

@@ -38,10 +38,6 @@ 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.xrPictureBox6 = new DevExpress.XtraReports.UI.XRPictureBox();
-            this.xrPictureBox7 = new DevExpress.XtraReports.UI.XRPictureBox();
-            this.xrPictureBox5 = new DevExpress.XtraReports.UI.XRPictureBox();
-            this.xrPageBreak6 = new DevExpress.XtraReports.UI.XRPageBreak();
             this.xrTable2 = new DevExpress.XtraReports.UI.XRTable();
             this.xrTableRow18 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -176,8 +172,12 @@ 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();
-            this.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox();
-            this.xrPictureBox4 = new DevExpress.XtraReports.UI.XRPictureBox();
+            this.xrTb_ElementAnalysis = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow22 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow23 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrPageBreak6 = new DevExpress.XtraReports.UI.XRPageBreak();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable_kllb_surface)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrChart_incaSubdivision)).BeginInit();
@@ -188,6 +188,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             ((System.ComponentModel.ISupportInitialize)(this.xrChart_ParticelSizeSubdivision)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTa_ParticleSizeTable)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTb_ElementAnalysis)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
             // 
             // TopMargin
@@ -255,10 +256,8 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             // Detail
             // 
             this.Detail.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
-            this.xrPictureBox6,
-            this.xrPictureBox7,
-            this.xrPictureBox5,
             this.xrPageBreak6,
+            this.xrTb_ElementAnalysis,
             this.xrTable2,
             this.xrTable_kllb_surface,
             this.xrLabel_inca_pic_subdivision,
@@ -288,48 +287,13 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.dev_ypbh_up,
             this.dev_fbt,
             this.dev_zbt,
-            this.xrPictureBox2,
-            this.xrPictureBox3,
-            this.xrPictureBox4});
-            this.Detail.HeightF = 10000F;
+            this.xrPictureBox2});
+            this.Detail.HeightF = 4297.083F;
             this.Detail.Name = "Detail";
             // 
-            // xrPictureBox6
-            // 
-            this.xrPictureBox6.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox6.ImageSource"));
-            this.xrPictureBox6.LocationFloat = new DevExpress.Utils.PointFloat(10.0001F, 4589.084F);
-            this.xrPictureBox6.Name = "xrPictureBox6";
-            this.xrPictureBox6.SizeF = new System.Drawing.SizeF(321.0803F, 330.2085F);
-            this.xrPictureBox6.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
-            this.xrPictureBox6.Visible = false;
-            // 
-            // xrPictureBox7
-            // 
-            this.xrPictureBox7.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox7.ImageSource"));
-            this.xrPictureBox7.LocationFloat = new DevExpress.Utils.PointFloat(342.8782F, 4589.083F);
-            this.xrPictureBox7.Name = "xrPictureBox7";
-            this.xrPictureBox7.SizeF = new System.Drawing.SizeF(335.1217F, 330.2085F);
-            this.xrPictureBox7.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
-            this.xrPictureBox7.Visible = false;
-            // 
-            // xrPictureBox5
-            // 
-            this.xrPictureBox5.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox5.ImageSource"));
-            this.xrPictureBox5.LocationFloat = new DevExpress.Utils.PointFloat(342.8782F, 4220.75F);
-            this.xrPictureBox5.Name = "xrPictureBox5";
-            this.xrPictureBox5.SizeF = new System.Drawing.SizeF(335.1217F, 330.2085F);
-            this.xrPictureBox5.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
-            this.xrPictureBox5.Visible = false;
-            // 
-            // xrPageBreak6
-            // 
-            this.xrPageBreak6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 4070.75F);
-            this.xrPageBreak6.Name = "xrPageBreak6";
-            this.xrPageBreak6.Visible = false;
-            // 
             // xrTable2
             // 
-            this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 3732.208F);
+            this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 3858.25F);
             this.xrTable2.Name = "xrTable2";
             this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F);
             this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
@@ -623,7 +587,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.xrTable_kllb_surface.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTable_kllb_surface.LocationFloat = new DevExpress.Utils.PointFloat(0F, 3139.5F);
+            this.xrTable_kllb_surface.LocationFloat = new DevExpress.Utils.PointFloat(0F, 3274.917F);
             this.xrTable_kllb_surface.Name = "xrTable_kllb_surface";
             this.xrTable_kllb_surface.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F);
             this.xrTable_kllb_surface.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
@@ -669,7 +633,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             // 
             // xrLabel_inca_pic_subdivision
             // 
-            this.xrLabel_inca_pic_subdivision.LocationFloat = new DevExpress.Utils.PointFloat(30.41687F, 2604.083F);
+            this.xrLabel_inca_pic_subdivision.LocationFloat = new DevExpress.Utils.PointFloat(30.41687F, 2750.958F);
             this.xrLabel_inca_pic_subdivision.Multiline = true;
             this.xrLabel_inca_pic_subdivision.Name = "xrLabel_inca_pic_subdivision";
             this.xrLabel_inca_pic_subdivision.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -684,7 +648,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.xrChart_incaSubdivision.BorderColor = System.Drawing.Color.Black;
             this.xrChart_incaSubdivision.Borders = DevExpress.XtraPrinting.BorderSide.None;
             this.xrChart_incaSubdivision.Legend.Name = "Default Legend";
-            this.xrChart_incaSubdivision.LocationFloat = new DevExpress.Utils.PointFloat(30.41636F, 2627.083F);
+            this.xrChart_incaSubdivision.LocationFloat = new DevExpress.Utils.PointFloat(30.41687F, 2773.958F);
             this.xrChart_incaSubdivision.Name = "xrChart_incaSubdivision";
             this.xrChart_incaSubdivision.SeriesSerializable = new DevExpress.XtraCharts.Series[0];
             this.xrChart_incaSubdivision.SizeF = new System.Drawing.SizeF(630F, 478.33F);
@@ -692,7 +656,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             // 
             // xrLabel_inca_pic_class
             // 
-            this.xrLabel_inca_pic_class.LocationFloat = new DevExpress.Utils.PointFloat(30.41662F, 2181.083F);
+            this.xrLabel_inca_pic_class.LocationFloat = new DevExpress.Utils.PointFloat(30.41662F, 2327.958F);
             this.xrLabel_inca_pic_class.Multiline = true;
             this.xrLabel_inca_pic_class.Name = "xrLabel_inca_pic_class";
             this.xrLabel_inca_pic_class.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -707,7 +671,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.xrChart_incaClass.BorderColor = System.Drawing.Color.Black;
             this.xrChart_incaClass.Borders = DevExpress.XtraPrinting.BorderSide.None;
             this.xrChart_incaClass.Legend.Name = "Default Legend";
-            this.xrChart_incaClass.LocationFloat = new DevExpress.Utils.PointFloat(30.41687F, 2204.083F);
+            this.xrChart_incaClass.LocationFloat = new DevExpress.Utils.PointFloat(30.41687F, 2350.958F);
             this.xrChart_incaClass.Name = "xrChart_incaClass";
             this.xrChart_incaClass.SeriesSerializable = new DevExpress.XtraCharts.Series[0];
             this.xrChart_incaClass.SizeF = new System.Drawing.SizeF(630F, 400F);
@@ -715,7 +679,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             // 
             // xrPageBreak5
             // 
-            this.xrPageBreak5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 2179.083F);
+            this.xrPageBreak5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 2325.958F);
             this.xrPageBreak5.Name = "xrPageBreak5";
             // 
             // xr_tbAreaOfInclusion
@@ -723,7 +687,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.xr_tbAreaOfInclusion.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xr_tbAreaOfInclusion.LocationFloat = new DevExpress.Utils.PointFloat(10.0001F, 2112.333F);
+            this.xr_tbAreaOfInclusion.LocationFloat = new DevExpress.Utils.PointFloat(10.0001F, 2263.374F);
             this.xr_tbAreaOfInclusion.Name = "xr_tbAreaOfInclusion";
             this.xr_tbAreaOfInclusion.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F);
             this.xr_tbAreaOfInclusion.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
@@ -801,7 +765,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             // 
             // xrPageBreak4
             // 
-            this.xrPageBreak4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 2110.333F);
+            this.xrPageBreak4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 2261.374F);
             this.xrPageBreak4.Name = "xrPageBreak4";
             // 
             // xrTb_ElementAnalysisTable
@@ -1616,29 +1580,66 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             // xrPictureBox2
             // 
             this.xrPictureBox2.ImageAlignment = DevExpress.XtraPrinting.ImageAlignment.MiddleCenter;
-            this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 3229.083F);
+            this.xrPictureBox2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 3357.208F);
             this.xrPictureBox2.Name = "xrPictureBox2";
             this.xrPictureBox2.SizeF = new System.Drawing.SizeF(688F, 484.4744F);
             this.xrPictureBox2.Sizing = DevExpress.XtraPrinting.ImageSizeMode.Squeeze;
             this.xrPictureBox2.Visible = false;
             // 
-            // xrPictureBox3
+            // xrTb_ElementAnalysis
             // 
-            this.xrPictureBox3.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox3.ImageSource"));
-            this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(94.6256F, 4091.578F);
-            this.xrPictureBox3.Name = "xrPictureBox3";
-            this.xrPictureBox3.SizeF = new System.Drawing.SizeF(503.9998F, 120.8501F);
-            this.xrPictureBox3.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
-            this.xrPictureBox3.Visible = false;
+            this.xrTb_ElementAnalysis.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTb_ElementAnalysis.LocationFloat = new DevExpress.Utils.PointFloat(10.0001F, 2125.959F);
+            this.xrTb_ElementAnalysis.Name = "xrTb_ElementAnalysis";
+            this.xrTb_ElementAnalysis.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 96F);
+            this.xrTb_ElementAnalysis.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow22,
+            this.xrTableRow23});
+            this.xrTb_ElementAnalysis.SizeF = new System.Drawing.SizeF(667.9998F, 49.99902F);
+            this.xrTb_ElementAnalysis.StylePriority.UseBorders = false;
+            this.xrTb_ElementAnalysis.Visible = false;
+            // 
+            // xrTableRow22
+            // 
+            this.xrTableRow22.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell30});
+            this.xrTableRow22.Name = "xrTableRow22";
+            this.xrTableRow22.Weight = 1D;
+            // 
+            // xrTableCell30
+            // 
+            this.xrTableCell30.BackColor = System.Drawing.Color.DarkGray;
+            this.xrTableCell30.Multiline = true;
+            this.xrTableCell30.Name = "xrTableCell30";
+            this.xrTableCell30.StylePriority.UseBackColor = false;
+            this.xrTableCell30.StylePriority.UseTextAlignment = false;
+            this.xrTableCell30.Text = "xrCellElementArea";
+            this.xrTableCell30.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrTableCell30.Weight = 2D;
+            // 
+            // xrTableRow23
+            // 
+            this.xrTableRow23.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell31});
+            this.xrTableRow23.Name = "xrTableRow23";
+            this.xrTableRow23.Weight = 1D;
+            // 
+            // xrTableCell31
+            // 
+            this.xrTableCell31.Multiline = true;
+            this.xrTableCell31.Name = "xrTableCell31";
+            this.xrTableCell31.StylePriority.UseTextAlignment = false;
+            this.xrTableCell31.Text = "xrCellElementArea_details";
+            this.xrTableCell31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            this.xrTableCell31.Weight = 2D;
             // 
-            // xrPictureBox4
+            // xrPageBreak6
             // 
-            this.xrPictureBox4.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox4.ImageSource"));
-            this.xrPictureBox4.LocationFloat = new DevExpress.Utils.PointFloat(10.0001F, 4220.75F);
-            this.xrPictureBox4.Name = "xrPictureBox4";
-            this.xrPictureBox4.SizeF = new System.Drawing.SizeF(321.0803F, 330.2085F);
-            this.xrPictureBox4.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
-            this.xrPictureBox4.Visible = false;
+            this.xrPageBreak6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 2109.292F);
+            this.xrPageBreak6.Name = "xrPageBreak6";
+            this.xrPageBreak6.Visible = false;
             // 
             // OTS_DEVReport
             // 
@@ -1659,6 +1660,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             ((System.ComponentModel.ISupportInitialize)(this.xrChart_ParticelSizeSubdivision)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTa_ParticleSizeTable)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTb_ElementAnalysis)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
 
         }
@@ -1807,11 +1809,11 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell27;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell28;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell29;
-        private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox6;
-        private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox7;
-        private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox5;
+        private DevExpress.XtraReports.UI.XRTable xrTb_ElementAnalysis;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow22;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell30;
+        private DevExpress.XtraReports.UI.XRTableRow xrTableRow23;
+        private DevExpress.XtraReports.UI.XRTableCell xrTableCell31;
         private DevExpress.XtraReports.UI.XRPageBreak xrPageBreak6;
-        private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox4;
-        private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox3;
     }
 }

+ 161 - 118
OTSIncAReportApp/ReportTemplate/OTS_DEVReport.cs

@@ -15,18 +15,23 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
     {
         public OTSReport_Export m_otsreport_export;
         //string typeface = "Arial Unicode MS";
-        string typeface = "微软雅黑";
-        string dataFont = "Arial Unicode MS";
+        string Schriftart_chinese = "微软雅黑";
+        string Schriftart_english = "Arial Unicode MS";
         List<string> TemplateList;
         Export_ReportTemplate export_ReportTemplate;
         //SizeF syx_Size = new SizeF(668f, 660.54f);
         SizeF syx_Size = new SizeF(668f, 616.67f);
         
-        float LowPlace = 3120f;
+        //float LowPlace = 3120f;
+        float NeueStartposition = 3300f;
+
         ElementSubscript subscript=new ElementSubscript();
 
-        public OTS_DEVReport(OTSReport_Export in_export)
+        c_TemplateClass TemplateClass;
+
+        public OTS_DEVReport(OTSReport_Export in_export, c_TemplateClass a_Template)
         {
+            TemplateClass = a_Template;
             m_otsreport_export = in_export;
             ElementSubscript subscript = new ElementSubscript();
             export_ReportTemplate = new Export_ReportTemplate(m_otsreport_export);
@@ -81,6 +86,10 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             setXRLabelData(xrCell_Element_subdivision, GetlanguageData(xrCell_Element_subdivision.Name.ToString(), languageData));//细分
             setXRLabelData(xrCell_Element_Area, GetlanguageData(xrCell_Element_Area.Name.ToString(), languageData));//面积
 
+            //元素分析表————————
+            setXRLabelData(xrTableCell30, GetlanguageData(xrCellElementArea.Name.ToString(), languageData));//元素分析表表头
+            setXRLabelData(xrTableCell31, GetlanguageData(xrCellElementArea_details.Name.ToString(), languageData));//详情
+
             //夹杂物面积比
             setXRLabelData(xrCellAreaOfInclusion, GetlanguageData(xrCellAreaOfInclusion.Name.ToString(), languageData));//夹杂物面积比表表头
             setXRLabelData(xrCell_inclusion_classify, GetlanguageData(xrCell_inclusion_classify.Name.ToString(), languageData));//分类
@@ -101,8 +110,8 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
         /// <summary>
         /// 首页部分数据插入
         /// </summary>
-        /// <param name="m_mbszclass"></param>
-        public void setResultGrid(c_TemplateClass m_mbszclass)
+        /// <param name="TemplateClass"></param>
+        public void setResultGrid()
         {
             #region 从Grid表中读取样品数据
             //------------------加载模块,获取数据-------------------------------------------------
@@ -128,30 +137,30 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             setTableCellData(dev_scmj_text, str_SCMJ);//视场面积
             setTableCellData(dev_fdbs_text, Magnification);//放大倍数
             setTableCellData(dev_bgsj_text, DateTime.Now.ToShortDateString().ToString());//报告时间:
-            setTableCellData(dev_ckbz_text, m_mbszclass.M_SY.str_tb_CKBZ.ToString());//参考标准
+            setTableCellData(dev_ckbz_text, TemplateClass.M_SY.str_tb_CKBZ.ToString());//参考标准
 
             #endregion
             #region 加载模板设置文档数据
-            setXRLabelData(dev_ym, m_mbszclass.M_YMYJ.str_tb_ymwb.ToString());//页眉
-            setXRLabelData(dev_yj, m_mbszclass.M_YMYJ.str_tb_yjwb.ToString());//页脚
-            setXRLabelData(dev_zbt, m_mbszclass.M_SY.str_tb_ZBT.ToString());//主标题
-            setXRLabelData(dev_fbt, m_mbszclass.M_SY.str_tb_FBT.ToString());//副标题
-            setXRLabelData(dev_ypbh_text_up, m_mbszclass.M_SY.str_tb_YPBH.ToString());//样品编号
+            setXRLabelData(dev_ym, TemplateClass.M_YMYJ.str_tb_ymwb.ToString());//页眉
+            setXRLabelData(dev_yj, TemplateClass.M_YMYJ.str_tb_yjwb.ToString());//页脚
+            setXRLabelData(dev_zbt, TemplateClass.M_SY.str_tb_ZBT.ToString());//主标题
+            setXRLabelData(dev_fbt, TemplateClass.M_SY.str_tb_FBT.ToString());//副标题
+            setXRLabelData(dev_ypbh_text_up, TemplateClass.M_SY.str_tb_YPBH.ToString());//样品编号
             setXRLabelData(dev_bgsj_text_up, DateTime.Now.ToShortDateString().ToString());//当前日期
             setXRLabelData(dev_jcjgwj_text_up, str_CLJGMC);//测量结果名称
-            setXRLabelData(dev_ckbz_text_up, m_mbszclass.M_SY.str_tb_CKBZ.ToString());//参考标准
+            setXRLabelData(dev_ckbz_text_up, TemplateClass.M_SY.str_tb_CKBZ.ToString());//参考标准
 
             #endregion
         }
         /// <summary>
         /// 颗粒尺寸分析表
         /// </summary>
-        /// <param name="m_mbszclass"></param>
-        public void setParticleSizeTable(c_TemplateClass m_mbszclass)
+        /// <param name="TemplateClass"></param>
+        public void setParticleSizeTable()
         {
             //ElementSubscript subscript = new ElementSubscript();
             //    Export_ReportTemplate export_ReportTemplate = new Export_ReportTemplate(m_otsreport_export);
-            export_ReportTemplate.ParticleSizeTable(m_mbszclass, out DataTable surface_dt, out DataTable ls_partsize_dt, out DataTable class_dt, out DataTable subdivde_dt);
+            export_ReportTemplate.ParticleSizeTable(TemplateClass, out DataTable surface_dt, out DataTable ls_partsize_dt, out DataTable class_dt, out DataTable subdivde_dt);
 
             for (int i=0;i< class_dt.Rows.Count;i++)
             {
@@ -185,8 +194,8 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             dev_size_6.Text = ls_partsize_dt.Rows[0]["c6"].ToString();
             dev_size_7.Text = ls_partsize_dt.Rows[0]["c7"].ToString();
             dev_DimensionTable_2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            dev_DimensionTable_2.Text = dev_DimensionTable_2.Text.ToString() + m_mbszclass.M_KLFXJG.str_cb_klcc_jsfs.ToString();
-            dev_DimensionTable_2.Font = new Font(typeface, dev_DimensionTable_2.Font.Size);
+            dev_DimensionTable_2.Text = dev_DimensionTable_2.Text.ToString() + TemplateClass.M_KLFXJG.str_cb_klcc_jsfs.ToString();
+            dev_DimensionTable_2.Font = new Font(Schriftart_chinese, dev_DimensionTable_2.Font.Size);
             for (int i = 0; i < surface_dt.Rows.Count; i++)
             {
                 XRTableRow row = new XRTableRow();
@@ -200,16 +209,16 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                 XRTableCell tCell_size_5 = new XRTableCell();
                 XRTableCell tCell_size_6 = new XRTableCell();
                 XRTableCell tCell_size_7 = new XRTableCell();
-                XRTableCellData(row, tCell_Class, dataFont, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_Class");
-                XRTableCellData(row, tCell_Name, dataFont, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_Name");
-                XRTableCellData(row, tCell_total, dataFont, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_total");
-                XRTableCellData(row, tCell_size_1, dataFont, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_1");
-                XRTableCellData(row, tCell_size_2, dataFont, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_2");
-                XRTableCellData(row, tCell_size_3, dataFont, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_3");
-                XRTableCellData(row, tCell_size_4, dataFont, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_4");
-                XRTableCellData(row, tCell_size_5, dataFont, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_5");
-                XRTableCellData(row, tCell_size_6, dataFont, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_6");
-                XRTableCellData(row, tCell_size_7, dataFont, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_7");
+                XRTableCellData(row, tCell_Class, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_Class");
+                XRTableCellData(row, tCell_Name, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_Name");
+                XRTableCellData(row, tCell_total, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_total");
+                XRTableCellData(row, tCell_size_1, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_1");
+                XRTableCellData(row, tCell_size_2, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_2");
+                XRTableCellData(row, tCell_size_3, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_3");
+                XRTableCellData(row, tCell_size_4, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_4");
+                XRTableCellData(row, tCell_size_5, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_5");
+                XRTableCellData(row, tCell_size_6, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_6");
+                XRTableCellData(row, tCell_size_7, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ParticelSizeData[i], "size_7");
                 xrTa_ParticleSizeTable.Rows.Add(row);
 
             }
@@ -267,12 +276,12 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
         /// <summary>
         /// 设置插入元素分析表数据
         /// </summary>
-        /// <param name="m_mbszclass"></param>
-        public void setElementAvgGrid(c_TemplateClass m_mbszclass)
+        /// <param name="TemplateClass"></param>
+        public void setElementAvgGrid()
         {
             xrTb_ElementAnalysisTable.Visible = true;
 
-            export_ReportTemplate.InsertReportTemplateTable_ElementAvgGrid(m_mbszclass, out DataTable dt1, out DataTable dt2);
+            export_ReportTemplate.InsertReportTemplateTable_ElementAvgGrid(TemplateClass, out DataTable dt1, out DataTable dt2,out DataTable allElement_dt);
             setXRLabelData(xrCell_Element_s1, dt1.Rows[0][2].ToString());
             setXRLabelData(xrCell_Element_s2, dt1.Rows[0][3].ToString());
             setXRLabelData(xrCell_Element_s3, dt1.Rows[0][4].ToString());
@@ -309,27 +318,61 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                 XRTableCell tCell_s9 = new XRTableCell();
                 XRTableCell tCell_s10 = new XRTableCell();
 
-                XRTableCellData_ElementAnalysis(row, tCell_classify, dataFont, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "classify");
-                XRTableCellData_ElementAnalysis(row, tCell_subdivision, dataFont, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "subdivision");
-                XRTableCellData_ElementAnalysis(row, tCell_area, dataFont, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "Area");
-                XRTableCellData_ElementAnalysis(row, tCell_s1, dataFont, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s1");
-                XRTableCellData_ElementAnalysis(row, tCell_s2, dataFont, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s2");
-                XRTableCellData_ElementAnalysis(row, tCell_s3, dataFont, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s3");
-                XRTableCellData_ElementAnalysis(row, tCell_s4, dataFont, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s4");
-                XRTableCellData_ElementAnalysis(row, tCell_s5, dataFont, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s5");
-                XRTableCellData_ElementAnalysis(row, tCell_s6, dataFont, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s6");
-                XRTableCellData_ElementAnalysis(row, tCell_s7, dataFont, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s7");
-                XRTableCellData_ElementAnalysis(row, tCell_s8, dataFont, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s8");
-                XRTableCellData_ElementAnalysis(row, tCell_s9, dataFont, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s9");
-                XRTableCellData_ElementAnalysis(row, tCell_s10, dataFont, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s10");
+                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");
+                XRTableCellData_ElementAnalysis(row, tCell_area, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "Area");
+                XRTableCellData_ElementAnalysis(row, tCell_s1, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s1");
+                XRTableCellData_ElementAnalysis(row, tCell_s2, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s2");
+                XRTableCellData_ElementAnalysis(row, tCell_s3, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s3");
+                XRTableCellData_ElementAnalysis(row, tCell_s4, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s4");
+                XRTableCellData_ElementAnalysis(row, tCell_s5, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s5");
+                XRTableCellData_ElementAnalysis(row, tCell_s6, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s6");
+                XRTableCellData_ElementAnalysis(row, tCell_s7, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s7");
+                XRTableCellData_ElementAnalysis(row, tCell_s8, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s8");
+                XRTableCellData_ElementAnalysis(row, tCell_s9, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s9");
+                XRTableCellData_ElementAnalysis(row, tCell_s10, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_ElementalAnalysisData[i], "s10");
                 xrTb_ElementAnalysisTable.Rows.Add(row);
             }
+
+
+
+
+
+            xrTb_ElementAnalysis.Visible = true;
+            xrPageBreak6.Visible = true;
+            for (int i=0;i< allElement_dt.Rows.Count;i++)
+            {
+                string str_data = "";
+                for (int a=4;a< allElement_dt.Columns.Count;a++)
+                {
+                    if (allElement_dt.Rows[i][a].ToString()!="")
+                    {
+                        str_data = str_data + allElement_dt.Columns[a].ColumnName.ToString() + "=" + allElement_dt.Rows[i][a].ToString() + "%"+"  ";
+                    }
+                }
+                xrTb_ElementAnalysis.Rows.Add(addElementalAnalysisRows(allElement_dt.Rows[i]["Name"].ToString(), str_data));
+            }
+           
+        }
+
+        private XRTableRow addElementalAnalysisRows(string className,string data)
+        {
+            XRTableRow row = new XRTableRow();
+            XRTableCell tCell_class = new XRTableCell();
+            XRTableCell tCell_data = new XRTableCell();
+            tCell_class.Text = className;
+            tCell_class.WidthF = 116.29f;
+            tCell_data.Text = data;
+            tCell_data.WidthF = 551.71f;
+            row.Controls.Add(tCell_class);
+            row.Controls.Add(tCell_data);
+            return row;
         }
         /// <summary>
         /// 设置插入夹杂物面积比表数据
         /// </summary>
-        /// <param name="m_mbszclass"></param>
-        public void setINCAtable(c_TemplateClass m_mbszclass)
+        /// <param name="TemplateClass"></param>
+        public void setINCAtable()
         {
             //ElementSubscript subscript = new ElementSubscript();
             export_ReportTemplate.GenerateINCAtable(dev_scmj_text.Text, out DataTable dt);
@@ -348,23 +391,23 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                 XRTableCell tCell_area = new XRTableCell();
                 XRTableCell tCell_inca_proportion = new XRTableCell();
                 XRTableCell tCell_inca_FieldRatio = new XRTableCell();
-                XRTableCellData_AreaOfInclusion(row, tCell_classify, dataFont, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_AreaOfInclusion[i], "classify");
-                XRTableCellData_AreaOfInclusion(row, tCell_subdivision, dataFont, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_AreaOfInclusion[i], "subdivision");
-                XRTableCellData_AreaOfInclusion(row, tCell_area, dataFont, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_AreaOfInclusion[i], "Area");
-                XRTableCellData_AreaOfInclusion(row, tCell_inca_proportion, dataFont, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_AreaOfInclusion[i], "inca_proportion");
-                XRTableCellData_AreaOfInclusion(row, tCell_inca_FieldRatio, dataFont, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_AreaOfInclusion[i], "inca_FieldRatio");
+                XRTableCellData_AreaOfInclusion(row, tCell_classify, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_AreaOfInclusion[i], "classify");
+                XRTableCellData_AreaOfInclusion(row, tCell_subdivision, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_AreaOfInclusion[i], "subdivision");
+                XRTableCellData_AreaOfInclusion(row, tCell_area, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_AreaOfInclusion[i], "Area");
+                XRTableCellData_AreaOfInclusion(row, tCell_inca_proportion, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_AreaOfInclusion[i], "inca_proportion");
+                XRTableCellData_AreaOfInclusion(row, tCell_inca_FieldRatio, Schriftart_english, DevExpress.XtraPrinting.TextAlignment.MiddleCenter, "Text", list_AreaOfInclusion[i], "inca_FieldRatio");
                 xr_tbAreaOfInclusion.Rows.Add(row);
             }
         }
         /// <summary>
         /// 设置插入夹杂物面积比图像
         /// </summary>
-        /// <param name="m_mbszclass"></param>
-        public void set_incaPIC_classify(c_TemplateClass m_mbszclass)
+        /// <param name="TemplateClass"></param>
+        public void set_incaPIC_classify()
         {
             xrChart_incaClass.Visible = true;
             xrLabel_inca_pic_class.Visible = true;
-            DataTable data = export_ReportTemplate.ClassificationIntegration(m_mbszclass, dev_sczs_text.Text);
+            DataTable data = export_ReportTemplate.ClassificationIntegration(TemplateClass, dev_sczs_text.Text);
             for (int i=0;i< data.Rows.Count;i++)
             {
                 data.Rows[i]["Class"] = subscript.Getsubscriptstring(data.Rows[i]["Class"].ToString());
@@ -393,12 +436,12 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.xrChart_incaClass.Legend.Border.Color = Color.Red;//红色边框
 
         }
-        public void set_incaPIC_subdivision(c_TemplateClass m_mbszclass)
+        public void set_incaPIC_subdivision()
         {
             xrChart_incaSubdivision.Visible = true;
             xrLabel_inca_pic_subdivision.Visible = true;
 
-            DataTable data = export_ReportTemplate.subdivisionIntegration(m_mbszclass);
+            DataTable data = export_ReportTemplate.subdivisionIntegration(TemplateClass);
             for (int i=0;i<data.Rows.Count;i++)
             {
                 data.Rows[i]["TypeName"] = subscript.Getsubscriptstring(data.Rows[i]["TypeName"].ToString());
@@ -430,8 +473,8 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
         /// <summary>
         /// 三元图
         /// </summary>
-        /// <param name="m_mbszclass"></param>
-        public void InsertReportTemplateChart_Trianglediagram(c_TemplateClass m_mbszclass)
+        /// <param name="TemplateClass"></param>
+        public void InsertReportTemplateChart_Trianglediagram()
         {
             List<Color> Color_list = new List<Color>();
             Color_list.Add(Color.FromArgb(238, 175, 14));
@@ -463,11 +506,11 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             Color_list.Add(Color.FromArgb(247, 172, 189));
             Color_list.Add(Color.FromArgb(202, 134, 135));
             Color_list.Add(Color.FromArgb(34, 90, 31));
-            //for (int i = 0; i < m_mbszclass.M_SYXT.list_lbv_syxt_mblb_index.Count; i++)
+            //for (int i = 0; i < TemplateClass.M_SYXT.list_lbv_syxt_mblb_index.Count; i++)
             //{
 
             //    set_syt_pic_legend(Color_list);
-            //    set_syt_pic( m_mbszclass, m_mbszclass.M_SYXT.list_lbv_syxt_mblb_index[i], Color_list);
+            //    set_syt_pic( TemplateClass, TemplateClass.M_SYXT.list_lbv_syxt_mblb_index[i], Color_list);
 
             //    XRPageBreak xRPage = new XRPageBreak();
             //    xRPage.LocationF = new PointF(0, LowPlace + 2);
@@ -475,46 +518,46 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             //}
           
 
-            for (int i = 0; i < m_mbszclass.M_SYXT.list_lbv_syxt_mblb_index.Count; i=i+4)
+            for (int i = 0; i < TemplateClass.M_SYXT.list_lbv_syxt_mblb_index.Count; i=i+4)
             {
 
                 set_syt_pic_legend(Color_list);
 
-                if (i< m_mbszclass.M_SYXT.list_lbv_syxt_mblb_index.Count)
+                if (i< TemplateClass.M_SYXT.list_lbv_syxt_mblb_index.Count)
                 {
-                    set_syt_pic(m_mbszclass, m_mbszclass.M_SYXT.list_lbv_syxt_mblb_index[i], Color_list, new PointF(10f, LowPlace + 2));
+                    set_syt_pic(TemplateClass, TemplateClass.M_SYXT.list_lbv_syxt_mblb_index[i], Color_list, new PointF(10f, NeueStartposition + 2));
                 }
-                if (i+1 < m_mbszclass.M_SYXT.list_lbv_syxt_mblb_index.Count)
+                if (i+1 < TemplateClass.M_SYXT.list_lbv_syxt_mblb_index.Count)
                 {
-                    set_syt_pic(m_mbszclass, m_mbszclass.M_SYXT.list_lbv_syxt_mblb_index[i+1], Color_list, new PointF(343.8f, LowPlace + 2));
+                    set_syt_pic(TemplateClass, TemplateClass.M_SYXT.list_lbv_syxt_mblb_index[i+1], Color_list, new PointF(343.8f, NeueStartposition + 2));
                 }
 
-                if (i+2 < m_mbszclass.M_SYXT.list_lbv_syxt_mblb_index.Count)
+                if (i+2 < TemplateClass.M_SYXT.list_lbv_syxt_mblb_index.Count)
                 {
-                    set_syt_pic(m_mbszclass, m_mbszclass.M_SYXT.list_lbv_syxt_mblb_index[i+2], Color_list, new PointF(10f, LowPlace + 345+5));
+                    set_syt_pic(TemplateClass, TemplateClass.M_SYXT.list_lbv_syxt_mblb_index[i+2], Color_list, new PointF(10f, NeueStartposition + 345+5));
                 }
-                if (i + 3 < m_mbszclass.M_SYXT.list_lbv_syxt_mblb_index.Count)
+                if (i + 3 < TemplateClass.M_SYXT.list_lbv_syxt_mblb_index.Count)
                 {
-                    set_syt_pic(m_mbszclass, m_mbszclass.M_SYXT.list_lbv_syxt_mblb_index[i+3], Color_list, new PointF(343.8f, LowPlace + 345+5));
+                    set_syt_pic(TemplateClass, TemplateClass.M_SYXT.list_lbv_syxt_mblb_index[i+3], Color_list, new PointF(343.8f, NeueStartposition + 345+5));
                 }
 
 
-                //set_syt_pic(m_mbszclass, m_mbszclass.M_SYXT.list_lbv_syxt_mblb_index[i], Color_list);
+                //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;
-                rLine.LocationF = new PointF(335f, LowPlace+2);
+                rLine.LocationF = new PointF(335f, NeueStartposition+2);
                 this.Detail.Controls.Add(rLine);
 
                 XRLine rLine_level = new XRLine();
                 rLine_level.SizeF = new SizeF(668f, 5f);
                 rLine_level.LineDirection = LineDirection.Horizontal;
-                rLine_level.LocationF = new PointF(10f, LowPlace + 345);
+                rLine_level.LocationF = new PointF(10f, NeueStartposition + 345);
                 this.Detail.Controls.Add(rLine_level);
 
                 XRPageBreak xRPage = new XRPageBreak();
-                xRPage.LocationF = new PointF(0, LowPlace + 850);
-                LowPlace = LowPlace + 870;
+                xRPage.LocationF = new PointF(0, NeueStartposition + 850);
+                NeueStartposition = NeueStartposition + 870;
                 this.Detail.Controls.Add(xRPage);
             }
 
@@ -522,20 +565,20 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
         /// <summary>
         /// 颗粒列表
         /// </summary>
-        /// <param name="m_mbszclass"></param>
-        public void set_kllb_data(c_TemplateClass m_mbszclass)
+        /// <param name="TemplateClass"></param>
+        public void set_kllb_data()
         {
             XRPageBreak xRPage = new XRPageBreak();
             xRPage.Name = "kllb_Page";
-            xRPage.LocationF = new PointF(0, LowPlace + 2);
+            xRPage.LocationF = new PointF(0, NeueStartposition + 2);
             this.Detail.Controls.Add(xRPage);
-            xrTable_kllb_surface.LocationF = new PointF(0, LowPlace + 5);
+            xrTable_kllb_surface.LocationF = new PointF(0, NeueStartposition + 5);
             xrTable_kllb_surface.Visible = true;
-            LowPlace = xrTable_kllb_surface.LocationF.Y + xrTable_kllb_surface.SizeF.Height;
+            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(m_mbszclass);
+            DataTable dataTable = export_ReportTemplate.Get_dev_kllb_data(TemplateClass);
 
             for (int i=0;i<dataTable.Rows.Count;i++)
             {
@@ -545,18 +588,18 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             for (int i = 0; i < dataTable.Rows.Count; i++)
             {
                 XRTable table = add_XRTable();
-                add_kllb(m_mbszclass, dataTable, i, table);
+                add_kllb(TemplateClass, dataTable, i, table);
             }
-            LowPlace = LowPlace + 10;
+            NeueStartposition = NeueStartposition + 10;
         }
         /// <summary>
         /// 颗粒列表 帧图
         /// </summary>
-        /// <param name="m_mbszclass"></param>
-        public void set_kllb_data_frame(c_TemplateClass m_mbszclass)
+        /// <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(m_mbszclass, out DataTable dt_pic, out List<DataTable> listData);
+            export_ReportTemplate.Get_dev_kllb_data_frame(TemplateClass, out DataTable dt_pic, out List<DataTable> listData);
 
             for (int i=0;i< listData.Count;i++)
             {
@@ -571,8 +614,8 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                 //分页符
                 XRPageBreak xRPage = new XRPageBreak();
                 xRPage.Name = "framePage_" + i.ToString();
-                xRPage.LocationF = new PointF(0, LowPlace);
-                LowPlace = LowPlace + 10;
+                xRPage.LocationF = new PointF(0, NeueStartposition);
+                NeueStartposition = NeueStartposition + 10;
                 this.Detail.Controls.Add(xRPage);
                 //表头
                 XRTable Template = new XRTable();
@@ -588,10 +631,10 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                 Template.Rows.Add(Template_Rows_2);
                 Template.SizeF = new SizeF(688f, 25f);
                 Template.Rows[0].Cells[0].Text = "帧图 " + dt_pic.Rows[i]["id"];
-                Template.LocationF = new PointF(0, LowPlace);
+                Template.LocationF = new PointF(0, NeueStartposition);
                 Template.Borders = DevExpress.XtraPrinting.BorderSide.All;
                 Template.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-                Template.Rows[0].Font = new Font(typeface, 14f, FontStyle.Bold);
+                Template.Rows[0].Font = new Font(Schriftart_chinese, 14f, FontStyle.Bold);
                 Template.Rows[0].BackColor = Color.DarkGray;
                 this.Detail.Controls.Add(Template);
                 //图片
@@ -602,10 +645,10 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                 xRPicture.Sizing = DevExpress.XtraPrinting.ImageSizeMode.Squeeze;
                 ImageSource imageSource = new ImageSource((Bitmap)dt_pic.Rows[i]["Field_pic"]);
                 xRPicture.ImageSource = imageSource;
-                xRPicture.LocationF = new PointF(0, LowPlace + Template.SizeF.Height);
+                xRPicture.LocationF = new PointF(0, NeueStartposition + Template.SizeF.Height);
                 xRPicture.Borders = DevExpress.XtraPrinting.BorderSide.All;
                 this.Detail.Controls.Add(xRPicture);
-                LowPlace = LowPlace + xRPicture.SizeF.Height + Template.SizeF.Height;
+                NeueStartposition = NeueStartposition + xRPicture.SizeF.Height + Template.SizeF.Height;
 
                 for (int a = 0; a < listData.Count; a++)
                 {
@@ -617,8 +660,8 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                             XRTable xRTable = add_XRTable_frame();
                             xRTable.Rows[0].Cells[0].Text = "图像";
                             xRTable.Rows[0].Cells[1].Text = "分类";
-                            xRTable.Rows[0].Cells[2].Text = m_mbszclass.M_KLLBXX.str_cb_kllb_chartSort_p1.ToString();
-                            xRTable.Rows[0].Cells[3].Text = m_mbszclass.M_KLLBXX.str_cb_kllb_chartSort_p2.ToString();
+                            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();
 
                             XRPictureBox xRPicture1 = new XRPictureBox();
                             xRPicture1.ImageSource = new ImageSource((Bitmap)listData[a].Rows[b]["pic"]);
@@ -636,9 +679,9 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
                                 xRTable.Rows[3].Cells[c].Text = listData[a].Rows[b]["ColVal" + (c + 1).ToString()].ToString();
                             }
 
-                            xRTable.LocationF = new PointF(0, LowPlace + 5);
+                            xRTable.LocationF = new PointF(0, NeueStartposition + 5);
                             this.Detail.Controls.Add(xRTable);
-                            LowPlace = LowPlace + xRTable.SizeF.Height + 5 + 2;
+                            NeueStartposition = NeueStartposition + xRTable.SizeF.Height + 5 + 2;
                         }
                     }
                 }
@@ -648,12 +691,12 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
         private void setTableCellData(XRTableCell cell, string str)
         {
             cell.Text = str;
-            cell.Font = new Font(typeface, cell.Font.Size);
+            cell.Font = new Font(Schriftart_chinese, cell.Font.Size);
         }
         private void setXRLabelData(XRLabel cell, string str)
         {
             cell.Text = str;
-            cell.Font = new Font(typeface, cell.Font.Size);
+            cell.Font = new Font(Schriftart_chinese, cell.Font.Size);
 
         }
         /// <summary>
@@ -796,27 +839,27 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
         /// </summary>
         /// <param name="syt_pic_name"></param>
         /// <param name="syt_Page_name"></param>
-        /// <param name="m_mbszclass"></param>
+        /// <param name="TemplateClass"></param>
         /// <param name="index"></param>
-        private void set_syt_pic(c_TemplateClass m_mbszclass, int index, List<Color> Color_list)
+        private void set_syt_pic(c_TemplateClass TemplateClass, int index, List<Color> Color_list)
         {
             
 
             XRPictureBox xRPicture = new XRPictureBox();
  
-            xRPicture.LocationF = new PointF(10f, LowPlace);
+            xRPicture.LocationF = new PointF(10f, NeueStartposition);
             xRPicture.SizeF = syx_Size;
 
-            ImageSource imageSource = new ImageSource(export_ReportTemplate.DrawATernaryPicture(index, m_mbszclass,Color_list));
+            ImageSource imageSource = new ImageSource(export_ReportTemplate.DrawATernaryPicture(index, TemplateClass,Color_list));
             xRPicture.ImageSource = imageSource;
             xRPicture.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
             xRPicture.Visible = true;
             this.Detail.Controls.Add(xRPicture);
 
 
-            LowPlace = syx_Size.Height + LowPlace + 10;
+            NeueStartposition = syx_Size.Height + NeueStartposition + 10;
         }
-        private void set_syt_pic(c_TemplateClass m_mbszclass, int index, List<Color> Color_list, PointF position)
+        private void set_syt_pic(c_TemplateClass TemplateClass, int index, List<Color> Color_list, PointF position)
         {
 
 
@@ -825,7 +868,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             xRPicture.LocationF = position;
             xRPicture.SizeF = new SizeF(321f, 330.2f);
 
-            ImageSource imageSource = new ImageSource(export_ReportTemplate.DrawATernaryPicture(index, m_mbszclass, Color_list));
+            ImageSource imageSource = new ImageSource(export_ReportTemplate.DrawATernaryPicture(index, TemplateClass, Color_list));
             xRPicture.ImageSource = imageSource;
             xRPicture.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
             xRPicture.Visible = true;
@@ -839,12 +882,12 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
         {
             XRPictureBox xRPicture_legend = new XRPictureBox();
          
-            xRPicture_legend.LocationF = new PointF(95f, LowPlace);
+            xRPicture_legend.LocationF = new PointF(95f, NeueStartposition);
             xRPicture_legend.SizeF = new SizeF(504f, 120.85f);
             xRPicture_legend.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
             ImageSource imageSource_legend = new ImageSource(export_ReportTemplate.DrawATernaryDiagramLegend(Color_list));
             xRPicture_legend.ImageSource = imageSource_legend;
-            LowPlace = LowPlace + xRPicture_legend.SizeF.Height;
+            NeueStartposition = NeueStartposition + xRPicture_legend.SizeF.Height;
             this.Detail.Controls.Add(xRPicture_legend);
         }
         #endregion
@@ -987,10 +1030,10 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             Template.Rows.Add(Template_Rows_4);
             Template.Rows.Add(Template_Rows_5);
             Template.SizeF = new SizeF(688f, 125);
-            Template.Rows[0].Font = new Font(dataFont, 14f, FontStyle.Bold);
-            Template.Rows[2].Font = new Font(dataFont, 14f, FontStyle.Bold);
-            Template.Rows[1].Font = new Font(dataFont, 14f);
-            Template.Rows[3].Font = new Font(dataFont, 14f);
+            Template.Rows[0].Font = new Font(Schriftart_english, 14f, FontStyle.Bold);
+            Template.Rows[2].Font = new Font(Schriftart_english, 14f, FontStyle.Bold);
+            Template.Rows[1].Font = new Font(Schriftart_english, 14f);
+            Template.Rows[3].Font = new Font(Schriftart_english, 14f);
 
             Template.Rows[0].BackColor = Color.DarkGray;
             Template.Rows[2].BackColor = Color.DarkGray;
@@ -1009,16 +1052,16 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
 
             return Template;
         }
-        private void add_kllb(c_TemplateClass m_mbszclass, DataTable dataTable, int position, XRTable xRTable)
+        private void add_kllb(c_TemplateClass TemplateClass, DataTable dataTable, int position, XRTable xRTable)
         {
             XRTable table = new XRTable();
             table = xRTable;
             table.Name = "table_kllb_" + position.ToString();
             table.Rows[0].Cells[1].Text = "ID";
             table.Rows[0].Cells[2].Text = "Class";
-            table.Rows[0].Cells[3].Text = m_mbszclass.M_KLLBXX.str_cb_kllb_sort_p1.ToString();
-            table.Rows[0].Cells[4].Text = m_mbszclass.M_KLLBXX.str_cb_kllb_sort_p2.ToString();
-            table.Rows[0].Cells[5].Text = m_mbszclass.M_KLLBXX.str_cb_kllb_sort_p3.ToString();
+            table.Rows[0].Cells[3].Text = TemplateClass.M_KLLBXX.str_cb_kllb_sort_p1.ToString();
+            table.Rows[0].Cells[4].Text = TemplateClass.M_KLLBXX.str_cb_kllb_sort_p2.ToString();
+            table.Rows[0].Cells[5].Text = TemplateClass.M_KLLBXX.str_cb_kllb_sort_p3.ToString();
 
             table.Rows[1].Cells[1].Text = dataTable.Rows[position]["pid"].ToString();
             table.Rows[1].Cells[2].Text = dataTable.Rows[position]["Class"].ToString();
@@ -1055,14 +1098,14 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             table.Rows[4].Cells[0].Controls.Add(xRPicture2);
 
             table.Visible = true;
-            table.LocationF = new PointF(0, LowPlace);
+            table.LocationF = new PointF(0, NeueStartposition);
             table.SendToBack();
             //table.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
             this.Detail.Controls.Add(table);
             XRPictureBox xRPicture_pic = new XRPictureBox();
             xRPicture_pic.Name = "Picture_kllb_" + position.ToString();
             xRPicture_pic.ImageSource = new ImageSource((Image)dataTable.Rows[position]["p1"]);
-            xRPicture_pic.LocationF = new PointF(1, LowPlace);
+            xRPicture_pic.LocationF = new PointF(1, NeueStartposition);
             xRPicture_pic.Visible = true;
             xRPicture_pic.BackColor = Color.DarkGray;
             xRPicture_pic.Sizing = DevExpress.XtraPrinting.ImageSizeMode.Squeeze;
@@ -1070,7 +1113,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             xRPicture_pic.BringToFront();
             this.Detail.Controls.Add(xRPicture_pic);
 
-            LowPlace = table.SizeF.Height + LowPlace+5;
+            NeueStartposition = table.SizeF.Height + NeueStartposition+5;
         }
         #endregion
         #region 颗粒列表帧图
@@ -1183,7 +1226,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             Template.Rows[2].BackColor = Color.DarkGray;
             Template.Borders = DevExpress.XtraPrinting.BorderSide.All;
             Template.SizeF = new SizeF(688f, 30);
-            Template.Font= new Font(dataFont, 14f);
+            Template.Font= new Font(Schriftart_english, 14f);
             return Template;
         }
         #endregion

File diff suppressed because it is too large
+ 0 - 0
OTSIncAReportApp/ReportTemplate/OTS_DEVReport.resx


Some files were not shown because too many files changed in this diff