Browse Source

DashStyle + LineCap in PdfVisitor.cs

reports
Peter Forstmeier 12 years ago
parent
commit
aeb2c48145
  1. 2
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/ICSharpCode.Reporting.csproj
  2. 4
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/AbstractVisitor.cs
  3. 2
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/DebugVisitor.cs
  4. 2
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/ExpressionVisitor.cs
  5. 2
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/FormatVisitor.cs
  6. 2
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/IVisitor.cs
  7. 2
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/WpfVisitor.cs
  8. 2
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Items/Graphics/BaseLineItem.cs
  9. 4
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/ExportColumns/ExportLine.cs
  10. 36
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Pdf/PdfHelper.cs
  11. 8
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Pdf/PdfVisitor.cs

2
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/ICSharpCode.Reporting.csproj

@ -163,7 +163,7 @@
<Compile Include="Src\PageBuilder\DataPageBuilder.cs" /> <Compile Include="Src\PageBuilder\DataPageBuilder.cs" />
<Compile Include="Src\PageBuilder\ExportColumns\ExportColumn.cs" /> <Compile Include="Src\PageBuilder\ExportColumns\ExportColumn.cs" />
<Compile Include="Src\PageBuilder\ExportColumns\ExportContainer.cs" /> <Compile Include="Src\PageBuilder\ExportColumns\ExportContainer.cs" />
<Compile Include="Src\PageBuilder\ExportColumns\ExportGraphics.cs" /> <Compile Include="Src\PageBuilder\ExportColumns\ExportLine.cs" />
<Compile Include="Src\PageBuilder\ExportColumns\ExportText.cs" /> <Compile Include="Src\PageBuilder\ExportColumns\ExportText.cs" />
<Compile Include="Src\PageBuilder\ExportColumns\ExportPage.cs" /> <Compile Include="Src\PageBuilder\ExportColumns\ExportPage.cs" />
<Compile Include="Src\PageBuilder\FormPageBuilder.cs" /> <Compile Include="Src\PageBuilder\FormPageBuilder.cs" />

4
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/AbstractVisitor.cs

@ -50,13 +50,11 @@ namespace ICSharpCode.Reporting.Exporter.Visitors
public virtual void Visit(ExportText exportColumn) public virtual void Visit(ExportText exportColumn)
{ {
throw new NotImplementedException();
} }
public virtual void Visit(ExportGraphics exportGraphics) public virtual void Visit(ExportLine exportGraphics)
{ {
throw new NotImplementedException();
} }

2
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/DebugVisitor.cs

@ -36,7 +36,7 @@ namespace ICSharpCode.Reporting.Exporter.Visitors
{ {
} }
public override void Visit(ExportGraphics exportGraphics) public override void Visit(ExportLine exportGraphics)
{ {
// base.Visit(exportGraphics); // base.Visit(exportGraphics);
Console.WriteLine("Line from {0} size {1}",exportGraphics.Location,exportGraphics.Size.Width); Console.WriteLine("Line from {0} size {1}",exportGraphics.Location,exportGraphics.Size.Width);

2
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/ExpressionVisitor.cs

@ -57,7 +57,7 @@ namespace ICSharpCode.Reporting.Exporter.Visitors
} }
} }
public override void Visit(ExportGraphics exportGraphics) public override void Visit(ExportLine exportGraphics)
{ {
// base.Visit(exportGraphics); // base.Visit(exportGraphics);
} }

2
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/FormatVisitor.cs

@ -20,5 +20,7 @@ namespace ICSharpCode.Reporting.Exporter.Visitors
StandardFormatter.FormatOutput(exportColumn); StandardFormatter.FormatOutput(exportColumn);
} }
} }
} }
} }

2
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/IVisitor.cs

@ -16,6 +16,6 @@ namespace ICSharpCode.Reporting.Exporter.Visitors
void Visit(ExportPage page); void Visit(ExportPage page);
void Visit(ExportContainer exportColumn); void Visit(ExportContainer exportColumn);
void Visit(ExportText exportColumn); void Visit(ExportText exportColumn);
void Visit(ExportGraphics exportGraphics); void Visit(ExportLine exportGraphics);
} }
} }

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

