remove Codedublictions in Text and Borders

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/reports@5982 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseTextItem.cs

@@ -13,6 +13,7 @@ using System.ComponentModel;
 using System.Drawing;
 
 using ICSharpCode.Reports.Core;
+using ICSharpCode.Reports.Core.BaseClasses.Printing;
 
 namespace ICSharpCode.Reports.Addin
 {

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/ErrorItem.cs

@@ -42,7 +42,7 @@ namespace ICSharpCode.Reports.Addin
 			
 			string s = String.Format(System.Globalization.CultureInfo.CurrentCulture,
 			                         "Error : <{0}> is missing or obsolete",base.Text);
-			ICSharpCode.Reports.Core.TextDrawer.DrawString(graphics,s,this.Font,
+			ICSharpCode.Reports.Core.BaseClasses.Printing.TextDrawer.DrawString(graphics,s,this.Font,
 			                                               new SolidBrush(Color.Red),
 			                                               this.ClientRectangle,
 			                                               base.StringTrimming,base.ContentAlignment);

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj

@@ -80,6 +80,7 @@
     <Compile Include="Project\BaseClasses\Printing\MeasurementService.cs" />
     <Compile Include="Project\BaseClasses\Printing\PrintHelper.cs" />
     <Compile Include="Project\BaseClasses\Printing\StandardFormatter.cs" />
+    <Compile Include="Project\BaseClasses\Printing\StandardPrinter.cs" />
     <Compile Include="Project\BaseClasses\Printing\TextDrawer.cs" />
     <Compile Include="Project\BaseClasses\SinglePage.cs" />
     <Compile Include="Project\BaseClasses\SectionBounds.cs" />

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardPrinter.cs

@@ -0,0 +1,48 @@
+/*
+ * Created by SharpDevelop.
+ * User: Peter Forstmeier
+ * Date: 20.06.2010
+ * Time: 19:04
+ * 
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
+using System;
+using System.Drawing;
+using ICSharpCode.Reports.Core.old_Exporter;
+
+namespace ICSharpCode.Reports.Core.BaseClasses.Printing
+{
+	/// <summary>
+	/// Description of StandardPrinter.
+	/// </summary>
+	internal sealed class StandardPrinter
+	{
+		public StandardPrinter()
+		{
+		}
+		
+		public static void FillBackground (Graphics  graphics,BaseStyleDecorator decorator,Rectangle rectangle)
+		{
+			RectangleShape backgroundShape = new RectangleShape();
+			
+			backgroundShape.FillShape(graphics,
+			                new SolidFillPattern(decorator.BackColor),
+			                rectangle);
+		}
+		
+		
+		public static void DrawBorder (Graphics graphics,BaseStyleDecorator decorator,Rectangle rectangle)
+		{
+			if (decorator.DrawBorder)
+			{
+				if (decorator.FrameColor == Color.Empty)
+				{
+					decorator.FrameColor = decorator.ForeColor;
+				}
+				Border border = new Border(new BaseLine (decorator.FrameColor,System.Drawing.Drawing2D.DashStyle.Solid,1));
+				border.DrawBorder(graphics,rectangle);
+			}
+		}
+	
+	}
+}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/TextDrawer.cs

@@ -17,7 +17,7 @@ using System.Drawing.Text;
 /// 	created on - 12.10.2005 10:54:08
 /// </remarks>
 
-namespace ICSharpCode.Reports.Core
+namespace ICSharpCode.Reports.Core.BaseClasses.Printing
 {
 	public sealed class TextDrawer 
 	{

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseDataItem.cs

@@ -26,20 +26,17 @@ namespace ICSharpCode.Reports.Core {
 		private string columnName;
 		private string baseTableName;
 		private string dbValue;
-//		private string dataType;
 		private string nullValue;
 		
 		#region Constructor
 		
 		public BaseDataItem():base() 
 		{
-//			this.dataType = "System.String";
 		}
 		
 		public BaseDataItem(string columnName):base()
 		{
 			this.columnName = columnName;
-//			basataType = "System.String";
 		}
 		
 		#endregion

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseReportItem.cs

@@ -10,6 +10,9 @@ using System.ComponentModel;
 using System.Drawing;
 using System.Xml.Serialization;
 
+using ICSharpCode.Reports.Core.BaseClasses.Printing;
+using ICSharpCode.Reports.Core.old_Exporter;
+
 /// <summary>
 /// This Class is the BaseClass for <see cref="BaseTextItem"></see>
 /// and <see cref="BaseGraphicItem"></see>
@@ -35,6 +38,7 @@ namespace ICSharpCode.Reports.Core {
 			this.Visible = true;
 		}
 		
+		
 		#region EventHandling
 		
 		protected void NotifyAfterPrint (PointF afterPrintLocation)
@@ -63,12 +67,33 @@ namespace ICSharpCode.Reports.Core {
 		
 		#endregion
 		
-		protected void FillBackground (Graphics  graphics) {
+		protected BaseStyleDecorator BaseStyleDecorator
-			backgroundShape.FillShape(graphics,
+		{
-			                new SolidFillPattern(this.BackColor),
+			get {
-			                this.DrawingRectangle);
+				return this.GetBaseStyleDecorator();
+			}
+		}
+		
+		
+		private BaseStyleDecorator GetBaseStyleDecorator()
+		{
+			BaseStyleDecorator bsd = new BaseStyleDecorator();
+			bsd.DrawBorder = this.DrawBorder;
+			bsd.BackColor = this.BackColor;
+			bsd.ForeColor = this.ForeColor;
+			bsd.FrameColor = this.FrameColor;
+			bsd.Location = this.Location;
+			bsd.Size = this.Size;
+			return bsd;
 		}
 		
+		protected void FillBackground (Graphics  graphics)
+		{
+			StandardPrinter.FillBackground(graphics,this.BaseStyleDecorator,this.DrawingRectangle);
+		}
+		
+		
+		
 		protected void DrawFrame (Graphics graphics,Border border) {
 			if (this.DrawBorder == true) {
 				border.DrawBorder(graphics,this.DrawingRectangle);
@@ -90,8 +115,6 @@ namespace ICSharpCode.Reports.Core {
 					                     this.Location.Y + this.SectionOffset,
 					                     this.Size.Width,this.Size.Height);
 				}
-				
-				
 			}
 		}
 		

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseRowItem.cs

@@ -8,6 +8,7 @@
 using System;
 using System.ComponentModel;
 using System.Drawing;
+using ICSharpCode.Reports.Core.BaseClasses.Printing;
 
 using ICSharpCode.Reports.Core.old_Exporter;
 using ICSharpCode.Reports.Core.Interfaces;
@@ -66,16 +67,11 @@ namespace ICSharpCode.Reports.Core{
 			base.Render(rpea);
 			
 			if (this.BackColor != GlobalValues.DefaultBackColor) {
-				base.FillBackground(rpea.PrintPageEventArgs.Graphics);       
+				StandardPrinter.FillBackground(rpea.PrintPageEventArgs.Graphics,this.BaseStyleDecorator,this.DrawingRectangle);
 			}
 			 
-			Border b = new Border(new BaseLine (this.FrameColor,System.Drawing.Drawing2D.DashStyle.Solid,1));
+			StandardPrinter.DrawBorder(rpea.PrintPageEventArgs.Graphics,this.BaseStyleDecorator,this.DrawingRectangle);
-			
-			base.DrawFrame (rpea.PrintPageEventArgs.Graphics,b);
-			
-
 			this.Location = point;
-			
 			base.NotifyAfterPrint (rpea.LocationAfterDraw);
 		}
 		

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseTextItem.cs

@@ -7,6 +7,7 @@
 
 using System;
 using System.Drawing;
+using ICSharpCode.Reports.Core.BaseClasses.Printing;
 using ICSharpCode.Reports.Core.old_Exporter;
 
 /// <summary>
@@ -53,6 +54,7 @@ namespace ICSharpCode.Reports.Core
 			TextStyleDecorator style = new TextStyleDecorator();
 			
 			style.BackColor = this.BackColor;
+			style.FrameColor = this.FrameColor;
 			style.ForeColor = this.ForeColor;
 			
 			style.Font = this.Font;
@@ -80,10 +82,9 @@ namespace ICSharpCode.Reports.Core
 			}
 			
 			base.Render(rpea);
-			base.FillBackground(rpea.PrintPageEventArgs.Graphics);
+		
-			//Border b = new Border(new BaseLine (this.ForeColor,System.Drawing.Drawing2D.DashStyle.Solid,1));
+			StandardPrinter.FillBackground(rpea.PrintPageEventArgs.Graphics,this.BaseStyleDecorator,this.DrawingRectangle);
-			Border b = new Border(new BaseLine (this.FrameColor,System.Drawing.Drawing2D.DashStyle.Solid,1));
+			StandardPrinter.DrawBorder(rpea.PrintPageEventArgs.Graphics,this.BaseStyleDecorator,base.DrawingRectangle);
-			base.DrawFrame(rpea.PrintPageEventArgs.Graphics,b);
 			
 			string formated = StandardFormatter.FormatOutput(this.text,this.FormatString,this.DataType,String.Empty);
 			

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

@@ -56,6 +56,7 @@ namespace ICSharpCode.Reports.Core
 		#endregion
 		
 		
+		
 		protected void RenderTable (BaseReportItem parent,ITableContainer tableContainer,ReportPageEventArgs rpea)
 		{
 			if (rpea == null) {
@@ -67,8 +68,7 @@ namespace ICSharpCode.Reports.Core
 			Point currentPosition = new Point(this.CurrentSection.Location.X,this.CurrentSection.Location.Y);
 			
 			Point tableStart = currentPosition;
-			
+
-//			base.Render(rpea);
 			
 			int defaultLeftPos = PrintHelper.DrawingAreaRelativeToParent(parent,tableContainer).Left;
 			
@@ -79,14 +79,13 @@ namespace ICSharpCode.Reports.Core
 			{
 				if (row != null)
 				{
-					row.Parent = tableContainer as BaseReportItem;
+					PrintHelper.AdjustParent(tableContainer as BaseReportItem,tableContainer.Items);
+//					row.Parent = tableContainer as BaseReportItem;
+					
 					if (PrintHelper.IsTextOnlyRow(row) )
 					{
-//						currentPosition = this.PrintTextRow (rpea,row,defaultLeftPos,currentPosition);
+						currentPosition = this.RenderContainer(row,currentPosition,rpea);
-//						currentPosition = this.RenderContainer(parent,tableContainer,rpea);
+						currentPosition = new Point(parent.Location.X + row.Location.X,currentPosition.Y);
-						
-						this.RenderContainer(parent,row,rpea);
-						
 						tableContainer.Location = saveLocation;
 					}
 					else {
@@ -98,7 +97,9 @@ namespace ICSharpCode.Reports.Core
 								AbstractRenderer.PageBreak(rpea);
 								return;
 							}
-//							currentPosition = this.PrintDataRow (rpea,row,defaultLeftPos,currentPosition);
+							this.dataNavigator.Fill(row.Items);
+							currentPosition = this.RenderContainer(row,currentPosition,rpea);
+							currentPosition = new Point(parent.Location.X + row.Location.X,currentPosition.Y);
 						}
 						while (this.dataNavigator.MoveNext());
 					}
@@ -112,6 +113,7 @@ namespace ICSharpCode.Reports.Core
 				                                parent.Size.Width,currentPosition.Y + 5));
 			}
 			*/
+			
 			rpea.LocationAfterDraw = new Point(rpea.LocationAfterDraw.X,rpea.LocationAfterDraw.Y + 20);
 //			base.NotifyAfterPrint (rpea.LocationAfterDraw);
 		}
@@ -133,22 +135,26 @@ namespace ICSharpCode.Reports.Core
 				}
 			}
 			if (hasContainer) {
-				return RenderSectionWithSimpleContainer(this.CurrentSection,container,rpea);
+				return RenderSectionWithSimpleContainer(this.CurrentSection,container,
+				                                        new Point(CurrentSection.Location.X,CurrentSection.SectionOffset),
+				                                        rpea);
 				
 			} else {
 				return base.RenderSection(rpea);
 			}
