Cleanup

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/WPF/WPFReportPreview.cs

@@ -7,6 +7,7 @@
  * To change this template use Tools | Options | Coding | Edit Standard Headers.
  */
 using System;
+using System.Diagnostics;
 using ICSharpCode.Reports.Addin.Commands;
 using ICSharpCode.Reports.Core;
 using ICSharpCode.Reports.Core.Exporter.ExportRenderer;
@@ -40,6 +41,11 @@ namespace ICSharpCode.Reports.Addin.Project.WPF
 		
 		protected override void LoadFromPrimary()
 		{
+			Stopwatch sw = new Stopwatch();
+			sw.Start();
+			Console.WriteLine("-----------------");
+			Console.WriteLine("Stop start");
+				
 			Pages.Clear();
 			ReportModel model = designerLoader.CreateRenderableModel();
 			var collectCmd = new CollectParametersCommand(model);
@@ -65,10 +71,14 @@ namespace ICSharpCode.Reports.Addin.Project.WPF
 				default:
 					throw new InvalidReportModelException();
 			}
+			Console.WriteLine (" after create {0}",sw.Elapsed);
 			
-			PreviewViewModel pvm = new PreviewViewModel (model.ReportSettings,exportRunner.Pages);
+			PreviewViewModel previewViewModel = new PreviewViewModel (model.ReportSettings,exportRunner.Pages);
-			//viewer.Document = pvm.Document;
+				Console.WriteLine (" after init model {0}",sw.Elapsed);
-			viewer.SetBinding(pvm);
+			viewer.SetBinding(previewViewModel);
+				Console.WriteLine ("after setbinding {0}",sw.Elapsed);
+			sw.Stop();
+			Console.WriteLine("---------------");
 		}
 		
 		

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/ExportRunner.cs

