Browse Source

Textalignment Justify in Pdf

pull/503/head
Peter Forstmeier 11 years ago
parent
commit
5ede713dd0
  1. 2
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/DebugVisitor.cs
  2. 1
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Globals/MeasurementService.cs
  3. 15
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Pdf/PdfHelper.cs
  4. 11
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Wpf/Visitor/WpfVisitor.cs
  5. 2
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Xml/ModelLoader.cs
  6. 4
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Xml/MycroParser.cs

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

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

1
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Globals/MeasurementService.cs

@ -45,7 +45,6 @@ namespace ICSharpCode.Reporting.Globals
} }
return new Size(item.Size.Width,(int)Math.Ceiling(sizeF.Height)); return new Size(item.Size.Width,(int)Math.Ceiling(sizeF.Height));
} }
Console.WriteLine ("measure {0}",item.Size);
return item.Size; return item.Size;
} }
} }

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

@ -35,6 +35,7 @@ namespace ICSharpCode.Reporting.Pdf
{ {
var font = PdfHelper.CreatePdfFont(exportColumn); var font = PdfHelper.CreatePdfFont(exportColumn);
var rect = new Rectangle(columnLocation,exportColumn.DesiredSize).ToXRect(); var rect = new Rectangle(columnLocation,exportColumn.DesiredSize).ToXRect();
textFormatter.Alignment = XParagraphAlignment(exportColumn);
textFormatter.DrawString(exportColumn.Text, textFormatter.DrawString(exportColumn.Text,
font, font,
CreateBrush(exportColumn.ForeColor), CreateBrush(exportColumn.ForeColor),
@ -90,7 +91,21 @@ namespace ICSharpCode.Reporting.Pdf
public static XLineCap LineCap (IExportGraphics column) { public static XLineCap LineCap (IExportGraphics column) {
return XLineCap.Round; return XLineCap.Round;
}
public static XParagraphAlignment XParagraphAlignment (ExportText exportColumn) {
switch (exportColumn.TextAlignment) {
case System.Windows.TextAlignment.Left:
return PdfSharp.Drawing.Layout.XParagraphAlignment.Left;
case System.Windows.TextAlignment.Center:
return PdfSharp.Drawing.Layout.XParagraphAlignment.Center;
case System.Windows.TextAlignment.Right:
return PdfSharp.Drawing.Layout.XParagraphAlignment.Center;
case System.Windows.TextAlignment.Justify:
return PdfSharp.Drawing.Layout.XParagraphAlignment.Justify;
}
return PdfSharp.Drawing.Layout.XParagraphAlignment.Left;
} }

11
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Wpf/Visitor/WpfVisitor.cs

@ -60,8 +60,6 @@ namespace ICSharpCode.Reporting.WpfReportViewer.Visitor
Canvas RenderSectionContainer (ExportContainer container) { Canvas RenderSectionContainer (ExportContainer container) {
Console.WriteLine("--------------");
Console.WriteLine("Container {0}",container.Name);
var canvas = FixedDocumentCreator.CreateContainer(container); var canvas = FixedDocumentCreator.CreateContainer(container);
foreach (var element in container.ExportedItems) { foreach (var element in container.ExportedItems) {
if (IsContainer(element)) { if (IsContainer(element)) {
@ -132,18 +130,9 @@ namespace ICSharpCode.Reporting.WpfReportViewer.Visitor
null, null,
new Rect(location,new Size(exportColumn.Size.Width,exportColumn.Size.Height))); new Rect(location,new Size(exportColumn.Size.Width,exportColumn.Size.Height)));
} }
//http://stackoverflow.com/questions/4542717/length-of-string-that-will-fit-in-a-specific-width
// http://stackoverflow.com/questions/9264398/how-to-calculate-wpf-textblock-width-for-its-known-font-size-and-characters
// var offset = FixedDocumentCreator.CalculateAlignmentOffset(formattedText,exportColumn);
// var newLoc = new Point(location.X + offset.X,location.Y + offset.Y);
// Console.WriteLine(" FT for {0} at {1}",formattedText.Text.Substring(0,5),newLoc);
// drawingContext.DrawText(formattedText,newLoc);
drawingContext.DrawText(formattedText,location); drawingContext.DrawText(formattedText,location);
} }
var dragingElement = new DrawingElement(visual); var dragingElement = new DrawingElement(visual);
UIElement = dragingElement; UIElement = dragingElement;
} }

2
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Xml/ModelLoader.cs

@ -27,8 +27,6 @@ namespace ICSharpCode.Reporting.Xml
public class ModelLoader: MycroParser public class ModelLoader: MycroParser
{ {
public ModelLoader() { public ModelLoader() {
Console.WriteLine("ICSharpCode.Reporting.Xml.ModelLoader");
Console.WriteLine();
} }
protected override Type GetTypeByName(string ns, string name) protected override Type GetTypeByName(string ns, string name)
{ {

4
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Xml/MycroParser.cs

@ -44,9 +44,9 @@ namespace ICSharpCode.Reporting.Xml
public abstract class MycroParser public abstract class MycroParser
{ {
public MycroParser() { public MycroParser() {
Console.WriteLine("Mycroparser");
Console.WriteLine();
} }
public object Load(XmlElement element) public object Load(XmlElement element)
{ {
return ProcessNode(element, null); return ProcessNode(element, null);

Loading…
Cancel
Save