From 7707e2c311cdf14b8e49e415e7e40ba4900e83eb Mon Sep 17 00:00:00 2001 From: Peter Forstmeier Date: Wed, 25 Aug 2010 18:23:14 +0000 Subject: [PATCH] Cleanup git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/reports@6445 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../ICSharpCode.Reports.Core.csproj | 5 +- .../{BaseGroupeRow.cs => BaseGroupedRow.cs} | 0 .../{IBaseDataItem.cs => IDataItem.cs} | 0 .../Converters/old_GroupedRowConverter.cs | 129 ------------------ 4 files changed, 2 insertions(+), 132 deletions(-) rename src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/{BaseGroupeRow.cs => BaseGroupedRow.cs} (100%) rename src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/{IBaseDataItem.cs => IDataItem.cs} (100%) delete mode 100644 src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/old_GroupedRowConverter.cs 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 fd0f62e4f3..b0baa54241 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 @@ -86,7 +86,7 @@ - + @@ -95,7 +95,7 @@ - + @@ -135,7 +135,6 @@ - diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseGroupeRow.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseGroupedRow.cs similarity index 100% rename from src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseGroupeRow.cs rename to src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseGroupedRow.cs diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/IBaseDataItem.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/IDataItem.cs similarity index 100% rename from src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/IBaseDataItem.cs rename to src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/IDataItem.cs diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/old_GroupedRowConverter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/old_GroupedRowConverter.cs deleted file mode 100644 index 8dc7a2a9bb..0000000000 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/old_GroupedRowConverter.cs +++ /dev/null @@ -1,129 +0,0 @@ -/* - * Erstellt mit SharpDevelop. - * Benutzer: Peter - * Datum: 02.01.2009 - * Zeit: 17:33 - * - * Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern. - */ -using System; -using System.Collections.Generic; -using System.Drawing; - -using ICSharpCode.Reports.Core.BaseClasses.Printing; -using ICSharpCode.Reports.Core.Interfaces; - -namespace ICSharpCode.Reports.Core.Exporter -{ - /// - /// Description of RowConverter. - /// - /// - - public class old_RowConverter:BaseConverter - { - - private BaseReportItem parent; - - public old_RowConverter(IDataNavigator dataNavigator, - ExporterPage singlePage, - - ILayouter layouter):base(dataNavigator,singlePage,layouter) - { - } - - public override ExporterCollection Convert(BaseReportItem parent, BaseReportItem item) - { - if (parent == null) { - throw new ArgumentNullException("parent"); - } - if (item == null) { - throw new ArgumentNullException("item"); - } - ISimpleContainer simpleContainer = item as ISimpleContainer; - this.parent = parent; - - simpleContainer.Parent = parent; - - PrintHelper.AdjustParent(parent,simpleContainer.Items); - if (PrintHelper.IsTextOnlyRow(simpleContainer)) { - ExporterCollection myList = new ExporterCollection(); - - BaseConverter.BaseConvert (myList,simpleContainer,parent.Location.X, - new Point(base.SectionBounds.DetailStart.X,base.SectionBounds.DetailStart.Y)); - - - return myList; - } else { - return this.ConvertDataRow(simpleContainer); - } - } - - private ExporterCollection ConvertDataRow (ISimpleContainer simpleContainer) - { - ExporterCollection mylist = new ExporterCollection(); - Point currentPosition = new Point(base.SectionBounds.DetailStart.X,base.SectionBounds.DetailStart.Y); - BaseSection section = parent as BaseSection; - - int defaultLeftPos = parent.Location.X; - - do { - Console.WriteLine ("haschild {0}",base.DataNavigator.HasChildren); - if (base.DataNavigator.HasChildren) { - ReadFromChilds(base.DataNavigator); - } - - section.Location = new Point(section.Location.X,section.SectionOffset ); - section.Size = this.SectionBounds.DetailSectionRectangle.Size; - base.SaveSize(section.Items[0].Size); - - base.FillRow(simpleContainer); - -// base.PrepareContainerForConverting(simpleContainer); -// -// base.FireSectionRendering(section); - - currentPosition = BaseConverter.BaseConvert(mylist,simpleContainer,defaultLeftPos,currentPosition); - - StandardPrinter.EvaluateRow(base.Evaluator,mylist); - - section.Items[0].Size = base.RestoreSize; - section.SectionOffset += section.Size.Height + 3 * GlobalValues.GapBetweenContainer; - - - if (PrintHelper.IsPageFull(new Rectangle(new Point (simpleContainer.Location.X,currentPosition.Y), section.Size),base.SectionBounds)) { - base.FirePageFull(mylist); - section.SectionOffset = base.SinglePage.SectionBounds.PageHeaderRectangle.Location.Y; - currentPosition = new Point(base.SectionBounds.PageHeaderRectangle.X,base.SectionBounds.PageHeaderRectangle.Y); - mylist.Clear(); - } - - if (section.DrawBorder == true) { - BaseRectangleItem br = BasePager.CreateDebugItem (section); - BaseExportColumn bec = br.CreateExportColumn(); - bec.StyleDecorator.Location = section.Location; - mylist.Insert(0,bec); - } - } - while (base.DataNavigator.MoveNext()); - - SectionBounds.ReportFooterRectangle = new Rectangle(SectionBounds.ReportFooterRectangle.Left, - section.Location.Y + section.Size.Height, - SectionBounds.ReportFooterRectangle.Width, - SectionBounds.ReportFooterRectangle.Height); - return mylist; - } - - - void ReadFromChilds (IDataNavigator nav) - { -// nav.SwitchGroup(); -// do { -// var o = nav.ReadChild() as System.Data.DataRow; -// string v = o.ItemArray[3].ToString(); -// Console.WriteLine("\t {0}",v); -// } -// while ( nav.ChildMoveNext()); - } - } -} \ No newline at end of file