@@ -18,31 +18,14 @@ namespace ICSharpCode.Reports.Core.Exporter.ExportRenderer
 	/// </summary>
 	public class ExportRunner:IExportRunner
 	{
+		
+		
 		public ExportRunner()
 		{
 			Pages = new PagesCollection();
 		}
 		
 		
-		public System.Windows.Documents.IDocumentPaginatorSource Document {
-			set {
-				throw new NotImplementedException();
-			}
-		}
-		
-		
-		public PagesCollection Pages {get;private set;}
-	
-		
-		public ICSharpCode.Reports.Core.ReportViewer.IReportViewerMessages Messages {
-			get {
-				throw new NotImplementedException();
-			}
-			set {
-				throw new NotImplementedException();
-			}
-		}
-		
 		public void RunReport(string fileName, ReportParameters parameters)
 		{
 			if (String.IsNullOrEmpty(fileName)) {
@@ -116,6 +99,8 @@ namespace ICSharpCode.Reports.Core.Exporter.ExportRenderer
 			reportCreator.BuildExportList();
 		}
 		
+		public PagesCollection Pages {get;private set;}
+		
 		
 		private void RunFormSheet(ReportModel reportModel)
 		{
@@ -125,8 +110,6 @@ namespace ICSharpCode.Reports.Core.Exporter.ExportRenderer
 			reportCreator.BuildExportList();
 		}
 		
-		
-		
 		private void OnPageCreated (object sender,PageCreatedEventArgs e)
 		{
 			Pages.Add(e.SinglePage);

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs

@@ -25,7 +25,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer
 	{
 		public event EventHandler<EventArgs> PreviewLayoutChanged;
 
-
+		private IExportRunner runner;
 		private float zoom;
 
 		private int pageNumber;
@@ -52,6 +52,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer
 			InitZoomCombo();
 
 			previewRenderer = PreviewRenderer.CreateInstance();
+			runner = new ExportRunner();
 			this.CheckEnable();
 			SetTransparentBackground();
 

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/WPF/FixedDocumentCreator.cs

@@ -142,7 +142,6 @@ namespace ICSharpCode.Reports.Core.WPF
 		#region Container 
 		UIElement CreateGraphicsContainer(ExportGraphicContainer graphicContainer)
 		{
-			Console.WriteLine("GraphicContainer");
 			IGraphicStyleDecorator decorator = graphicContainer.StyleDecorator as IGraphicStyleDecorator;
 			UIElement shape = null;	
 			var ss = decorator.Shape as EllipseShape;
@@ -155,13 +154,9 @@ namespace ICSharpCode.Reports.Core.WPF
 				circle.StrokeThickness = decorator.Thickness;
 				circle.Stroke = brushConverter.ConvertFromString(decorator.ForeColor.Name) as SolidColorBrush;
 				shape = circle;
-				
-				
 			}
-			else
+			else				
-				
 			{
-				
 				var border = CreateBorder(decorator as BaseStyleDecorator);
 				SetDimension(border,decorator);
 				
@@ -172,8 +167,6 @@ namespace ICSharpCode.Reports.Core.WPF
 				border.BorderBrush = brushConverter.ConvertFromString(decorator.ForeColor.Name) as SolidColorBrush;
 				shape = border;
 			}
-		
-			
 			return shape;
 		}
 		
@@ -181,7 +174,6 @@ namespace ICSharpCode.Reports.Core.WPF
 		
 		private UIElement CreateContainer(ExportContainer container)
 		{
-			Console.WriteLine("CreateContainer");
 			var canvas = new Canvas();
 			SetDimension(canvas,container.StyleDecorator);
 
@@ -203,24 +195,6 @@ namespace ICSharpCode.Reports.Core.WPF
 		
 		#endregion
 		
-		/*
-		void CreateShape(Canvas canvas, IGraphicStyleDecorator bs)
-		{
-			var shape = bs.Shape;
-			UIElement element = null;
-			if (shape is RectangleShape) {
-				element = new System.Windows.Controls.Border();
-				
-			}
-			
-			if (element != null) {
-				canvas.Children.Add(element);
-				Canvas.SetLeft(element,bs.Location.X);
-				Canvas.SetTop(element,bs.Location.Y);
-			}
-		}
-*/
-
 		
 		UIElement CreateTextColumn(ExportText et)
 		{

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/WpfReportViewer/PreviewViewModel.cs

@@ -30,15 +30,12 @@ namespace ICSharpCode.Reports.Core.WpfReportViewer
 			renderer.Start();
 			renderer.RenderOutput();
 			renderer.End();
-			OnNotifyPropertyChanged("Pages");
 			this.Document = renderer.Document;
 			
 		}
 		
-		
 		public PagesCollection Pages {get;private set;}
 		
-		
 		public IDocumentPaginatorSource Document
 		{
 			get {return document;}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/WpfReportViewer/WpfReportViewer.xaml

@@ -1,17 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <UserControl
-	x:Class="ICSharpCode.Reports.Core.WpfReportViewer.WpfReportViewer"
+	x:Class="ICSharpCode.Reports.Core.WpfReportViewer.WpfReportViewer" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-	<!-- {Binding Path=PathToProperty, RelativeSource={RelativeSource AncestorType={x:Type typeOfAncestor}}} -->
 	<Grid>
 		<DocumentViewer
 			x:Name="DocumentViewer"
-			Document="{Binding Path=DataContext.Document,
+			Document="{Binding Path=DataContext.Document,&#xD;&#xA;&#x9;&#x9;&#x9;PresentationTraceSources.TraceLevel=High,&#xD;&#xA;&#x9;&#x9;&#x9;RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
-			PresentationTraceSources.TraceLevel=High,
-			RelativeSource={RelativeSource AncestorType={x:Type UserControl}}}"
 			HorizontalAlignment="Stretch"
-			VerticalAlignment="Stretch"></DocumentViewer>
+			VerticalAlignment="Stretch"
-			
+			SnapsToDevicePixels="True"></DocumentViewer>
 	</Grid>
 </UserControl>