Browse Source

DataPageBuilder.cs

reports
Peter Forstmeier 13 years ago
parent
commit
ae4d494a28
  1. 8
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Arrange/ArrangeStrategy.cs
  2. 2
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/WpfExporter.cs
  3. 18
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/DataPageBuilder.cs

8
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Arrange/ArrangeStrategy.cs

@ -26,10 +26,6 @@ namespace ICSharpCode.Reporting.Arrange
internal class ContainerArrangeStrategy:IArrangeStrategy internal class ContainerArrangeStrategy:IArrangeStrategy
{ {
public ContainerArrangeStrategy()
{
}
public void Arrange(IExportColumn exportColumn){ public void Arrange(IExportColumn exportColumn){
if (exportColumn == null) if (exportColumn == null)
@ -42,7 +38,6 @@ namespace ICSharpCode.Reporting.Arrange
if (resizeable.Any()) { if (resizeable.Any()) {
//minimun Location //minimun Location
// var minLocation = (from p in container.ExportedItems orderby p.Location.Y select p).First();
var maxLocation = (from p in container.ExportedItems orderby p.Location.Y select p).Last(); var maxLocation = (from p in container.ExportedItems orderby p.Location.Y select p).Last();
// maximum Size // maximum Size
var maxBottom = (from p in container.ExportedItems orderby p.DisplayRectangle.Bottom select p).Last(); var maxBottom = (from p in container.ExportedItems orderby p.DisplayRectangle.Bottom select p).Last();
@ -54,7 +49,7 @@ namespace ICSharpCode.Reporting.Arrange
} }
} }
/*
public void old_Arrange(IExportColumn exportColumn) public void old_Arrange(IExportColumn exportColumn)
{ {
if (exportColumn == null) if (exportColumn == null)
@ -95,6 +90,7 @@ namespace ICSharpCode.Reporting.Arrange
} }
public Rectangle BiggestRectangle {get; private set;} public Rectangle BiggestRectangle {get; private set;}
*/
} }
} }

2
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/WpfExporter.cs

@ -61,7 +61,7 @@ namespace ICSharpCode.Reporting.Exporter
if (exportContainer != null) { if (exportContainer != null) {
if (exportContainer.Name =="ReportDetail") { if (exportContainer.Name =="ReportDetail") {
// Console.WriteLine("Section {0}",item.Name); Console.WriteLine("Section {0}",item.Name);
exportContainer.BackColor = System.Drawing.Color.LightBlue; exportContainer.BackColor = System.Drawing.Color.LightBlue;
} }

18
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/DataPageBuilder.cs

@ -37,7 +37,7 @@ namespace ICSharpCode.Reporting.PageBuilder
{ {
base.BuildExportList(); base.BuildExportList();
BuildDetail(); BuildDetail();
// row_BuildDetail(); base.BuildReportFooter();
base.AddPage(CurrentPage); base.AddPage(CurrentPage);
var er = new ExpressionRunner(Pages); var er = new ExpressionRunner(Pages);
er.Run(); er.Run();
@ -60,9 +60,10 @@ namespace ICSharpCode.Reporting.PageBuilder
CurrentLocation = DetailStart; CurrentLocation = DetailStart;
detail = CreateContainerForSection(DetailStart); detail = CreateContainerForSection(DetailStart);
detail.DesiredSize = new Size(detail.Size.Width,DetailEnds.Y - DetailStart.Y); // detail.DesiredSize = new Size(detail.Size.Width,DetailEnds.Y - DetailStart.Y);
detail.Parent = CurrentPage; detail.Parent = CurrentPage;
do { do {
collectionSource.Fill(CurrentSection.Items); collectionSource.Fill(CurrentSection.Items);
var convertedItems = converter.CreateConvertedList(ReportModel.DetailSection.Items,position); var convertedItems = converter.CreateConvertedList(ReportModel.DetailSection.Items,position);
@ -82,25 +83,24 @@ namespace ICSharpCode.Reporting.PageBuilder
} else { } else {
detail.ExportedItems.AddRange(convertedItems); detail.ExportedItems.AddRange(convertedItems);
MeasureAndArrangeContainer(detail); MeasureAndArrangeContainer(detail);
position = new Point(CurrentSection.Location.Y,position.Y + CurrentSection.Size.Height); // position = new Point(CurrentSection.Location.Y,position.Y + CurrentSection.Size.Height + 5);
position = new Point(CurrentSection.Location.X,position.Y + detail.DesiredSize.Height + 5);
} }
} }
while (collectionSource.MoveNext()); while (collectionSource.MoveNext());
InsertDetailAtPosition(detail); InsertDetailAtPosition(detail);
base.BuildReportFooter();
} else { } else {
detail = CreateContainerForSection(DetailStart); detail = CreateContainerForSection(DetailStart);
InsertDetailAtPosition(detail); InsertDetailAtPosition(detail);
base.BuildReportFooter();
} }
} }
/* /*
void row_BuildDetail() void row_BuildDetail()
{ {
var converter = new ContainerConverter(base.Graphics, CurrentLocation); var converter = new ContainerConverter(base.Graphics, CurrentLocation);
@ -142,8 +142,8 @@ namespace ICSharpCode.Reporting.PageBuilder
base.BuildReportFooter(); base.BuildReportFooter();
} }
} }
*/
*/
/* /*
IExportContainer CreateAndArrangeContainer(ContainerConverter converter, Point position,IExportContainer parent) IExportContainer CreateAndArrangeContainer(ContainerConverter converter, Point position,IExportContainer parent)
{ {

Loading…
Cancel
Save