-			
 		}
 		
 		
 		
 		private  Point RenderSectionWithSimpleContainer (BaseSection section,
-		                                      ISimpleContainer container,
+		                                                 ISimpleContainer container,
-		                                      ReportPageEventArgs rpea)
+		                                                 Point offset,
-		
+		                                                 ReportPageEventArgs rpea)
+			
 		{
-			Point drawPoint	= Point.Empty;
+			
+			Point currentPosition	= new Point(section.Location.X + container.Location.X,offset.Y);
+			
 			if (section.Visible){
 				
 				//Always set section.size to it's original value
@@ -156,63 +162,55 @@ namespace ICSharpCode.Reports.Core
 				section.Size = this.SectionBounds.DetailSectionRectangle.Size;
 				
 				Size containerSize = new Size (section.Items[0].Size.Width,section.Items[0].Size.Height);
-							
+				
 				PrintHelper.SetLayoutForRow(rpea.PrintPageEventArgs.Graphics,base.Layout,container);
 				
 				section.Render (rpea);
 				
+				PrintHelper.AdjustParent(section,section.Items);
 				
 				foreach (BaseReportItem item in section.Items) {
-					
+
-					item.Parent = section;
-					
 					item.SectionOffset = section.SectionOffset;
-					
 					Point saveLocation = item.Location;
-					
 					item.Render(rpea);
 					
 					item.Location = saveLocation;
 					
 					ISimpleContainer cont = item as ISimpleContainer;
 
-					RenderContainer (this.CurrentSection,cont,rpea);
+					currentPosition = RenderContainer (cont,currentPosition,rpea);
-					
 					item.Location = saveLocation;
-					
+					currentPosition = new Point(item.Location.X,
-					drawPoint = new Point(item.Location.X,
+					                            section.SectionOffset + section.Size.Height);
-					                      section.SectionOffset + section.Size.Height);
 					
 					rpea.LocationAfterDraw = new Point (rpea.LocationAfterDraw.X,section.SectionOffset + section.Size.Height);
-					
 				}
-				section.Items[0].Size = containerSize;
+				
 				if ((section.CanGrow == false)&& (section.CanShrink == false)) {
 					return new Point(section.Location.X,section.Size.Height);
 				}
 				section.Items[0].Size = containerSize;
-				return drawPoint;
+				return currentPosition;
 			}
 			
-			return drawPoint;
+			return currentPosition;
 		}
 		
 		
 		
