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