Cleanup

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Designer/DesignerHelper.cs

@@ -11,7 +11,7 @@ namespace ICSharpCode.Reports.Addin.Designer
 	/// <summary>
 	/// Description of DesignerHelper.
 	/// </summary>
-	public sealed class DesignerHelper
+	internal sealed class DesignerHelper
 	{
 		
 		private DesignerHelper()
@@ -84,7 +84,7 @@ namespace ICSharpCode.Reports.Addin.Designer
 		public static void AddTextbasedProperties (List<PropertyDescriptor> allProperties,
 		                                          PropertyDescriptorCollection props)
 		{
-			PropertyDescriptor prop = prop = props.Find("Font",true);
+			PropertyDescriptor prop = props.Find("Font",true);
 			allProperties.Add(prop);
 			
 			prop = props.Find("FormatString",true);
@@ -105,5 +105,19 @@ namespace ICSharpCode.Reports.Addin.Designer
 			prop = props.Find("DataType",true);
 			allProperties.Add(prop);
 		}
+		
+		public static void AddGraphicProperties (List<PropertyDescriptor> allProperties,
+		                                         PropertyDescriptorCollection props)
+		{
+			PropertyDescriptor prop = null;
+			prop = props.Find("ForeColor",true);
+			allProperties.Add(prop);
+			
+			prop = props.Find("DashStyle",true);
+			allProperties.Add(prop);
+			
+			prop = props.Find("Thickness",true);
+			allProperties.Add(prop);
+		}
 	}
 }

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/TypeProviders/CircleItemTypeProvider.cs

@@ -51,17 +51,9 @@ namespace ICSharpCode.Reports.Addin.TypeProviders
 			System.Collections.Generic.List<PropertyDescriptor> allProperties = new System.Collections.Generic.List<PropertyDescriptor>();
 			
 			DesignerHelper.AddDefaultProperties(allProperties,props);
-			
+			DesignerHelper.AddGraphicProperties(allProperties,props);
 			PropertyDescriptor prop = null;
-			prop = props.Find("ForeColor",true);
+
-			allProperties.Add(prop);
-			
-			prop = props.Find("DashStyle",true);
-			allProperties.Add(prop);
-			
-			prop = props.Find("Thickness",true);
-			allProperties.Add(prop);
-			
 			prop = props.Find("Controls",true);
 			allProperties.Add(prop);
 			

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/TypeProviders/RectangleItemTypeProvider.cs

@@ -46,17 +46,10 @@ namespace ICSharpCode.Reports.Addin.TypeProviders
 			System.Collections.Generic.List<PropertyDescriptor> allProperties = new System.Collections.Generic.List<PropertyDescriptor>();
 			
 			DesignerHelper.AddDefaultProperties(allProperties,props);
+			DesignerHelper.AddGraphicProperties(allProperties,props);
 			
 			PropertyDescriptor prop = null;
-			prop = props.Find("ForeColor",true);
+
-			allProperties.Add(prop);
-			
-			prop = props.Find("DashStyle",true);
-			allProperties.Add(prop);
-			
-			prop = props.Find("Thickness",true);
-			allProperties.Add(prop);
-			
 			prop = props.Find("CornerRadius",true);
 			allProperties.Add(prop);
 			

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

@@ -145,6 +145,7 @@
     <Compile Include="Project\Exceptions\WrongColumnException.cs" />
     <Compile Include="Project\Exceptions\WrongSectionException.cs" />
     <Compile Include="Project\Exporter\Converters\GroupedTableConverter.cs" />
+    <Compile Include="Project\Exporter\ExportColumns\ExportGraphicContainer.cs" />
     <Compile Include="Project\Expressions\EvaluationHelper.cs" />
     <Compile Include="Project\Expressions\SimpleExpressionEvaluator\Compilation\Functions\ReportingService\FieldReference.cs" />
     <Compile Include="Project\Exporter\BasePager.cs" />

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseCircleItem.cs

@@ -31,9 +31,8 @@ namespace ICSharpCode.Reports.Core {
 		#region IExportColumnBuilder
 		
 		public BaseExportColumn CreateExportColumn(){
-//			shape.CornerRadius = CornerRadius;
 			IGraphicStyleDecorator style = base.CreateItemStyle(this.shape);
-			return  new ExportGraphicContainer(style,true);
+			return new ExportGraphicContainer(style,true);
 		}
 	
 		

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseRectangleItem.cs

@@ -7,7 +7,6 @@ using System.Drawing.Drawing2D;
 
 using ICSharpCode.Reports.Core.BaseClasses.Printing;
 using ICSharpCode.Reports.Core.Exporter;
-using ICSharpCode.Reports.Core.Globals;
 using ICSharpCode.Reports.Core.Interfaces;
 
 /// <summary>
@@ -86,57 +85,4 @@ namespace ICSharpCode.Reports.Core
 			}
 		}
 	}
