From ae4d494a28802f2d96bdaff981d40c267027c8f1 Mon Sep 17 00:00:00 2001
From: Peter Forstmeier <peter.forstmeier@t-online.de>
Date: Sat, 7 Sep 2013 19:23:23 +0200
Subject: [PATCH] DataPageBuilder.cs

---
 .../Src/Arrange/ArrangeStrategy.cs             |  8 ++------
 .../Src/Exporter/WpfExporter.cs                |  2 +-
 .../Src/PageBuilder/DataPageBuilder.cs         | 18 +++++++++---------
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Arrange/ArrangeStrategy.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Arrange/ArrangeStrategy.cs
index eeb06e2f72..2fdbd73b49 100644
--- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Arrange/ArrangeStrategy.cs
+++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Arrange/ArrangeStrategy.cs
@@ -26,10 +26,6 @@ namespace ICSharpCode.Reporting.Arrange
 	
 	internal class ContainerArrangeStrategy:IArrangeStrategy
 	{
-		public ContainerArrangeStrategy()
-		{
-		}
-		
 		
 		public void Arrange(IExportColumn exportColumn){
 			if (exportColumn == null)
@@ -42,7 +38,6 @@ namespace ICSharpCode.Reporting.Arrange
 				if (resizeable.Any()) {
 					
 					//minimun Location
-//					var minLocation  = (from p in container.ExportedItems orderby p.Location.Y select p).First();
 					var maxLocation  = (from p in container.ExportedItems orderby p.Location.Y select p).Last();
 					// maximum Size
 					var maxBottom  = (from p in container.ExportedItems orderby p.DisplayRectangle.Bottom select p).Last();
@@ -54,7 +49,7 @@ namespace ICSharpCode.Reporting.Arrange
 			}
 		}
 		
-		
+		/*
 		public void old_Arrange(IExportColumn exportColumn)
 		{
 			if (exportColumn == null)
@@ -95,6 +90,7 @@ namespace ICSharpCode.Reporting.Arrange
 		}
 
 	    public Rectangle BiggestRectangle {get; private set;}
+	    */
 	}
 	
 }
diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/WpfExporter.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/WpfExporter.cs
index 17dfcbbc22..2643cc8bea 100644
--- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/WpfExporter.cs
+++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/WpfExporter.cs
@@ -61,7 +61,7 @@ namespace ICSharpCode.Reporting.Exporter
 			if (exportContainer != null) {
 				
 				if (exportContainer.Name =="ReportDetail") {
-//					Console.WriteLine("Section {0}",item.Name);
+					Console.WriteLine("Section {0}",item.Name);
 					exportContainer.BackColor = System.Drawing.Color.LightBlue;
 				}
 
diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/DataPageBuilder.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/DataPageBuilder.cs
index 9fa7411285..785e44ca77 100644
--- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/DataPageBuilder.cs
+++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/DataPageBuilder.cs
@@ -37,7 +37,7 @@ namespace ICSharpCode.Reporting.PageBuilder
 		{
 			base.BuildExportList();
 			BuildDetail();
-//			row_BuildDetail();
+			base.BuildReportFooter();
 			base.AddPage(CurrentPage);
 			var er = new ExpressionRunner(Pages);
 			er.Run();
@@ -60,9 +60,10 @@ namespace ICSharpCode.Reporting.PageBuilder
 				CurrentLocation = DetailStart;
 				
 				detail = CreateContainerForSection(DetailStart);
-				detail.DesiredSize = new Size(detail.Size.Width,DetailEnds.Y - DetailStart.Y);
+//				detail.DesiredSize = new Size(detail.Size.Width,DetailEnds.Y - DetailStart.Y);
 
-				detail.Parent = CurrentPage;	
+				detail.Parent = CurrentPage;
+				
 				do {
 					collectionSource.Fill(CurrentSection.Items);
 					var convertedItems = converter.CreateConvertedList(ReportModel.DetailSection.Items,position);
@@ -82,25 +83,24 @@ namespace ICSharpCode.Reporting.PageBuilder
 					} else {
 						detail.ExportedItems.AddRange(convertedItems);
 						MeasureAndArrangeContainer(detail);
-						position = new Point(CurrentSection.Location.Y,position.Y + CurrentSection.Size.Height);
+//						position = new Point(CurrentSection.Location.Y,position.Y + CurrentSection.Size.Height + 5);
+						position = new Point(CurrentSection.Location.X,position.Y + detail.DesiredSize.Height + 5);
 					}
 				}
 				
 				while (collectionSource.MoveNext());
 				InsertDetailAtPosition(detail);
-				base.BuildReportFooter();
 				
 			} else {
 				detail = CreateContainerForSection(DetailStart);
 				InsertDetailAtPosition(detail);
-				base.BuildReportFooter();
 			}
 		}
 		
 		
 		
-		
 		/*
+		
 		void row_BuildDetail()
 		{
 			var converter = new ContainerConverter(base.Graphics, CurrentLocation);
@@ -142,8 +142,8 @@ namespace ICSharpCode.Reporting.PageBuilder
 				base.BuildReportFooter();
 			}
 		}
-		
-	*/
+		*/
+	
 	/*
 		IExportContainer CreateAndArrangeContainer(ContainerConverter converter, Point position,IExportContainer parent)
 		{