Browse Source

Cleanup

reports
Peter Forstmeier 12 years ago
parent
commit
e34c8f4baa
  1. 1
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/WpfVisitor.cs
  2. 6
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Pdf/PdfExporter.cs
  3. 10
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Pdf/PdfHelper.cs
  4. 6
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Pdf/PdfVisitor.cs

1
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/WpfVisitor.cs

@ -37,6 +37,7 @@ namespace ICSharpCode.Reporting.Exporter.Visitors
base.Visit(page); base.Visit(page);
} }
public override void Visit(ExportContainer exportContainer){ public override void Visit(ExportContainer exportContainer){
currentCanvas = documentCreator.CreateContainer(exportContainer); currentCanvas = documentCreator.CreateContainer(exportContainer);
CanvasHelper.SetPosition(currentCanvas,new Point(exportContainer.Location.X,exportContainer.Location.Y)); CanvasHelper.SetPosition(currentCanvas,new Point(exportContainer.Location.X,exportContainer.Location.Y));

6
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Pdf/PdfExporter.cs

@ -4,11 +4,10 @@ using System;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using System.Diagnostics; using System.Diagnostics;
using PdfSharp.Pdf;
using ICSharpCode.Reporting.Exporter; using ICSharpCode.Reporting.Exporter;
using ICSharpCode.Reporting.Exporter.Visitors; using ICSharpCode.Reporting.Exporter.Visitors;
using ICSharpCode.Reporting.PageBuilder.ExportColumns; using ICSharpCode.Reporting.PageBuilder.ExportColumns;
using PdfSharp.Drawing;
using PdfSharp.Pdf;
namespace ICSharpCode.Reporting.Pdf namespace ICSharpCode.Reporting.Pdf
{ {
@ -35,7 +34,7 @@ namespace ICSharpCode.Reporting.Pdf
Console.WriteLine("Start PdfExporter with {0} Pages ",Pages.Count); Console.WriteLine("Start PdfExporter with {0} Pages ",Pages.Count);
foreach (var page in Pages) { foreach (var page in Pages) {
IAcceptor acceptor = page as IAcceptor; var acceptor = page as IAcceptor;
if (acceptor != null) { if (acceptor != null) {
visitor.Visit(page); visitor.Visit(page);
} }
@ -57,7 +56,6 @@ namespace ICSharpCode.Reporting.Pdf
void SetDocumentTitle(string reportName) void SetDocumentTitle(string reportName)
{ {
Console.WriteLine("Set DocumentTitle to {0}",reportName);
pdfDocument.Info.Title = reportName; pdfDocument.Info.Title = reportName;
} }

10
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Pdf/PdfHelper.cs

@ -12,7 +12,7 @@ namespace ICSharpCode.Reporting.Pdf
/// <summary> /// <summary>
/// Description of PdfHelper. /// Description of PdfHelper.
/// </summary> /// </summary>
public class PdfHelper public static class PdfHelper
{ {
public static void WriteText(XTextFormatter textFormatter,Point columnLocation, ExportText exportColumn) public static void WriteText(XTextFormatter textFormatter,Point columnLocation, ExportText exportColumn)
@ -26,9 +26,7 @@ namespace ICSharpCode.Reporting.Pdf
static XFont CreatePdfFont(IExportColumn exportColumn) static XFont CreatePdfFont(IExportColumn exportColumn)
{ {
var textColumn = (ExportText)exportColumn; var textColumn = (ExportText)exportColumn;
XFont font = new XFont(textColumn.Font.FontFamily.Name, textColumn.Font.Size); return new XFont(textColumn.Font.FontFamily.Name, textColumn.Font.Size);
return font;
} }
@ -45,7 +43,7 @@ namespace ICSharpCode.Reporting.Pdf
public static void DrawRectangle (IExportColumn column, XGraphics graphics) { public static void DrawRectangle (IExportColumn column, XGraphics graphics) {
var c = XColor.FromArgb(column.FrameColor.R,column.FrameColor.G,column.FrameColor.B); var c = XColor.FromArgb(column.FrameColor.R,column.FrameColor.G,column.FrameColor.B);
XPen pen = new XPen(c, 1); var pen = new XPen(c, 1);
var r = CreateDisplayRectangle(column); var r = CreateDisplayRectangle(column);
graphics.DrawRectangle(pen,r); graphics.DrawRectangle(pen,r);
} }
@ -55,7 +53,7 @@ namespace ICSharpCode.Reporting.Pdf
public static void DrawRectangle(Rectangle rect,Color color,XGraphics graphics) { public static void DrawRectangle(Rectangle rect,Color color,XGraphics graphics) {
var c = XColor.FromArgb(color.R,color.G,color.B); var c = XColor.FromArgb(color.R,color.G,color.B);
XPen pen = new XPen(c, 1); var pen = new XPen(c, 1);
var r = CreateDisplayRectangle(rect.Location,rect.Size); var r = CreateDisplayRectangle(rect.Location,rect.Size);
graphics.DrawRectangle(pen,r); graphics.DrawRectangle(pen,r);
} }

6
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Pdf/PdfVisitor.cs

@ -2,12 +2,12 @@
// This code is distributed under the GNU LGPL (for details please see \doc\license.txt) // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
using System; using System;
using System.Drawing; using System.Drawing;
using ICSharpCode.Reporting.Exporter.Visitors;
using ICSharpCode.Reporting.Interfaces.Export;
using ICSharpCode.Reporting.PageBuilder.ExportColumns;
using PdfSharp.Drawing; using PdfSharp.Drawing;
using PdfSharp.Drawing.Layout; using PdfSharp.Drawing.Layout;
using PdfSharp.Pdf; using PdfSharp.Pdf;
using ICSharpCode.Reporting.Exporter.Visitors;
using ICSharpCode.Reporting.Interfaces.Export;
using ICSharpCode.Reporting.PageBuilder.ExportColumns;
namespace ICSharpCode.Reporting.Pdf namespace ICSharpCode.Reporting.Pdf
{ {

Loading…
Cancel
Save