-	
-	public class ExportGraphicContainer :ExportContainer ,IExportContainer
-	{
-		ExporterCollection items;
-		
-		
-		public ExportGraphicContainer (IBaseStyleDecorator itemStyle,bool isContainer):base(itemStyle as BaseStyleDecorator)
-		{
-			
-		}
-		
-		public override void DrawItem(Graphics graphics)
-		{
-			base.DrawItem(graphics);
-			ILineDecorator lineDecorator = base.StyleDecorator as LineDecorator;
-			if (lineDecorator != null) {
-				GraphicsLineDrawer (graphics);
-			}
-			else  {
-				IGraphicStyleDecorator style = base.StyleDecorator as GraphicStyleDecorator;
-				if (style != null) {
-					base.FillShape(graphics,style.Shape);
-					BaseLine baseLine = null;
-					if (style.BackColor == GlobalValues.DefaultBackColor){
-						baseLine = new BaseLine (style.ForeColor,style.DashStyle,style.Thickness);
-					} else {
-						baseLine = new BaseLine (style.BackColor,style.DashStyle,style.Thickness);
-					}
-					style.Shape.DrawShape(graphics,
-					                      baseLine,
-					                      style.DisplayRectangle);
-				}
-			}
-		}
-		
-		
-		private void GraphicsLineDrawer (Graphics graphics)
-		{
-			LineDecorator lineStyle = base.StyleDecorator as LineDecorator;
-			
-			BaseLine baseLine = null;
-			baseLine = new BaseLine (lineStyle.ForeColor,lineStyle.DashStyle,lineStyle.Thickness);
-			
-			Point from = new Point(lineStyle.DisplayRectangle.Left +  lineStyle.From.X,
-			                       lineStyle.DisplayRectangle.Top + lineStyle.From.Y);
-			Point to = new Point(lineStyle.DisplayRectangle.Left +  lineStyle.To.X,
-			                     lineStyle.DisplayRectangle.Top + lineStyle.To.Y);
-			lineStyle.Shape.DrawShape(graphics,
-			                          baseLine,
-			                          from,
-			                          to);
-		}
-	}
 }

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

@@ -15,24 +15,24 @@ namespace ICSharpCode.Reports.Core.Exporter
 	public class BaseExportColumn
 	{
 		
-		private IBaseStyleDecorator styleDecorator;
+//		private IBaseStyleDecorator styleDecorator;
-		private bool isContainer;
+	//	private bool isContainer;
-		private ICSharpCode.Reports.Core.Exporter.ExportRenderer.PdfUnitConverter converter;
+	//	private ICSharpCode.Reports.Core.Exporter.ExportRenderer.PdfUnitConverter converter;
-		private PdfWriter pdfWriter;
+//		private PdfWriter pdfWriter;
 		
 		#region Constructors
 		
 		public BaseExportColumn()
 		{
-			this.styleDecorator = new BaseStyleDecorator(System.Drawing.Color.White,
+			this.StyleDecorator = new BaseStyleDecorator(System.Drawing.Color.White,
 			                                             System.Drawing.Color.Black);
 		}
 		
 		
-		public BaseExportColumn(IBaseStyleDecorator itemStyle, bool isContainer)
+		public BaseExportColumn(IBaseStyleDecorator styleDecorator, bool isContainer)
 		{
-			this.styleDecorator = itemStyle;
+			this.StyleDecorator = styleDecorator;
-			this.isContainer = isContainer;
+			this.IsContainer = isContainer;
 		}
 		
 		#endregion
@@ -54,8 +54,8 @@ namespace ICSharpCode.Reports.Core.Exporter
 			if (converter == null) {
 				throw new ArgumentNullException("converter");
 			}
-			this.pdfWriter = pdfWriter;
+			this.PdfWriter = pdfWriter;
-			this.converter = converter;
+			this.PdfUnitConverter = converter;
 		}
 		#endregion
 		
@@ -82,9 +82,9 @@ namespace ICSharpCode.Reports.Core.Exporter
 		{
 			RectangleShape shape = new RectangleShape();
 	
-			shape.DrawShape(this.pdfWriter.DirectContent,
+			shape.DrawShape(this.PdfWriter.DirectContent,
 			            null,
-			            this.styleDecorator,
+			            this.StyleDecorator,
 			            ConvertToPdfRectangle());        
 			this.DrawFrame();
 			
@@ -111,8 +111,8 @@ namespace ICSharpCode.Reports.Core.Exporter
 			}
 			
 			shape.FillShape(graphics,
-			                new SolidFillPattern(this.styleDecorator.BackColor),
+			                new SolidFillPattern(this.StyleDecorator.BackColor),
-			                this.styleDecorator.DisplayRectangle);
+			                this.StyleDecorator.DisplayRectangle);
 			
 		}
 		
