From fb4d7f319ecba332d58b0165516f88d05dae5f77 Mon Sep 17 00:00:00 2001 From: peterforstmeier Date: Mon, 29 Nov 2010 20:07:40 +0100 Subject: [PATCH] Fire RowRenderEvent after Layouter and before Converter --- .../Project/BaseClasses/Printing/Layouter.cs | 12 ++++++------ .../Exporter/Converters/BaseConverter.cs | 18 ++++++++++-------- .../Exporter/Converters/GroupedRowConverter.cs | 5 +++-- .../Converters/GroupedTableConverter.cs | 4 +++- 4 files changed, 22 insertions(+), 17 deletions(-) diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/Layouter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/Layouter.cs index b6ea39b395..b3f63ca23a 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/Layouter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/Layouter.cs @@ -33,8 +33,8 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing return Rectangle.Empty; } - Console.WriteLine("\tlayouter for container <{0}>",container.ToString()); - +// Console.WriteLine("\tlayouter for container <{0}>",container.ToString()); + Console.WriteLine("\tLayouter for Container"); Rectangle desiredContainerRectangle = new Rectangle (container.Location,container.Size); System.Collections.Generic.IEnumerable canGrowShrinkCollection = from bt in container.Items where bt.CanGrow == true select bt; @@ -58,7 +58,7 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing // // Console.WriteLine("Diff {0} - {1} dif {2}",desiredContainerRectangle,r1,desiredContainerRectangle.Height - r1.Height); } - Console.WriteLine("\tContainer : {0} - DesiredContainerRectangle {1} ",container.Size,desiredContainerRectangle.Size); +// Console.WriteLine("\tContainer : {0} - DesiredContainerRectangle {1} ",container.Size,desiredContainerRectangle.Size); return desiredContainerRectangle; } @@ -72,8 +72,8 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing throw new ArgumentNullException("section"); } - Console.WriteLine("\tlayouter for section <{0}>",section.Name); - +// Console.WriteLine("\tLayouter for Container");Console.WriteLine("\tlayouter for section <{0}>",section.Name); + Console.WriteLine("\tLayouter for Section"); IEnumerable canGrowShrinkCollection = from bt in section.Items where bt.CanGrow == true select bt; Rectangle desiredSectionRectangle = new Rectangle(section.Location.X, @@ -93,7 +93,7 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing surroundingRec.Size.Height); } } - Console.WriteLine("\tSection : {0} - DesiredContainerRectangle {1} ",section.Size,desiredSectionRectangle.Size); +// Console.WriteLine("\tSection : {0} - DesiredContainerRectangle {1} ",section.Size,desiredSectionRectangle.Size); return desiredSectionRectangle; } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs index 6ea374ca63..5e6612ea83 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs @@ -247,10 +247,19 @@ namespace ICSharpCode.Reports.Core.Exporter } + protected void PrepareContainerForConverting(BaseSection section,ISimpleContainer simpleContainer) + { + Console.WriteLine("\tPrepareContainerForConverting"); + FireSectionRendering(section); + LayoutRow(simpleContainer); + } + + protected Point ConvertStandardRow(ExporterCollection mylist, BaseSection section, ISimpleContainer simpleContainer) { + Console.WriteLine("\tConvertStandardRow"); var rowSize = simpleContainer.Size; - PrepareContainerForConverting(section,simpleContainer); +// PrepareContainerForConverting(section,simpleContainer); Point curPos = ConvertContainer(mylist,simpleContainer,DefaultLeftPosition,CurrentPosition); AfterConverting (mylist); simpleContainer.Size = rowSize; @@ -258,13 +267,6 @@ namespace ICSharpCode.Reports.Core.Exporter } - protected void PrepareContainerForConverting(BaseSection section,ISimpleContainer simpleContainer) - { - FireSectionRendering(section); - LayoutRow(simpleContainer); - } - - protected void AfterConverting (ExporterCollection convertedList) { StandardPrinter.EvaluateRow(Evaluator,convertedList); diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedRowConverter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedRowConverter.cs index 7de663af78..e352c48ed7 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedRowConverter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedRowConverter.cs @@ -123,9 +123,10 @@ namespace ICSharpCode.Reports.Core.Exporter Console.WriteLine(""); Size containerSize = section.Items[0].Size; base.FillRow(simpleContainer); - + base.PrepareContainerForConverting(section,simpleContainer); + FireRowRendering(simpleContainer,base.DataNavigator); base.CurrentPosition = ConvertStandardRow (exporterCollection,section,simpleContainer); - base.FireRowRendering(simpleContainer,base.DataNavigator); +// base.FireRowRendering(simpleContainer,base.DataNavigator); section.Size = base.RestoreSectionSize; section.Items[0].Size = containerSize; Console.WriteLine(""); diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedTableConverter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedTableConverter.cs index e59fab02fa..a870deaa88 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedTableConverter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedTableConverter.cs @@ -138,8 +138,10 @@ namespace ICSharpCode.Reports.Core.Exporter PrintHelper.AdjustSectionLocation(section); CheckForPageBreak(section,simpleContainer,headerRow,exporterCollection); FillRow(simpleContainer); - base.CurrentPosition = ConvertStandardRow (exporterCollection,section,simpleContainer); + base.PrepareContainerForConverting(section,simpleContainer); FireRowRendering(simpleContainer,base.DataNavigator); + base.CurrentPosition = ConvertStandardRow (exporterCollection,section,simpleContainer); +// FireRowRendering(simpleContainer,base.DataNavigator); simpleContainer.Size = containerSize; section.Size = base.RestoreSectionSize; Console.WriteLine("");