Browse Source

remove unused code

pull/15/head^2
peterforstmeier 14 years ago
parent
commit
be7fa185fc
  1. 10
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/SectionBounds.cs
  2. 11
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/SinglePage.cs
  3. 2
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs
  4. 10
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedRowConverter.cs
  5. 14
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/DataPageBuilder.cs
  6. 3
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/FormPageBuilder.cs

10
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/SectionBounds.cs

@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
using System;
using System.Drawing;
using ICSharpCode.Reports.Core.Globals;
using ICSharpCode.Reports.Core.Interfaces;
namespace ICSharpCode.Reports.Core.BaseClasses
{
@ -65,6 +66,15 @@ namespace ICSharpCode.Reports.Core.BaseClasses @@ -65,6 +66,15 @@ namespace ICSharpCode.Reports.Core.BaseClasses
#region Measurement
public void CalculatePageBounds (IReportModel reportModel)
{
MeasureReportHeader(reportModel.ReportHeader);
MeasurePageHeader(reportModel.PageHeader);
MeasurePageFooter(reportModel.PageFooter);
MeasureReportFooter(reportModel.ReportFooter);
}
public void MeasureReportHeader (BaseSection section)
{
if (section == null) {

11
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/SinglePage.cs

@ -36,19 +36,10 @@ namespace ICSharpCode.Reports.Core.BaseClasses @@ -36,19 +36,10 @@ namespace ICSharpCode.Reports.Core.BaseClasses
throw new ArgumentNullException("reportModel");
}
sectionBounds.MeasureReportHeader(reportModel.ReportHeader);
this.sectionBounds.MeasurePageHeader(reportModel.PageHeader);
this.sectionBounds.MeasurePageFooter(reportModel.PageFooter);
this.sectionBounds.MeasureReportFooter(reportModel.ReportFooter);
//this.sectionBounds.MeasureDetailArea();
sectionBounds.CalculatePageBounds(reportModel);
this.sectionBounds.DetailSectionRectangle = new System.Drawing.Rectangle(reportModel.DetailSection.Location.X,sectionBounds.DetailArea.Top,
reportModel.DetailSection.Size.Width,
reportModel.DetailSection.Size.Height);
}

2
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs

@ -39,6 +39,7 @@ namespace ICSharpCode.Reports.Core.Exporter @@ -39,6 +39,7 @@ namespace ICSharpCode.Reports.Core.Exporter
if (!ServiceContainer.Contains(typeof(ILayouter))) {
ServiceContainer.AddService<ILayouter>(new Layouter());
}
this.Graphics = CreateGraphicObject.FromSize(this.ReportModel.ReportSettings.PageSize);
}
@ -56,6 +57,7 @@ namespace ICSharpCode.Reports.Core.Exporter @@ -56,6 +57,7 @@ namespace ICSharpCode.Reports.Core.Exporter
} else {
firstPage = false;
}
SectionBounds sectionBounds = new SectionBounds (this.ReportModel.ReportSettings,firstPage);
ExporterPage sp = ExporterPage.CreateInstance(sectionBounds,this.pages.Count + 1);
return sp;

10
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedRowConverter.cs

@ -157,21 +157,13 @@ namespace ICSharpCode.Reports.Core.Exporter @@ -157,21 +157,13 @@ namespace ICSharpCode.Reports.Core.Exporter
{
base.ForcePageBreak(exporterCollection,section);
return CalculateStartPosition(section);
}
private Point CalculateStartPosition(BaseSection section)
{
// Console.WriteLine ("CalculateStartPosition {0}", base.SectionBounds.DetailStart);
var r = base.ReportModel;
base.SectionBounds.MeasureReportHeader(r.ReportHeader);
base.SectionBounds.MeasurePageHeader(r.PageHeader);
// Console.WriteLine("\treportheader {0}",base.SectionBounds.ReportHeaderRectangle);
// Console.WriteLine("\tpageheader {0}",base.SectionBounds.PageHeaderRectangle);
// Console.WriteLine("\tdetail {0}",base.SectionBounds.DetailArea);
// Console.WriteLine("\tret value {0}",base.SectionBounds.PageHeaderRectangle.Bottom );
base.SectionBounds.CalculatePageBounds(r);
return new Point(base.SectionBounds.DetailArea.X,base.SectionBounds.PageHeaderRectangle.Bottom + 1);
}

