Browse Source

Cosmetics

reports
Peter Forstmeier 13 years ago
parent
commit
6620c807cf
  1. 4
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataSource/DataCollection.cs
  2. 2
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataSource/ExtendedPropertyDescriptor.cs
  3. 2
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataSource/ExtendedTypeDescriptor.cs
  4. 4
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataSource/PropertyTypeHash.cs
  5. 33
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/ExportRenderer/FixedDocumentCreator.cs
  6. 4
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/WpfExporter.cs
  7. 2
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Wpf/PreviewViewModel.cs

4
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataSource/DataCollection.cs

@ -20,7 +20,7 @@ namespace ICSharpCode.Reporting.DataSource
/// <summary> /// <summary>
/// Description of DataCollection. /// Description of DataCollection.
/// </summary> /// </summary>
internal class DataCollection<T> : IList<T>,ITypedList class DataCollection<T> : IList<T>,ITypedList
{ {
Collection<T> list = new Collection<T>(); Collection<T> list = new Collection<T>();
Type elementType; Type elementType;
@ -197,7 +197,7 @@ namespace ICSharpCode.Reporting.DataSource
} }
[DebuggerStepThrough] [DebuggerStepThrough]
System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() IEnumerator System.Collections.IEnumerable.GetEnumerator()
{ {
return list.GetEnumerator(); return list.GetEnumerator();
} }

2
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataSource/ExtendedPropertyDescriptor.cs

@ -16,7 +16,7 @@ namespace ICSharpCode.Reporting.DataSource
/// <summary> /// <summary>
/// Description of ExtendedPropertyDescriptor. /// Description of ExtendedPropertyDescriptor.
/// </summary> /// </summary>
internal class ExtendedPropertyDescriptor : PropertyDescriptor class ExtendedPropertyDescriptor : PropertyDescriptor
{ {
Type componentType; Type componentType;

2
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataSource/ExtendedTypeDescriptor.cs

@ -16,7 +16,7 @@ namespace ICSharpCode.Reporting.DataSource
/// <summary> /// <summary>
/// Description of ExtendedTypeDescriptor. /// Description of ExtendedTypeDescriptor.
/// </summary> /// </summary>
internal class ExtendedTypeDescriptor class ExtendedTypeDescriptor
{ {
private static Hashtable collections = new Hashtable(); private static Hashtable collections = new Hashtable();

4
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataSource/PropertyTypeHash.cs

@ -14,7 +14,7 @@ namespace ICSharpCode.Reporting.DataSource
/// <summary> /// <summary>
/// Description of PropertyTypeHash. /// Description of PropertyTypeHash.
/// </summary> /// </summary>
internal class PropertyTypeHash class PropertyTypeHash
{ {
static PropertyTypeHash instance = new PropertyTypeHash(); static PropertyTypeHash instance = new PropertyTypeHash();
@ -46,7 +46,7 @@ namespace ICSharpCode.Reporting.DataSource
} }
} }
private PropertyTypeHash() PropertyTypeHash()
{ {
} }
} }

33
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/ExportRenderer/FixedDocumentCreator.cs

