diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/PrintHelper.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/PrintHelper.cs index 7d9c145623..89e6d5218a 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/PrintHelper.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/PrintHelper.cs @@ -13,6 +13,7 @@ using System.Globalization; using System.Linq; using ICSharpCode.Reports.Core.Interfaces; +using ICSharpCode.Reports.Core.old_Exporter; namespace ICSharpCode.Reports.Core { @@ -105,7 +106,6 @@ namespace ICSharpCode.Reports.Core public static bool IsTextOnlyRow (ISimpleContainer item) - //public static bool IsTextOnlyRow (BaseRowItem item) { var res = from r in item.Items where r is BaseDataItem select ((BaseTextItem)r); @@ -185,6 +185,21 @@ namespace ICSharpCode.Reports.Core } } + + public static void ShowLocations (ExporterCollection items) + { + Console.WriteLine(""); + + foreach (BaseExportColumn element in items) { + ExportContainer cont = element as ExportContainer; + if (cont != null) { + Console.WriteLine("-------Container ----{0}-----",cont.StyleDecorator.Location); + ShowLocations(cont.Items); + } + System.Console.WriteLine ("{0} - {1}",element.ToString(),element.StyleDecorator.Location.ToString()); + } + } + #endregion } } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs index 4b867be08c..8426193214 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs @@ -107,13 +107,13 @@ namespace ICSharpCode.Reports.Core.old_Exporter Point offset = new Point(section.Location.X,section.SectionOffset); foreach (IReportItem item in section.Items) { - + ISimpleContainer container = item as ISimpleContainer; if (container != null) { ExportContainer exportContainer = this.exportItemsConverter.ConvertToContainer(offset,container); - - AdjustBackColor (container); + + AdjustBackColor (container); ExporterCollection clist = this.exportItemsConverter.ConvertSimpleItems(offset,container.Items); exportContainer.Items.AddRange(clist); diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/DataPageBuilder.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/DataPageBuilder.cs index c33a9088b0..d0b669417d 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/DataPageBuilder.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/DataPageBuilder.cs @@ -97,6 +97,9 @@ namespace ICSharpCode.Reports.Core.old_Exporter { base.ReportModel.PageHeader.SectionOffset = base.AdjustPageHeader(); ExporterCollection convertedList = base.ConvertSection (base.ReportModel.PageHeader,this.dataNavigator.CurrentRow); + + PrintHelper.ShowLocations(convertedList); + base.SinglePage.Items.AddRange(convertedList); //orginal //base.ConvertSection(base.ReportModel.PageHeader,0); diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs index 68d0396022..dbf0296426 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs @@ -234,6 +234,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer private void PushPrinting (object sender, SectionRenderEventArgs e ) { EventHelper.Raise(SectionRendering,this,e); + /* string sectionName = e.Section.Name; if (sectionName == ReportSectionNames.ReportHeader) { @@ -259,6 +260,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer else{ throw new WrongSectionException(sectionName); } + */ } //testcode to handle sectionrenderevent