14
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/DataPageBuilder.cs

@ -72,19 +72,19 @@ namespace ICSharpCode.Reports.Core.Exporter @@ -72,19 +72,19 @@ namespace ICSharpCode.Reports.Core.Exporter
{
base.ReportModel.ReportHeader.Size = Size.Empty;
}
base.SectionBounds.MeasurePageHeader(base.ReportModel.ReportHeader);
base.SectionBounds.CalculatePageBounds(base.ReportModel);
}
protected override void BuildPageHeader ()
{
// base.DebugShowSections();
base.SectionBounds.MeasurePageHeader(base.ReportModel.ReportHeader);
base.SectionBounds.MeasurePageHeader(base.ReportModel.PageHeader);
base.SectionBounds.CalculatePageBounds(base.ReportModel);
// Console.WriteLine("----------------");
ConvertSectionInternal (base.ReportModel.PageHeader);
base.ReportModel.PageHeader.Size = new Size(base.ReportModel.PageHeader.Size.Width,base.Offset.Y - base.ReportModel.PageHeader.SectionOffset);
base.SectionBounds.MeasurePageHeader(base.ReportModel.PageHeader);
base.SectionBounds.CalculatePageBounds(base.ReportModel);
// base.DebugShowSections();
}
@ -135,8 +135,6 @@ namespace ICSharpCode.Reports.Core.Exporter @@ -135,8 +135,6 @@ namespace ICSharpCode.Reports.Core.Exporter
protected Point BuildDetail (BaseSection section,IDataNavigator dataNavigator)
{
// Console.WriteLine ("detail at {0}",SectionBounds.DetailArea);
// Console.WriteLine ("detail start at {0}",SectionBounds.DetailStart);
ExporterCollection convertedList = new ExporterCollection();
foreach (BaseReportItem item in section.Items)
{
@ -197,9 +195,9 @@ namespace ICSharpCode.Reports.Core.Exporter @@ -197,9 +195,9 @@ namespace ICSharpCode.Reports.Core.Exporter
BaseSection section = base.ReportModel.DetailSection;
section.SectionOffset = base.SinglePage.SectionBounds.DetailArea.Top;
var p = this.BuildDetail (section,dataNavigator);
var currentLocation = this.BuildDetail (section,dataNavigator);
var r = new Rectangle (SectionBounds.ReportFooterRectangle.Left,p.Y,
var r = new Rectangle (SectionBounds.ReportFooterRectangle.Left,currentLocation.Y,
SectionBounds.ReportFooterRectangle.Size.Width,
SectionBounds.ReportFooterRectangle.Size.Height);
this.BuildReportFooter(r);

3
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/FormPageBuilder.cs

@ -56,7 +56,8 @@ namespace ICSharpCode.Reports.Core.Exporter @@ -56,7 +56,8 @@ namespace ICSharpCode.Reports.Core.Exporter
this.ReportModel.PageHeader.SectionOffset = base.SinglePage.SectionBounds.PageHeaderRectangle.Top;
ExporterCollection convertedList = base.ConvertSection (base.ReportModel.PageHeader,0);
base.SinglePage.Items.AddRange(convertedList);
base.SectionBounds.MeasurePageHeader(base.ReportModel.PageHeader);
base.SectionBounds.CalculatePageBounds(base.ReportModel);
// base.SectionBounds.MeasurePageHeader(base.ReportModel.PageHeader);
}
protected override void BuildDetailInternal(BaseSection section)

Loading…
Cancel
Save