Remove unused code in SectionBounds.cs, modify SectionBoundFixture.cs

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/SectionBounds.cs

@@ -19,7 +19,6 @@ namespace ICSharpCode.Reports.Core.BaseClasses
 		Rectangle PageFooterRectangle {get;}
 		Rectangle ReportFooterRectangle {get;set;}
 		Rectangle DetailSectionRectangle{get;set;}
-		Point DetailStart {get;}
 		Rectangle DetailArea {get;}
 		Size PageSize {get;set;}
 		bool Landscape{get;}
@@ -154,7 +153,6 @@ namespace ICSharpCode.Reports.Core.BaseClasses
 		}
 		
 		
-		//Test
 		public Rectangle ReportHeaderRectangle
 		{
 			get {
@@ -163,7 +161,6 @@ namespace ICSharpCode.Reports.Core.BaseClasses
 		}
 		
 		
-		//Test
 		public Rectangle PageHeaderRectangle
 		{
 			get {
@@ -172,7 +169,6 @@ namespace ICSharpCode.Reports.Core.BaseClasses
 		}
 		
 		
-		//Test
 		public Rectangle PageFooterRectangle
 		{
 			get {
@@ -181,7 +177,6 @@ namespace ICSharpCode.Reports.Core.BaseClasses
 		}
 		
 		
-		//Test
 		public Rectangle ReportFooterRectangle
 		{
 			get {
@@ -192,26 +187,16 @@ namespace ICSharpCode.Reports.Core.BaseClasses
 			}
 		}
 		
-		//Test
-		public Point DetailStart
-		{
-			get {
-				return new Point(this.pageHeaderRectangle.Left,
-				                 this.pageHeaderRectangle.Bottom + GlobalValues.GapBetweenContainer );
-			}
-		}
 		
 		/// <summary>
 		/// This rectangle starts directly after PageHeader and ends bevore PageFooter
 		/// </summary>
 		
-		//Test
-		
 		public Rectangle DetailArea
 		{
 			get {
 				return new Rectangle (new Point (pageHeaderRectangle.X,pageHeaderRectangle.Bottom + GlobalValues.GapBetweenContainer),
-				                      new Size(pageFooterRectangle.Location.X,pageFooterRectangle.Top));
+				                      new Size(pageFooterRectangle.Location.X,pageFooterRectangle.Top - GlobalValues.GapBetweenContainer));
 			}
 		}
 		

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/SinglePage.cs

@@ -45,7 +45,7 @@ namespace ICSharpCode.Reports.Core.BaseClasses
 
 			//this.sectionBounds.MeasureDetailArea();
 			
-			this.sectionBounds.DetailSectionRectangle = new System.Drawing.Rectangle(reportModel.DetailSection.Location.X,sectionBounds.DetailStart.Y,
+			this.sectionBounds.DetailSectionRectangle = new System.Drawing.Rectangle(reportModel.DetailSection.Location.X,sectionBounds.DetailArea.Top,
 			                                                                         reportModel.DetailSection.Size.Width,
 			                                                                         reportModel.DetailSection.Size.Height);
 

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedRowConverter.cs

@@ -45,7 +45,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 				ExporterCollection myList = new ExporterCollection();
 
 				ConvertContainer (myList,simpleContainer,parent.Location.X,
-				             new Point(base.SectionBounds.DetailStart.X,base.SectionBounds.DetailStart.Y));
+				             new Point(base.SectionBounds.DetailArea.X,base.SectionBounds.DetailArea.Y));
 				
 				return myList;
 			} else {
@@ -58,8 +58,8 @@ namespace ICSharpCode.Reports.Core.Exporter
 		{
 			
 			ExporterCollection exporterCollection = new ExporterCollection();
-			base.CurrentPosition = new Point(base.SectionBounds.DetailStart.X,base.SectionBounds.DetailStart.Y);
+//			base.CurrentPosition = new Point(base.SectionBounds.DetailStart.X,base.SectionBounds.DetailStart.Y);
-			
+			base.CurrentPosition = base.SectionBounds.DetailArea.Location;
 			BaseSection section = parent as BaseSection;
 			
 			DefaultLeftPosition = parent.Location.X;
@@ -164,7 +164,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 		private Point CalculateStartPosition(BaseSection section)
 		{
 			
-			Console.WriteLine ("CalculateStartPosition {0}", base.SectionBounds.DetailStart);
+//			Console.WriteLine ("CalculateStartPosition {0}", base.SectionBounds.DetailStart);
 			var r = base.ReportModel;
 			base.SectionBounds.MeasureReportHeader(r.ReportHeader);
 			base.SectionBounds.MeasurePageHeader(r.PageHeader);
@@ -172,7 +172,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 //			Console.WriteLine("\tpageheader {0}",base.SectionBounds.PageHeaderRectangle);
 //			Console.WriteLine("\tdetail {0}",base.SectionBounds.DetailArea);
 //			Console.WriteLine("\tret value  {0}",base.SectionBounds.PageHeaderRectangle.Bottom );
-			return new Point(base.SectionBounds.DetailStart.X,base.SectionBounds.PageHeaderRectangle.Bottom + 1);
+			return new Point(base.SectionBounds.DetailArea.X,base.SectionBounds.PageHeaderRectangle.Bottom + 1);
 		}
 		
 		

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedTableConverter.cs

@@ -54,7 +54,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 			Point dataAreaStart = new Point(table.Items[0].Location.X,table.Items[0].Location.Y + base.CurrentPosition.Y);
 			
 			base.CurrentPosition = new Point(PrintHelper.DrawingAreaRelativeToParent(this.table.Parent,this.table).Location.X,
-			                                 base.SectionBounds.DetailStart.Y);
+			                                 base.SectionBounds.DetailArea.Top);
 
 			base.DefaultLeftPosition = base.CurrentPosition.X;
 			
@@ -177,23 +177,10 @@ namespace ICSharpCode.Reports.Core.Exporter
 		protected override Point ForcePageBreak(ExporterCollection exporterCollection, BaseSection section)
 		{
 			base.ForcePageBreak(exporterCollection, section);
-			Console.WriteLine();
-			Console.WriteLine(" CalculateStartPosition in TableConverter");
-			Console.WriteLine("{0}",base.SectionBounds.DetailStart);
-			Console.WriteLine("{0} ",SectionBounds.DetailArea);
-			Console.WriteLine("{0} ",base.SectionBounds.ReportHeaderRectangle);
-			Console.WriteLine("{0} ",base.SectionBounds.PageHeaderRectangle);
-//			return new Point (base.SectionBounds.PageHeaderRectangle.X,SectionBounds.DetailStart.Y);
-//			return new Point (base.SectionBounds.PageHeaderRectangle.X,SectionBounds.DetailStart.Y);
-//			return new Point (base.SectionBounds.PageHeaderRectangle.X,SectionBounds.DetailArea.Top);
-			
-//			return new Point (base.SectionBounds.PageHeaderRectangle.X,base.SectionBounds.PageHeaderRectangle.Bottom);
-			var pp = new Point (base.SectionBounds.PageHeaderRectangle.X,base.SectionBounds.PageHeaderRectangle.Bottom);
-			Console.WriteLine ("Bottom {0}",pp);
-			Console.WriteLine("secoffset {0}",section.SectionOffset);
 			return base.SectionBounds.ReportHeaderRectangle.Location;
 		}
 		
+		
 		#endregion
 		
 		

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/DataPageBuilder.cs

@@ -97,7 +97,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 			
 			if (!PrintHelper.IsRoomForFooter(base.SectionBounds,base.ReportModel.ReportFooter.Location)) {
 				PageBreak();
-				base.ReportModel.ReportFooter.SectionOffset = SectionBounds.DetailStart.Y;
+				base.ReportModel.ReportFooter.SectionOffset = SectionBounds.DetailArea.Top;
 				pageBreak = true;
 			}
 			
@@ -196,7 +196,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 			this.dataNavigator.MoveNext();
 			BaseSection section = base.ReportModel.DetailSection;
 
-			section.SectionOffset = base.SinglePage.SectionBounds.DetailStart.Y;
+			section.SectionOffset = base.SinglePage.SectionBounds.DetailArea.Top;
 			var p = this.BuildDetail (section,dataNavigator);
 			
 			var r = new Rectangle (SectionBounds.ReportFooterRectangle.Left,p.Y,

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/FormPageBuilder.cs

@@ -62,7 +62,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 		protected override void BuildDetailInternal(BaseSection section)
 		{
 			base.BuildDetailInternal(section);
-			section.SectionOffset = base.SinglePage.SectionBounds.DetailStart.Y;
+			section.SectionOffset = base.SinglePage.SectionBounds.DetailArea.Top;
 			ExporterCollection convertedList = convertedList = base.ConvertSection (base.ReportModel.DetailSection,0);
 			base.SinglePage.Items.AddRange(convertedList);	   
 		}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/RenderDataReport.cs

@@ -133,7 +133,7 @@ namespace ICSharpCode.Reports.Core {
 				this.ReportDocument.ReportHasData = false;
 				PrintNoDataMessage(rpea.PrintPageEventArgs);
 			}	
-			base.CurrentSection.SectionOffset = (int)base.SectionBounds.DetailStart.Y + GlobalValues.GapBetweenContainer;
+			base.CurrentSection.SectionOffset = base.SectionBounds.DetailArea.Top + GlobalValues.GapBetweenContainer;
 		}
 		
 		

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Printing/SectionBoundFixture.cs

@@ -193,17 +193,24 @@ namespace ICSharpCode.Reports.Core.Test.Printing
 		#endregion
 		
 		[Test]
-		public void DetailStart_One_Below_PageHeader ()
+		public void DetailArea_Start_One_Below_PageHeader ()
 		{
-			
 			SectionBounds sectionBounds  = new SectionBounds(new ReportSettings(),true);
 			BaseSection pageHeader = new BaseSection();
-
 			sectionBounds.MeasurePageHeader(pageHeader);
 			Point p = new Point(sectionBounds.PageHeaderRectangle.Left,sectionBounds.PageHeaderRectangle.Bottom +1	);
-			Assert.That(sectionBounds.DetailStart,Is.EqualTo(p));
+			Assert.That(sectionBounds.DetailArea.Location,Is.EqualTo(p));
 		}
 			
+		[Test]
+		public void DetailArea_Ends_One_Above_PageFooter()
+		{
+			SectionBounds sectionBounds  = new SectionBounds(new ReportSettings(),true);
+			BaseSection pageFooter = new BaseSection();
+			sectionBounds.MeasurePageFooter(pageFooter);
+			Point p = new Point(sectionBounds.PageFooterRectangle.Left,sectionBounds.PageFooterRectangle.Y );
+			Assert.That(sectionBounds.DetailArea.Top + sectionBounds.DetailArea.Height,Is.EqualTo(p.Y));
+		}
 		
 		
 		public override void Setup()