@ -81,7 +81,7 @@ namespace ICSharpCode.Reporting.Exporter.Visitors
} }
public override void Visit(ExportGraphics exportGraphics) public override void Visit(ExportLine exportGraphics)
{ {
// base.Visit(exportGraphics); // base.Visit(exportGraphics);
} }

2
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Items/Graphics/BaseLineItem.cs

@ -16,7 +16,7 @@ namespace ICSharpCode.Reporting.Items{
public override IExportColumn CreateExportColumn() public override IExportColumn CreateExportColumn()
{ {
var ex = new ExportGraphics(); var ex = new ExportLine();
ex.Location = Location; ex.Location = Location;
ex.ForeColor = ForeColor; ex.ForeColor = ForeColor;
ex.BackColor = BackColor; ex.BackColor = BackColor;

4
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/ExportColumns/ExportGraphics.cs → src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/ExportColumns/ExportLine.cs

@ -17,9 +17,9 @@ namespace ICSharpCode.Reporting.PageBuilder.ExportColumns
} }
public class ExportGraphics:ExportColumn,IExportGraphics,IAcceptor public class ExportLine:ExportColumn,IExportGraphics,IAcceptor
{ {
public ExportGraphics() public ExportLine()
{ {
} }

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

@ -5,6 +5,7 @@ using System.Drawing;
using ICSharpCode.Reporting.Interfaces.Export; using ICSharpCode.Reporting.Interfaces.Export;
using ICSharpCode.Reporting.PageBuilder.ExportColumns; using ICSharpCode.Reporting.PageBuilder.ExportColumns;
using PdfSharp.Drawing; using PdfSharp.Drawing;
using System.Drawing.Drawing2D;
using PdfSharp.Drawing.Layout; using PdfSharp.Drawing.Layout;
namespace ICSharpCode.Reporting.Pdf namespace ICSharpCode.Reporting.Pdf
@ -59,6 +60,41 @@ namespace ICSharpCode.Reporting.Pdf
} }
public static XLineCap LineCap (IExportGraphics column) {
return XLineCap.Round;
}
public static XDashStyle DashStyle (IExportGraphics column) {
XDashStyle style = XDashStyle.Solid;
switch (column.DashStyle) {
case System.Drawing.Drawing2D.DashStyle.Solid:
style = XDashStyle.Solid;
break;
case System.Drawing.Drawing2D.DashStyle.Dash:
style = XDashStyle.Dash;
break;
case System.Drawing.Drawing2D.DashStyle.Dot:
style = XDashStyle.Dot;
break;
case System.Drawing.Drawing2D.DashStyle.DashDot:
style = XDashStyle.DashDot;
break;
case System.Drawing.Drawing2D.DashStyle.DashDotDot:
style = XDashStyle.DashDotDot;
break;
case System.Drawing.Drawing2D.DashStyle.Custom:
break;
default:
throw new Exception("Invalid value for DashStyle");
}
return style;
}
public static Point LocationRelToParent (ExportColumn column) { public static Point LocationRelToParent (ExportColumn column) {
return new Point(column.Parent.Location.X + column.Location.X, return new Point(column.Parent.Location.X + column.Location.X,
column.Parent.Location.Y + column.Location.Y); column.Parent.Location.Y + column.Location.Y);

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

@ -66,12 +66,14 @@ namespace ICSharpCode.Reporting.Pdf
public override void Visit(ExportGraphics exportGraphics) public override void Visit(ExportLine exportGraphics)
{ {
var columnLocation = containerLocation; var columnLocation = containerLocation;
columnLocation.Offset(exportGraphics.Location); columnLocation.Offset(exportGraphics.Location);
var p = PdfHelper.PdfPen(exportGraphics); var pen = PdfHelper.PdfPen(exportGraphics);
gfx.DrawLine(p,columnLocation.ToXPoints(),new Point(exportGraphics.Size.Width,columnLocation.Y).ToXPoints()); pen.DashStyle = PdfHelper.DashStyle(exportGraphics);
pen.LineCap = PdfHelper.LineCap(exportGraphics);
gfx.DrawLine(pen,columnLocation.ToXPoints(),new Point(exportGraphics.Size.Width,columnLocation.Y).ToXPoints());
} }

Loading…
Cancel
Save