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 7e30732e3d..7f66483556 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 @@ -312,9 +312,7 @@ - - Component diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardFormatter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardFormatter.cs index 32308dec5b..98f9865cca 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardFormatter.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardFormatter.cs @@ -115,8 +115,7 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing str = dec.ToString (format,CultureInfo.CurrentCulture); } catch (System.FormatException e) { -// string s = String.Format(CultureInfo.InvariantCulture,"\tDecimalValue < {0} > {1}",toFormat,e.Message); - + throw e; } return str; } else { @@ -135,7 +134,7 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing DateTimeFormatInfo.CurrentInfo); return str.Trim(); - } catch (System.FormatException) { + } catch (System.FormatException ) { // string s = String.Format("< {0} > {1}",toFormat,e.Message); // System.Console.WriteLine("\t\tDateValue {0}",s); } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseSection.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseSection.cs index 634cba5e19..e1df3e27d9 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseSection.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseSection.cs @@ -117,7 +117,7 @@ namespace ICSharpCode.Reports.Core public int SectionMargin {get;set;} - public virtual int SectionOffset {get;set;} +// public virtual int SectionOffset {get;set;} public ReportItemCollection Items diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/RenderDataReport.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/RenderDataReport.cs index c670e29245..27b789016f 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/RenderDataReport.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/RenderDataReport.cs @@ -159,12 +159,6 @@ namespace ICSharpCode.Reports.Core { ITableContainer tableContainer = base.CurrentSection.Items[0] as ITableContainer; - IBaseRenderer r = PrintRendererFactory.CreateRenderer(base.CurrentSection.Items[0],nav,base.SinglePage,base.Layout,CurrentSection); - if ( r != null) { -// r.Render(tableContainer,rpea,Evaluator); - } - - // branch to render table's etc if (tableContainer != null) { diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/RenderTable.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/RenderTable.cs deleted file mode 100644 index 55b4916535..0000000000 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/RenderTable.cs +++ /dev/null @@ -1,157 +0,0 @@ -/* - * Created by SharpDevelop. - * User: Peter Forstmeier - * Date: 10.10.2010 - * Time: 17:37 - * - * To change this template use Tools | Options | Coding | Edit Standard Headers. - */ -using System; -using System.Drawing; -using ICSharpCode.Reports.Core.BaseClasses.Printing; -using ICSharpCode.Reports.Core.Globals; -using ICSharpCode.Reports.Core.Interfaces; -using ICSharpCode.Reports.Expressions.ReportingLanguage; - -namespace ICSharpCode.Reports.Core -{ - /// - /// Description of RenderTable. - /// - public class RenderTable:IBaseRenderer - { - - IDataNavigator dataNavigator; - Rectangle parentRectangle; - ISinglePage singlePage; - ILayouter layouter; - ReportPageEventArgs reportPageEventArgs; - BaseSection currentSection; - - public RenderTable(IDataNavigator datanavigator,Rectangle parentRectangle,ISinglePage singlePage,ILayouter layouter,BaseSection section) - { - this.dataNavigator = datanavigator; - - this.parentRectangle = parentRectangle; - this.singlePage = singlePage; - this.layouter = layouter; - this.currentSection = section; - - } - - - public event EventHandler PageFull; - - public event EventHandler SectionRendering; - - - public void Render (ISimpleContainer table,ReportPageEventArgs rpea,IExpressionEvaluatorFacade evaluator) - { - if (this.dataNavigator.CurrentRow < 0 ) { - this.dataNavigator.MoveNext(); - } - this.reportPageEventArgs = rpea; - Point saveLocation = table.Location; - Rectangle pageBreakRect = Rectangle.Empty; - - Point currentPosition = new Point(PrintHelper.DrawingAreaRelativeToParent(this.currentSection,table).Location.X, - this.currentSection.Location.Y); - table.Items.SortByLocation(); - - Size rs = Size.Empty; - - -// ISimpleContainer headerRow = null; - - var simpleContainer = table.Items[0] as ISimpleContainer; - -// foreach (BaseRowItem row in table.Items) -// { - rs = simpleContainer.Size; - PrintHelper.AdjustParent(table,table.Items); - -// if (PrintHelper.IsTextOnlyRow(simpleContainer) ) -// { - - LayoutHelper.SetLayoutForRow(ReportPageEventArgs.PrintPageEventArgs.Graphics,Layouter,simpleContainer); - - var r = StandardPrinter.RenderContainer(simpleContainer,evaluator,currentPosition,ReportPageEventArgs); - - currentPosition = PrintHelper.ConvertRectangleToCurentPosition (r); - - table.Location = saveLocation; -// } -// else { - //--------------- - simpleContainer = table.Items[1] as ISimpleContainer; - - int adjust = simpleContainer.Location.Y - saveLocation.Y; - simpleContainer.Location = new Point(simpleContainer.Location.X,simpleContainer.Location.Y - adjust - 3 * GlobalValues.GapBetweenContainer); - rs = simpleContainer.Size; - - do { - - pageBreakRect = PrintHelper.CalculatePageBreakRectangle((BaseReportItem)table,currentPosition); - - if (PrintHelper.IsPageFull(pageBreakRect,this.SectionBounds)) { - table.Location = saveLocation; - AbstractRenderer.PageBreak(ReportPageEventArgs); - return; - } - - this.dataNavigator.Fill(simpleContainer.Items); - - LayoutHelper.SetLayoutForRow(ReportPageEventArgs.PrintPageEventArgs.Graphics,Layouter,simpleContainer); - - r = StandardPrinter.RenderContainer(simpleContainer,evaluator,currentPosition,ReportPageEventArgs); - - currentPosition = PrintHelper.ConvertRectangleToCurentPosition (r); - - simpleContainer.Size = rs; - } - while (this.dataNavigator.MoveNext()); - //----- -// } - } - - - public ICSharpCode.Reports.Core.BaseClasses.SectionBounds SectionBounds { - get { - return this.singlePage.SectionBounds; - } - } - - public IDataNavigator DataNavigator { - get { - return this.dataNavigator; - } - } - - public System.Drawing.Rectangle ParentRectangle { - get { - return this.parentRectangle; - } - } - - public ISinglePage SinglePage { - get { - return this.singlePage; - } - } - - public ILayouter Layouter { - get { - return this.layouter; - } - } - - public System.Drawing.Graphics Graphics {get;set;} - - - public ReportPageEventArgs ReportPageEventArgs { - get { return reportPageEventArgs; } - set { reportPageEventArgs = value; } - } - - } -} diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/RendererFactory.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/RendererFactory.cs deleted file mode 100644 index 0178c7fffe..0000000000 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/RendererFactory.cs +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Created by SharpDevelop. - * User: Peter Forstmeier - * Date: 10.10.2010 - * Time: 17:28 - * - * To change this template use Tools | Options | Coding | Edit Standard Headers. - */ -using System; -using System.Drawing; -using ICSharpCode.Reports.Core.Interfaces; - -namespace ICSharpCode.Reports.Core -{ - /// - /// Description of RendererFactory. - /// - public static class PrintRendererFactory - { - - public static IBaseRenderer CreateRenderer (BaseReportItem itemToConvert,IDataNavigator dataNavigator, - ISinglePage singlePage,ILayouter layouter,BaseSection section) - { - - Type t = itemToConvert.GetType(); - if (t.Equals(typeof(BaseTableItem))) { - return new RenderTable(dataNavigator,Rectangle.Empty,singlePage,layouter,section); - } - - if (t.Equals(typeof(BaseRowItem))) { -// return new GroupedRowConverter (dataNavigator,singlePage,layouter); -// Console.WriteLine("render Row"); - } - return null; - } - } -}