diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDefinitionDeserializer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDefinitionDeserializer.cs index 357e4a1c37..4d723a26ae 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDefinitionDeserializer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDefinitionDeserializer.cs @@ -113,7 +113,6 @@ namespace ICSharpCode.Reports.Addin } } } - Console.WriteLine("------------------"); } @@ -123,7 +122,7 @@ namespace ICSharpCode.Reports.Addin return t; } - + /* #region Properties public string ReportName { @@ -131,6 +130,6 @@ namespace ICSharpCode.Reports.Addin } #endregion - + */ } } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportDesignerView.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportDesignerView.cs index 6011a6d148..14e17f29e8 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportDesignerView.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportDesignerView.cs @@ -475,6 +475,7 @@ namespace ICSharpCode.Reports.Addin #region IHasPropertyContainer impementation PropertyContainer propertyContainer = new PropertyContainer(); + public PropertyContainer PropertyContainer { get { return propertyContainer; diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj index 43c95f6922..42fb4cb184 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj @@ -250,7 +250,6 @@ - diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/Layouter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/Layouter.cs index 379d929d97..c965dde7d5 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/Layouter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/Layouter.cs @@ -85,7 +85,7 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing } - + /* private static Rectangle FindSurroundingRectangle_2 (Graphics graphics,IEnumerable canGrowShrinkCollection) { int top = int.MaxValue; @@ -102,7 +102,7 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing } return rec; } - + */ private static Rectangle FindSurroundingRectangle (Graphics graphics,IEnumerable canGrowShrinkCollection) { diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/PrintHelper.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/PrintHelper.cs index b6fdef1074..ed419e35c9 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/PrintHelper.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/PrintHelper.cs @@ -164,6 +164,12 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing } + public static Point ConvertRectangleToCurentPosition (Rectangle r) + { + return new Point(r.Left,r.Bottom); + } + + #region Debug Code /// 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 91fb13b0d9..f73f3fdbfb 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 @@ -98,7 +98,7 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing } - public static void RenderLineItem (BaseReportItem item, Point offset,IExpressionEvaluatorFacade evaluator,ReportPageEventArgs rpea) + private static void RenderLineItem (BaseReportItem item, Point offset,IExpressionEvaluatorFacade evaluator,ReportPageEventArgs rpea) { Point saveLocation = new Point (item.Location.X,item.Location.Y); @@ -195,6 +195,7 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing if (item == null) { throw new ArgumentNullException("item"); } + IExportColumnBuilder lineBuilder = item as IExportColumnBuilder; if (lineBuilder != null) { diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseReportItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseReportItem.cs index c1d60db200..5fefe1cb3e 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseReportItem.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseReportItem.cs @@ -25,7 +25,6 @@ namespace ICSharpCode.Reports.Core { public event EventHandler ItemPrinting; [Obsolete("will be deleted")] public event EventHandler ItemPrinted; - private RectangleShape backgroundShape = new RectangleShape(); public BaseReportItem() diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/BaseListStrategy.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/BaseListStrategy.cs index f10d6f9b92..be2fbfaf45 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/BaseListStrategy.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/BaseListStrategy.cs @@ -52,7 +52,6 @@ namespace ICSharpCode.Reports.Core { //Index to plain Datat private IndexList indexList; -// private ReportSettings reportSettings; private AvailableFieldsCollection availableFields; @@ -86,7 +85,7 @@ namespace ICSharpCode.Reports.Core { #endregion - protected Collection CreateSortCollection (ColumnCollection items) + protected static Collection CreateSortCollection (ColumnCollection items) { Collection abstrCol = new Collection(); diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/CollectionStrategy.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/CollectionStrategy.cs index e3f807a7a2..60fb53e949 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/CollectionStrategy.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/CollectionStrategy.cs @@ -214,12 +214,10 @@ namespace ICSharpCode.Reports.Core { if ((base.ReportSettings.SortColumnsCollection != null)) { if (base.ReportSettings.SortColumnsCollection.Count > 0) { -// base.IndexList = this.BuildSortIndex (base.CreateSortCollection()); - base.IndexList = this.BuildSortIndex (base.CreateSortCollection(ReportSettings.SortColumnsCollection)); + base.IndexList = this.BuildSortIndex (BaseListStrategy.CreateSortCollection(ReportSettings.SortColumnsCollection)); base.IsSorted = true; -// BaseListStrategy.CheckSortArray (base.IndexList,"TableStrategy - CheckSortArray"); } else { - base.IndexList = this.IndexBuilder(base.CreateSortCollection(ReportSettings.SortColumnsCollection)); + base.IndexList = this.IndexBuilder(BaseListStrategy.CreateSortCollection(ReportSettings.SortColumnsCollection)); base.IsSorted = false; } } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/TableStrategy.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/TableStrategy.cs index 0ad5f432e2..4e529d5493 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/TableStrategy.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/TableStrategy.cs @@ -96,7 +96,7 @@ namespace ICSharpCode.Reports.Core base.Sort(); if ((base.ReportSettings.SortColumnsCollection != null)) { if (base.ReportSettings.SortColumnsCollection.Count > 0) { - base.IndexList = this.BuildSortIndex (base.CreateSortCollection(ReportSettings.SortColumnsCollection)); + base.IndexList = this.BuildSortIndex (BaseListStrategy.CreateSortCollection(ReportSettings.SortColumnsCollection)); base.IsSorted = true; } else { // if we have no sorting, we build the indexlist as well @@ -111,7 +111,7 @@ namespace ICSharpCode.Reports.Core { base.Group(); IndexList gl = new IndexList("group"); - gl = this.BuildSortIndex (base.CreateSortCollection(ReportSettings.GroupColumnsCollection)); + gl = this.BuildSortIndex (BaseListStrategy.CreateSortCollection(ReportSettings.GroupColumnsCollection)); base.ShowIndexList(gl); BuildGroup(gl); diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IExportItemsConverter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IExportItemsConverter.cs deleted file mode 100644 index dd02b4d800..0000000000 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IExportItemsConverter.cs +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 15.04.2009 - * Zeit: 20:51 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ -using System; -using System.Drawing; -using ICSharpCode.Reports.Core.Interfaces; - -namespace ICSharpCode.Reports.Core.old_Exporter -{ - /// - /// Description of IExportItemsConverter. - /// - - public interface IExportItemsConverter - { - //ExporterCollection ConvertSimpleItems (BaseReportItem parent,ReportItemCollection items,Point offset); - - //ExportContainer ConvertToContainer (BaseReportItem parent,ISimpleContainer item,Point offset); - -// Rectangle ParentRectangle {get;set;} - } -} diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/AbstractDataRenderer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/AbstractDataRenderer.cs index 4d316fe9e5..b3c12392be 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/AbstractDataRenderer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/AbstractDataRenderer.cs @@ -83,7 +83,7 @@ namespace ICSharpCode.Reports.Core { Rectangle r = StandardPrinter.RenderContainer(row,Evaluator,currentPosition,rpea); - currentPosition = ConvertRectangleToCurentPosition (r); + currentPosition =PrintHelper. ConvertRectangleToCurentPosition (r); currentPosition = new Point(parent.Location.X + row.Location.X,currentPosition.Y); tableContainer.Location = saveLocation; @@ -103,7 +103,7 @@ namespace ICSharpCode.Reports.Core this.dataNavigator.Fill(row.Items); Rectangle r = StandardPrinter.RenderContainer(row,Evaluator,currentPosition,rpea); - currentPosition = ConvertRectangleToCurentPosition (r); + currentPosition = PrintHelper.ConvertRectangleToCurentPosition (r); currentPosition = new Point(parent.Location.X + row.Location.X,currentPosition.Y); @@ -173,13 +173,12 @@ namespace ICSharpCode.Reports.Core PrintHelper.AdjustParent(section,section.Items); - int i = section.Items.Count; - foreach (BaseReportItem item in section.Items) { + foreach (BaseReportItem item in section.Items) { ISimpleContainer con = item as ISimpleContainer; if (con != null) { Rectangle r = StandardPrinter.RenderContainer(container,Evaluator,offset,rpea); - currentPosition = base.ConvertRectangleToCurentPosition(r); + currentPosition = PrintHelper.ConvertRectangleToCurentPosition(r); } else @@ -194,14 +193,14 @@ namespace ICSharpCode.Reports.Core ISimpleContainer cont = item as ISimpleContainer; Rectangle r = StandardPrinter.RenderContainer(cont,Evaluator,currentPosition,rpea); - currentPosition = ConvertRectangleToCurentPosition (r); + currentPosition = PrintHelper.ConvertRectangleToCurentPosition (r); item.Location = saveLocation; currentPosition = new Point(item.Location.X, section.SectionOffset + section.Size.Height); rpea.LocationAfterDraw = new Point (rpea.LocationAfterDraw.X,section.SectionOffset + section.Size.Height); - + } if ((section.CanGrow == false)&& (section.CanShrink == false)) { @@ -219,9 +218,6 @@ namespace ICSharpCode.Reports.Core - - - #region Properties protected IDataManager DataManager diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/AbstractRenderer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/AbstractRenderer.cs index 966c55782b..a9144f665e 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/AbstractRenderer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/AbstractRenderer.cs @@ -234,7 +234,7 @@ namespace ICSharpCode.Reports.Core Rectangle r = StandardPrinter.RenderPlainCollection (this.CurrentSection,this.CurrentSection.Items,Evaluator,new Point(this.CurrentSection.Location.X, this.CurrentSection.SectionOffset),rpea); - currentPosition = ConvertRectangleToCurentPosition(r); + currentPosition = PrintHelper.ConvertRectangleToCurentPosition(r); if ((this.CurrentSection.CanGrow == false)&& (this.CurrentSection.CanShrink == false)) { // return new Point(this.CurrentSection.Location.X, @@ -246,33 +246,8 @@ namespace ICSharpCode.Reports.Core return currentPosition; } - /* - protected static Rectangle RenderPlainCollection (BaseReportItem parent,ReportItemCollection items,IExpressionEvaluatorFacade evaluator, Point offset,ReportPageEventArgs rpea) - { - Rectangle retVal = Rectangle.Empty; - Size size = Size.Empty; - - if (items.Count > 0) { - foreach (BaseReportItem child in items) { - child.Parent = parent; - StandardPrinter.RenderLineItem (child,offset,evaluator,rpea); - } - - retVal = new Rectangle(offset,size); - return retVal; - - } else { - retVal = new Rectangle(offset.X,offset.Y,0,0); - return retVal; - } - } - */ - - protected Point ConvertRectangleToCurentPosition (Rectangle r) - { - return new Point(r.Left,r.Bottom); - } + diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/BasePager.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/BasePager.cs index 5ac2234b7b..909428fe14 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/BasePager.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/BasePager.cs @@ -26,7 +26,6 @@ namespace ICSharpCode.Reports.Core.old_Exporter private Graphics graphics; private bool pageFull; private readonly object pageLock = new object(); -// private IExportItemsConverter exportItemsConverter; private ILayouter layouter; public event EventHandler PageCreated; @@ -45,7 +44,6 @@ namespace ICSharpCode.Reports.Core.old_Exporter this.reportModel = reportModel; this.layouter = layouter; this.graphics = CreateGraphicObject.FromSize(this.reportModel.ReportSettings.PageSize); -// this.exportItemsConverter = new ExportItemsConverter(); } #endregion @@ -112,6 +110,7 @@ namespace ICSharpCode.Reports.Core.old_Exporter foreach (BaseReportItem item in section.Items) { ISimpleContainer container = item as ISimpleContainer; + if (container != null) { ExportContainer exportContainer = StandardPrinter.ConvertToContainer(section,container,offset); @@ -119,13 +118,12 @@ namespace ICSharpCode.Reports.Core.old_Exporter StandardPrinter.AdjustBackColor (container); ExporterCollection clist = StandardPrinter.ConvertPlainCollection(item,container.Items,offset); + exportContainer.Items.AddRange(clist); list.Add(exportContainer); } else { -// this.exportItemsConverter.ParentRectangle = new Rectangle (section.Location,section.Size); - Rectangle desiredRectangle = layouter.Layout(this.graphics,section); Rectangle sectionRectangle = new Rectangle(0,0,section.Size.Width,section.Size.Height); @@ -308,12 +306,6 @@ namespace ICSharpCode.Reports.Core.old_Exporter } -// protected IExportItemsConverter ExportItemsConverter -// { -// get { return exportItemsConverter; } -// set { exportItemsConverter = value; } -// } - #endregion } } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Converters/BaseConverter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Converters/BaseConverter.cs index 34cad6cd13..f78e33c518 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Converters/BaseConverter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Converters/BaseConverter.cs @@ -27,7 +27,6 @@ namespace ICSharpCode.Reports.Core.old_Exporter private ExporterPage singlePage; private SectionBounds sectionBounds; private Rectangle parentRectangle; -// private IExportItemsConverter exportItemsConverter; private ILayouter layouter; private Size saveSize; private IExpressionEvaluatorFacade evaluator; @@ -36,9 +35,7 @@ namespace ICSharpCode.Reports.Core.old_Exporter public event EventHandler SectionRendering; -// public BaseConverter(IDataNavigator dataNavigator,ExporterPage singlePage, -// IExportItemsConverter exportItemsConverter,ILayouter layouter) - + public BaseConverter(IDataNavigator dataNavigator,ExporterPage singlePage, ILayouter layouter) { @@ -48,16 +45,13 @@ namespace ICSharpCode.Reports.Core.old_Exporter if (singlePage == null) { throw new ArgumentNullException("singlePage"); } -// if (exportItemsConverter == null) { -// throw new ArgumentNullException("exportItemsConverter"); -// } + if (layouter == null) { throw new ArgumentNullException("layouter"); } this.singlePage = singlePage; this.dataNavigator = dataNavigator; this.sectionBounds = this.singlePage.SectionBounds; -// this.exportItemsConverter = exportItemsConverter; this.layouter = layouter; this.evaluator = PrintHelper.SetupEvaluator(this.singlePage,this.dataNavigator); } @@ -80,7 +74,7 @@ namespace ICSharpCode.Reports.Core.old_Exporter - protected ExporterCollection ConvertItems (ISimpleContainer row,Point offset) + protected static ExporterCollection ConvertItems (ISimpleContainer row,Point offset) { IExportColumnBuilder exportLineBuilder = row as IExportColumnBuilder; @@ -90,8 +84,7 @@ namespace ICSharpCode.Reports.Core.old_Exporter ExportContainer lineItem = StandardPrinter.ConvertToContainer(row.Parent,row,offset); BaseReportItem baseReportItem = row as BaseReportItem; - -// this.exportItemsConverter.ParentRectangle = new Rectangle(baseReportItem.Location,baseReportItem.Size); + StandardPrinter.AdjustBackColor(row); ExporterCollection list = StandardPrinter.ConvertPlainCollection(row as BaseReportItem,row.Items,offset); @@ -181,7 +174,7 @@ namespace ICSharpCode.Reports.Core.old_Exporter protected Point BaseConvert(ExporterCollection myList,ISimpleContainer container,int leftPos,Point curPos) { - ExporterCollection ml = this.ConvertItems (container, curPos); + ExporterCollection ml = BaseConverter.ConvertItems (container, curPos); myList.AddRange(ml); return new Point (leftPos,curPos.Y + container.Size.Height + (3 *GlobalValues.GapBetweenContainer)); } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/DataPageBuilder.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/DataPageBuilder.cs index a244fe4606..d940db1433 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/DataPageBuilder.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/DataPageBuilder.cs @@ -99,7 +99,6 @@ namespace ICSharpCode.Reports.Core.old_Exporter { base.ReportModel.PageHeader.SectionOffset = base.AdjustPageHeader(); ExporterCollection convertedList = base.ConvertSection (base.ReportModel.PageHeader,this.dataNavigator.CurrentRow); -// PrintHelper.ShowLocations(convertedList); base.SectionBounds.MeasurePageHeader(base.ReportModel.PageHeader); base.SinglePage.Items.AddRange(convertedList); } @@ -125,16 +124,9 @@ namespace ICSharpCode.Reports.Core.old_Exporter { ExporterCollection convertedList = new ExporterCollection(); - - - foreach (BaseReportItem item in section.Items) { -// IBaseConverter baseConverter = ConverterFactory.CreateConverter(item,dataNavigator, -// this.SinglePage,this.ExportItemsConverter, -// base.Layouter); - - IBaseConverter baseConverter = ConverterFactory.CreateConverter(item,dataNavigator, + IBaseConverter baseConverter = ConverterFactory.CreateConverter(item,dataNavigator, this.SinglePage, base.Layouter); @@ -146,13 +138,14 @@ namespace ICSharpCode.Reports.Core.old_Exporter baseConverter.PageFull += new EventHandler(OnPageFull); convertedList = baseConverter.Convert(section,item); - + base.SinglePage.Items.AddRange(convertedList); SetPageFull(); } } } + void OnSectionRendering (object sender,SectionRenderEventArgs e) { base.FireSectionRenderEvent(e.Section,e.RowNumber);