-		private void RenderContainer (BaseReportItem parent,ISimpleContainer simpleContainer,ReportPageEventArgs rpea)
+		private Point RenderContainer (ISimpleContainer simpleContainer,Point offset,ReportPageEventArgs rpea)
 		{
 			
-			if (simpleContainer != null) {
+			BaseReportItem item = simpleContainer as BaseReportItem;
+			Point retVal = offset;
+			
+			if (simpleContainer.Items != null)  {	
 				
-				BaseReportItem item = simpleContainer as BaseReportItem;
+				retVal = base.RenderPlainCollection(item,simpleContainer.Items,offset,rpea);
 				
-				if (simpleContainer.Items != null)  {
-					
-					base.RenderPlainCollection(item,simpleContainer.Items,new Point(parent.Location.X + simpleContainer.Location.X,
-					                                                                item.SectionOffset + item.Location.Y),rpea);
-					
-				}
 			}
+			return retVal;
 		}
 		
 		

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

@@ -209,7 +209,7 @@ namespace ICSharpCode.Reports.Core
 	
 		protected virtual Point RenderSection (ReportPageEventArgs rpea)
 		{
-			Point drawPoint	= Point.Empty;
+			Point currentPosition	= Point.Empty;
 			
 			if (this.CurrentSection.Visible){
 				this.CurrentSection.Render (rpea);
@@ -231,43 +231,23 @@ namespace ICSharpCode.Reports.Core
 				}
 				
 				
-				RenderPlainCollection (this.CurrentSection,this.CurrentSection.Items,new Point(this.CurrentSection.Location.X,
+				currentPosition = RenderPlainCollection (this.CurrentSection,this.CurrentSection.Items,new Point(this.CurrentSection.Location.X,
 				                                                                               this.CurrentSection.SectionOffset),rpea);
 				
-				/*
-				foreach (BaseReportItem item in this.CurrentSection.Items) {
-					if (item.Parent == null) {
-						item.Parent = this.CurrentSection;
-					}
-					
-					item.SectionOffset = this.CurrentSection.SectionOffset;
-					BaseTextItem bti = item as BaseTextItem;
-					
-					if (bti != null) {
-						bti.Text = Evaluator.Evaluate(bti.Text);
-					}
-					item.Render(rpea);
-					drawPoint = new Point(this.CurrentSection.Location.X,
-					                      this.CurrentSection.SectionOffset + this.CurrentSection.Size.Height);
-					rpea.LocationAfterDraw = new Point (rpea.LocationAfterDraw.X,
-					                                    this.CurrentSection.SectionOffset + this.CurrentSection.Size.Height);
-					
-				}
-				
-				*/
 				
 				if ((this.CurrentSection.CanGrow == false)&& (this.CurrentSection.CanShrink == false)) {
-					return new Point(this.CurrentSection.Location.X,
+//					return new Point(this.CurrentSection.Location.X,
-					                 this.CurrentSection.Size.Height);
+//					                 this.CurrentSection.Size.Height);
+					return currentPosition;
 				}
-				return drawPoint;
+				return currentPosition;
 			}
-			return drawPoint;
+			return currentPosition;
 		}
 		
 		
 		
-		protected void RenderPlainCollection (BaseReportItem parent,ReportItemCollection items, Point offset,ReportPageEventArgs rpea)
+		protected Point RenderPlainCollection (BaseReportItem parent,ReportItemCollection items, Point offset,ReportPageEventArgs rpea)
 		{
 			
 			if (items.Count > 0) {
@@ -298,6 +278,9 @@ namespace ICSharpCode.Reports.Core
 					}
 					child.Location = saveLocation;
 				}
+				return rpea.LocationAfterDraw;
+			} else {
+				return offset;
 			}
 		}
 		

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