@ -12,7 +12,8 @@ using System.Windows.Controls;
using System.Windows.Documents; using System.Windows.Documents;
using System.Windows.Media; using System.Windows.Media;
using ICSharpCode.Reporting.Exporter.Visitors; using ICSharpCode.Reporting.Interfaces;
using ICSharpCode.Reporting.Interfaces.Export;
using ICSharpCode.Reporting.Items; using ICSharpCode.Reporting.Items;
using ICSharpCode.Reporting.PageBuilder.ExportColumns; using ICSharpCode.Reporting.PageBuilder.ExportColumns;
using Brush = System.Windows.Media.Brush; using Brush = System.Windows.Media.Brush;
@ -25,7 +26,7 @@ namespace ICSharpCode.Reporting.ExportRenderer
/// <summary> /// <summary>
/// Description of FixedDocumentCreator. /// Description of FixedDocumentCreator.
/// </summary> /// </summary>
internal class FixedDocumentCreator class FixedDocumentCreator
{ {
BrushConverter brushConverter ; BrushConverter brushConverter ;
ReportSettings reportSettings; ReportSettings reportSettings;
@ -54,7 +55,7 @@ namespace ICSharpCode.Reporting.ExportRenderer
canvas.Measure(size); canvas.Measure(size);
canvas.Arrange(new Rect(new System.Windows.Point(),size )); canvas.Arrange(new Rect(new Point(),size ));
canvas.UpdateLayout(); canvas.UpdateLayout();
@ -103,24 +104,26 @@ namespace ICSharpCode.Reporting.ExportRenderer
} }
void SetPositionAndSize(FrameworkElement element,ExportColumn column) { void SetPositionAndSize(FrameworkElement element,ExportColumn column) {
if (column == null)
throw new ArgumentNullException("column");
SetPosition(element,column); SetPosition(element,column);
SetDimension(element,column); SetDimension(element,column);
} }
static void SetDimension (FrameworkElement element,ExportColumn exportColumn) static void SetDimension (FrameworkElement element,IExportColumn exportColumn)
{ {
element.Width = exportColumn.DesiredSize.Width; element.Width = exportColumn.DesiredSize.Width;
element.Height = exportColumn.DesiredSize.Height; element.Height = exportColumn.DesiredSize.Height;
} }
static void SetPosition (FrameworkElement element,ExportColumn exportColumn) { static void SetPosition (UIElement element,IExportColumn exportColumn) {
FixedPage.SetLeft(element,exportColumn.Location.X ); FixedPage.SetLeft(element,exportColumn.Location.X );
FixedPage.SetTop(element,exportColumn.Location.Y); FixedPage.SetTop(element,exportColumn.Location.Y);
} }
void SetFont(TextBlock textBlock,ExportText exportText) void SetFont(TextBlock textBlock,IExportText exportText)
{ {
textBlock.FontFamily = new FontFamily(exportText.Font.FontFamily.Name); textBlock.FontFamily = new FontFamily(exportText.Font.FontFamily.Name);
@ -134,7 +137,7 @@ namespace ICSharpCode.Reporting.ExportRenderer
} }
if (exportText.Font.Italic) { if (exportText.Font.Italic) {
textBlock.FontStyle = System.Windows.FontStyles.Italic ; textBlock.FontStyle = FontStyles.Italic ;
} }
if (exportText.Font.Strikeout) { if (exportText.Font.Strikeout) {
CreateStrikeout(textBlock,exportText); CreateStrikeout(textBlock,exportText);
@ -142,8 +145,12 @@ namespace ICSharpCode.Reporting.ExportRenderer
} }
void CreateStrikeout (TextBlock textBlock,ExportColumn exportColumn ) void CreateStrikeout (TextBlock textBlock,IExportText exportColumn )
{ {
if (textBlock == null)
throw new ArgumentNullException("textBlock");
if (exportColumn == null)
throw new ArgumentNullException("exportColumn");
var strikeOut = new TextDecoration(); var strikeOut = new TextDecoration();
strikeOut.Location = TextDecorationLocation.Strikethrough; strikeOut.Location = TextDecorationLocation.Strikethrough;
@ -154,8 +161,12 @@ namespace ICSharpCode.Reporting.ExportRenderer
} }
void CreateUnderline(TextBlock textBlock,ExportColumn exportColumn) void CreateUnderline(TextBlock textBlock,IExportText exportColumn)
{ {
if (exportColumn == null)
throw new ArgumentNullException("exportColumn");
if (textBlock == null)
throw new ArgumentNullException("textBlock");
var underLine = new TextDecoration(); var underLine = new TextDecoration();
Pen p = CreateWpfPen(exportColumn); Pen p = CreateWpfPen(exportColumn);
underLine.Pen = p ; underLine.Pen = p ;
@ -164,8 +175,10 @@ namespace ICSharpCode.Reporting.ExportRenderer
} }
Pen CreateWpfPen(ICSharpCode.Reporting.Interfaces.IReportObject exportColumn) Pen CreateWpfPen(IReportObject exportColumn)
{ {
if (exportColumn == null)
throw new ArgumentNullException("exportColumn");
var myPen = new Pen(); var myPen = new Pen();
myPen.Brush = ConvertBrush(exportColumn.ForeColor); myPen.Brush = ConvertBrush(exportColumn.ForeColor);
myPen.Thickness = 1.5; myPen.Thickness = 1.5;

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

@ -27,8 +27,8 @@ namespace ICSharpCode.Reporting.Exporter
{ {
private WpfVisitor visitor; WpfVisitor visitor;
private ReportSettings reportSettings; ReportSettings reportSettings;
FixedPage fixedPage; FixedPage fixedPage;
public WpfExporter(ReportSettings reportSettings,Collection<ExportPage> pages):base(pages) public WpfExporter(ReportSettings reportSettings,Collection<ExportPage> pages):base(pages)

2
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Wpf/PreviewViewModel.cs

@ -28,7 +28,7 @@ namespace ICSharpCode.Reporting.WpfReportViewer
public class PreviewViewModel:INotifyPropertyChanged public class PreviewViewModel:INotifyPropertyChanged
{ {
private FixedDocument document ; FixedDocument document ;
public PreviewViewModel(ReportSettings reportSettings, Collection<ExportPage> pages) public PreviewViewModel(ReportSettings reportSettings, Collection<ExportPage> pages)
{ {

Loading…
Cancel
Save