From 1c7a9d59c7017729beba73c554a73b95d76e98ca Mon Sep 17 00:00:00 2001 From: peterforstmeier Date: Sat, 26 Mar 2011 18:01:32 +0100 Subject: [PATCH] Sections - BasePager.cs --- .../BaseClasses/Printing/StandardPrinter.cs | 4 +--- .../Project/BaseItems/Graphics/BaseLineItem.cs | 14 +++++++++++++- .../Project/Exporter/BasePager.cs | 6 +++--- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardPrinter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardPrinter.cs index db042d1c37..66a1fee7c0 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardPrinter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardPrinter.cs @@ -90,14 +90,12 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing if (columnBuilder != null) { lineItem = columnBuilder.CreateExportColumn(); - - + lineItem.StyleDecorator.Location = new Point(offset.X + lineItem.StyleDecorator.Location.X, lineItem.StyleDecorator.Location.Y + offset.Y); lineItem.StyleDecorator.DisplayRectangle = new Rectangle(lineItem.StyleDecorator.Location, lineItem.StyleDecorator.Size); - } return lineItem; } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseLineItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseLineItem.cs index 9d6836667f..0cadcabd43 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseLineItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseLineItem.cs @@ -47,6 +47,7 @@ namespace ICSharpCode.Reports.Core { private LineDecorator CreateLineShape () { LineDecorator decorator = new LineDecorator(this.shape); +// decorator.Size = CalculateLineSize (); decorator.Size = this.Size; decorator.Location = this.Location; decorator.BackColor = this.BackColor; @@ -59,6 +60,18 @@ namespace ICSharpCode.Reports.Core { return decorator; } + Size CalculateLineSize() + { + int dif = 0; + if (fromPoint.Y < toPoint.Y) { + // + dif = toPoint.Y - fromPoint.Y; + } else { + dif = fromPoint.Y - toPoint.Y; + } + return new Size (Size.Width, dif + ICSharpCode.Reports.Core.Globals.GlobalValues.GapBetweenContainer); + } + #endregion @@ -87,7 +100,6 @@ namespace ICSharpCode.Reports.Core { return "BaseLineItem"; } - public virtual Point FromPoint { get { return this.fromPoint; 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 3319ddc9ae..3431b973b3 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 @@ -94,7 +94,6 @@ namespace ICSharpCode.Reports.Core.Exporter Offset = new Point(section.Location.X,section.SectionOffset); if (section.Items.Count > 0) { - section.Items.SortByLocation(); IExpressionEvaluatorFacade evaluator = EvaluationHelper.CreateEvaluator(this.SinglePage,this.SinglePage.IDataNavigator); @@ -118,12 +117,13 @@ namespace ICSharpCode.Reports.Core.Exporter ExporterCollection exporterCollection = StandardPrinter.ConvertPlainCollection(simpleContainer.Items,exportContainer.StyleDecorator.Location); exportContainer.Items.AddRange(exporterCollection); convertedSection.Add(exportContainer); - - Offset = new Point(Offset.X,Offset.Y + exportContainer.StyleDecorator.Size.Height); + Offset = new Point(Offset.X,Offset.Y + exportContainer.StyleDecorator.Size.Height + GlobalValues.GapBetweenContainer); + //Console.WriteLine("{0} - {1}",exportContainer.StyleDecorator.Size,item.Size); } else { var converteditem = StandardPrinter.ConvertLineItem(item,Offset); + Offset = new Point(Offset.X,Offset.Y + converteditem.StyleDecorator.Size.Height + GlobalValues.GapBetweenContainer); convertedSection.Add(converteditem); } section.Size = new Size(section.Size.Width,Offset.Y - section.SectionOffset);