@@ -121,10 +121,10 @@ namespace ICSharpCode.Reports.Core.Exporter
 		
 		protected iTextSharp.text.Rectangle ConvertToPdfRectangle ()
 		{
-			ScreenRectToPdfRectConverter rectangleConverter = new ScreenRectToPdfRectConverter(this.converter);
+			ScreenRectToPdfRectConverter rectangleConverter = new ScreenRectToPdfRectConverter(this.PdfUnitConverter);
 			
 			iTextSharp.text.Rectangle r = (iTextSharp.text.Rectangle)rectangleConverter.ConvertTo(null,System.Globalization.CultureInfo.InvariantCulture,
-			                                                                                      this.styleDecorator.DisplayRectangle,
+			                                                                                      this.StyleDecorator.DisplayRectangle,
 			                                                                                      typeof(iTextSharp.text.Rectangle));
 		
 			
@@ -140,51 +140,32 @@ namespace ICSharpCode.Reports.Core.Exporter
 		
 		private Border CreateDefaultBorder()
 		{
-			return new Border(new BaseLine (this.styleDecorator.FrameColor,
+			return new Border(new BaseLine (this.StyleDecorator.FrameColor,
 			                                    System.Drawing.Drawing2D.DashStyle.Solid,1));
 		}
 		
 		
 		private  void DrawFrame ()
 		{
-			if (this.styleDecorator.DrawBorder) {
+			if (this.StyleDecorator.DrawBorder) {
 				Border b = this.CreateDefaultBorder();
-				b.DrawBorder(this.pdfWriter.DirectContent,
+				b.DrawBorder(this.PdfWriter.DirectContent,
 				             ConvertToPdfRectangle(),
-				             this.styleDecorator);
+				             this.StyleDecorator);
 			}
 		}
 
 		
-		
 		#endregion
 		
 
-		public virtual IBaseStyleDecorator StyleDecorator {
+		public virtual IBaseStyleDecorator StyleDecorator {get;set;}
-			get {
-				return styleDecorator;
-			}
-			set {
-				this.styleDecorator = value;
-			}
-		}
 		
-		public bool IsContainer {
+		public bool IsContainer {get; protected set;}
-			get {
+			
-				return isContainer;
+		public ICSharpCode.Reports.Core.Exporter.ExportRenderer.PdfUnitConverter PdfUnitConverter {get;private set;}
-			}
-			set {
-				isContainer = value;
-			}
-		}
-		
-		public ICSharpCode.Reports.Core.Exporter.ExportRenderer.PdfUnitConverter PdfUnitConverter {
-			get { return converter; }
-		}
 		
-		public PdfWriter PdfWriter {
+		public PdfWriter PdfWriter {get;private set;}
-			get { return pdfWriter; }
-		}
 		
 	}
 }

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/ExportGraphicContainer.cs

@@ -0,0 +1,67 @@
+/*
+ * Created by SharpDevelop.
+ * User: Peter Forstmeier
+ * Date: 18.02.2011
+ * Time: 20:20
+ * 
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
+using System;
+using System.Drawing;
+using ICSharpCode.Reports.Core.Globals;
+using iTextSharp.text.pdf;
+
+namespace ICSharpCode.Reports.Core.Exporter
+{
+	public class ExportGraphicContainer :ExportContainer
+	{
+		//ExporterCollection items;
+		
+		public ExportGraphicContainer (IBaseStyleDecorator itemStyle,bool isContainer):base(itemStyle as BaseStyleDecorator)
+		{
+			
+		}
+		
+		public override void DrawItem(Graphics graphics)
+		{
+			base.DrawItem(graphics);
+			ILineDecorator lineDecorator = base.StyleDecorator as LineDecorator;
+			if (lineDecorator != null) {
+				GraphicsLineDrawer (graphics);
+			}
+			else  {
+				IGraphicStyleDecorator style = base.StyleDecorator as GraphicStyleDecorator;
+				if (style != null) {
+					base.FillShape(graphics,style.Shape);
+					BaseLine baseLine = null;
+					if (style.BackColor == GlobalValues.DefaultBackColor){
+						baseLine = new BaseLine (style.ForeColor,style.DashStyle,style.Thickness);
+					} else {
+						baseLine = new BaseLine (style.BackColor,style.DashStyle,style.Thickness);
+					}
+					style.Shape.DrawShape(graphics,
+					                      baseLine,
+					                      style.DisplayRectangle);
+				}
+			}
+		}
+		
+		
+		private void GraphicsLineDrawer (Graphics graphics)
+		{
+			LineDecorator lineStyle = base.StyleDecorator as LineDecorator;
+			
+			BaseLine baseLine = null;
+			baseLine = new BaseLine (lineStyle.ForeColor,lineStyle.DashStyle,lineStyle.Thickness);
+			
+			Point from = new Point(lineStyle.DisplayRectangle.Left +  lineStyle.From.X,
+			                       lineStyle.DisplayRectangle.Top + lineStyle.From.Y);
+			Point to = new Point(lineStyle.DisplayRectangle.Left +  lineStyle.To.X,
+			                     lineStyle.DisplayRectangle.Top + lineStyle.To.Y);
+			lineStyle.Shape.DrawShape(graphics,
+			                          baseLine,
+			                          from,
+			                          to);
+		}
+	}
+}