diff --git a/src/AddIns/Analysis/CodeQuality/Reporting/DependencyReport.srd b/src/AddIns/Analysis/CodeQuality/Reporting/DependencyReport.srd index 5de0373e1a..7433221fd5 100644 --- a/src/AddIns/Analysis/CodeQuality/Reporting/DependencyReport.srd +++ b/src/AddIns/Analysis/CodeQuality/Reporting/DependencyReport.srd @@ -244,7 +244,7 @@ 31, 5 - 555, 20 + 365, 20 White Segoe UI, 9.75pt None @@ -259,8 +259,8 @@ BaseTextItem2147483641 - 624, 5 - 100, 20 + 526, 5 + 198, 20 White Microsoft Sans Serif, 10pt None diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/BasePageBuilder.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/BasePageBuilder.cs index f8bc20d6d9..dc0085696d 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/BasePageBuilder.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/BasePageBuilder.cs @@ -71,12 +71,17 @@ namespace ICSharpCode.Reporting.PageBuilder } - void BuildPageFooter() - { + void BuildPageFooter(){ CurrentLocation = new Point(ReportModel.ReportSettings.LeftMargin, ReportModel.ReportSettings.PageSize.Height - ReportModel.ReportSettings.BottomMargin - ReportModel.PageFooter.Size.Height); - var pageFooter = CreateSection(ReportModel.PageFooter,CurrentLocation); + + var pageFooter = CreateSection(ReportModel.PageFooter,CurrentLocation); + + Console.WriteLine("pagefooter at {0} ehight {1}",CurrentLocation, pageFooter.Size); + + pageFooter.BackColor = System.Drawing.Color.LightGray; + DetailEnds = new Point(pageFooter.Location.X + pageFooter.Size.Width,pageFooter.Location.Y -1); AddSectionToPage(pageFooter); } @@ -92,16 +97,22 @@ namespace ICSharpCode.Reporting.PageBuilder protected void BuildReportFooter() { var lastSection = CurrentPage.ExportedItems.Last(); - CurrentLocation = new Point(ReportModel.ReportSettings.LeftMargin, - lastSection.Location.Y - lastSection.Size.Height - 1); - +// CurrentLocation = new Point(ReportModel.ReportSettings.LeftMargin, +// lastSection.Location.Y - lastSection.Size.Height - 1); +// +CurrentLocation = new Point(ReportModel.ReportSettings.LeftMargin, + lastSection.Location.Y - ReportModel.ReportFooter.Size.Height - 2); var reportFooter = CreateSection(ReportModel.ReportFooter,CurrentLocation); - AddSectionToPage(reportFooter); + reportFooter.BackColor = Color.Red; + Console.WriteLine("reportfooter {0} - {1} ",reportFooter.Location,reportFooter.Size); +// if (reportFooter.ExportedItems.Any()) { + AddSectionToPage(reportFooter); +// } } protected void WriteStandardSections() { - this.BuildReportHeader(); + BuildReportHeader(); BuildPageHeader(); BuildPageFooter(); } diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Wpf/Visitor/FixedDocumentCreator.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Wpf/Visitor/FixedDocumentCreator.cs index 616bd6d492..743549ca3d 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Wpf/Visitor/FixedDocumentCreator.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Wpf/Visitor/FixedDocumentCreator.cs @@ -45,7 +45,7 @@ namespace ICSharpCode.Reporting.WpfReportViewer.Visitor var fixedPage = new FixedPage(); fixedPage.Width = exportPage.Size.ToWpf().Width; fixedPage.Height = exportPage.Size.ToWpf().Height; - fixedPage.Background = new SolidColorBrush(System.Drawing.Color.Blue.ToWpf()); + fixedPage.Background = new SolidColorBrush(System.Drawing.Color.White.ToWpf()); return fixedPage; } diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Wpf/Visitor/WpfVisitor.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Wpf/Visitor/WpfVisitor.cs index 88912881f5..252b728591 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Wpf/Visitor/WpfVisitor.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Wpf/Visitor/WpfVisitor.cs @@ -65,11 +65,9 @@ namespace ICSharpCode.Reporting.WpfReportViewer.Visitor foreach (var element in exportedItems) { var container = element as ExportContainer; if (container != null) { -// Console.WriteLine("recursive"); var containerCanvas = FixedDocumentCreator.CreateContainer(container); CanvasHelper.SetPosition(containerCanvas,new Point(container.Location.X,container.Location.Y)); myCanvas.Children.Add(containerCanvas); -// Console.WriteLine("call recursive"); PerformList(containerCanvas,container.ExportedItems); } else { var acceptor = element as IAcceptor; @@ -97,8 +95,8 @@ namespace ICSharpCode.Reporting.WpfReportViewer.Visitor new Point(exportGraphics.Location.X, exportGraphics.Location.Y), new Point(exportGraphics.Location.X + exportGraphics.Size.Width,exportGraphics.Location.Y)); } - DrawingElement m = new DrawingElement(visual); - UIElement = m; + var dragingElement = new DrawingElement(visual); + UIElement = dragingElement; }