@@ -181,6 +181,7 @@ namespace ICSharpCode.Reports.Core {
 				
 				do {
 					ISimpleContainer simpleContainer = base.CurrentSection.Items[0] as ISimpleContainer;
+					
 					if (simpleContainer != null) {
 						nav.Fill (simpleContainer.Items);
 					} else {

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Decorators/BaseStyleDecorator.cs

@@ -16,10 +16,6 @@ namespace ICSharpCode.Reports.Core.old_Exporter
 	public class BaseStyleDecorator : IBaseStyleDecorator
 	{
 
-		private bool drawBorder;
-		private Color backColor;
-		private Color foreColor;
-		private Color frameColor;
 		private Point location;
 		private Size size;
 
@@ -29,59 +25,40 @@ namespace ICSharpCode.Reports.Core.old_Exporter
 
 		public BaseStyleDecorator(Color backColor, Color foreColor)
 		{
-			this.backColor = backColor;
+			this.BackColor = backColor;
-			this.foreColor = foreColor;
+			this.ForeColor = foreColor;
 		}
 
 		
-		public bool DrawBorder {
+		public bool DrawBorder {get;set;}
-			get { return drawBorder; }
-			set { drawBorder = value; }
-		}
-
-
-		public Color BackColor {
-			get { return backColor; }
-			set { backColor = value; }
-		}
 
+		public Color BackColor {get;set;}
+		
+		public Color FrameColor {get;set;}
 
+		public Color ForeColor {get;set;}
+		
+		public Point Location {get;set;}
+			
+		public Size Size {get;set;}
+		
+		
 		public iTextSharp.text.BaseColor PdfBackColor {
-			get {return ConvertToPdfBaseColor(this.backColor);}
+			get {return ConvertToPdfBaseColor(this.BackColor);}
-		}
-
-
-		public Color ForeColor {
-			get { return foreColor; }
-			set { foreColor = value; }
 		}
 
 
 		public iTextSharp.text.BaseColor PdfForeColor {
-			get {return ConvertToPdfBaseColor(this.foreColor);}
+			get {return ConvertToPdfBaseColor(this.ForeColor);}
 		}
 
 		
-		public Color FrameColor {
-			get { return frameColor; }
-			set { frameColor = value; }
-		}
-		
-
 		public iTextSharp.text.BaseColor PdfFrameColor {
-			get {return ConvertToPdfBaseColor(frameColor);}
+			get {return ConvertToPdfBaseColor(FrameColor);}
 		}
 		
-		public Point Location {
+	
-			get { return location; }
+			
-			set { location = value; }
-		}
-
-		public Size Size {
-			get { return size; }
-			set { size = value; }
-		}
-
 
 		public Rectangle DisplayRectangle {
 			get { return new Rectangle(this.location.X, this.location.Y, this.size.Width, this.size.Height); }

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportColumns/BaseExportColumn.cs

@@ -8,6 +8,7 @@
 using System;
 using System.Drawing;
 using iTextSharp.text.pdf;
+using ICSharpCode.Reports.Core.BaseClasses.Printing;
 
 namespace ICSharpCode.Reports.Core.old_Exporter
 {
@@ -76,7 +77,7 @@ namespace ICSharpCode.Reports.Core.old_Exporter
 			}
 			RectangleShape shape = new RectangleShape();
 			this.FillShape(graphics,shape);
-			this.DrawFrame(graphics);
+			StandardPrinter.DrawBorder(graphics,this.StyleDecorator as BaseStyleDecorator,this.StyleDecorator.DisplayRectangle);
 		}
 		
 		
@@ -100,6 +101,7 @@ namespace ICSharpCode.Reports.Core.old_Exporter
 		/// </summary>
 		/// <param name="graphics">a valid graphics object</param>
 		/// <param name="shape">the shape to fill</param>
+		/// 
 		protected virtual void FillShape (Graphics graphics,BaseShape shape)
 		{
 			if (graphics == null) {
@@ -135,13 +137,6 @@ namespace ICSharpCode.Reports.Core.old_Exporter
 		}
 		
 		
-		private  void DrawFrame (Graphics graphics)
-		{
-			if (this.styleDecorator.DrawBorder) {
-				Border b = this.CreateDefaultBorder();
-				b.DrawBorder(graphics,this.styleDecorator.DisplayRectangle);
-			}
-		}
 		
 		
 		private  void DrawFrame ()

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/ExportColumns/ExportText.cs

@@ -7,6 +7,7 @@
 
 using System;
 using System.Drawing;
+using ICSharpCode.Reports.Core.BaseClasses.Printing;
 using iTextSharp.text;
 using iTextSharp.text.pdf;
 
@@ -20,9 +21,7 @@ namespace ICSharpCode.Reports.Core.old_Exporter {
 		
 		#region Constructors
 		
-//		public ExportText():base()
+
-//		{
-//		}
 		
 		public ExportText (BaseStyleDecorator itemStyle,bool isContainer):base(itemStyle,isContainer)
 		{