From 52a13d7ada0a728ff187189825593247bfd0db52 Mon Sep 17 00:00:00 2001 From: Peter Forstmeier Date: Fri, 15 Mar 2013 19:59:29 +0100 Subject: [PATCH] Cleanup, set C compiling Options to 'any processor (prefer 64 bit) --- .../ICSharpCode.Reports.Addin.csproj | 10 ++++-- .../Project/Commands/ViewCommands.cs | 17 +++++----- .../DesignerBinding/InternalReportLoader.cs | 24 ++++++++------ .../ReportDefinitionDeserializer.cs | 4 ++- .../ReportDesignerGenerator.cs | 7 +++-- .../DesignerBinding/ReportDesignerLoader.cs | 4 ++- .../Project/ReportDesignerView.cs | 10 ++++++ .../Project/Xml/ReportDefinitionParser.cs | 3 +- .../ICSharpCode.Reports.Core.csproj | 10 ++++-- .../Project/ReportEngine.cs | 31 ++++++++++++++++--- .../Project/Xml/BaseItemLoader.cs | 2 ++ .../Project/Xml/MycroParser.cs | 2 ++ 12 files changed, 93 insertions(+), 31 deletions(-) diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/ICSharpCode.Reports.Addin.csproj b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/ICSharpCode.Reports.Addin.csproj index 85ad1e1e82..957401eaa1 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/ICSharpCode.Reports.Addin.csproj +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/ICSharpCode.Reports.Addin.csproj @@ -12,10 +12,10 @@ False Auto 125829120 - x86 + AnyCPU 4096 4 - false + False ..\..\..\..\..\AddIns\Misc\SharpDevelopReports\ v4.5 "C:\Program Files\SharpDevelop\bin\..\AddIns\AddIns\Misc\SourceAnalysis\Settings.SourceAnalysis" @@ -36,6 +36,8 @@ true + False + obj\$(Configuration)\ False @@ -46,6 +48,7 @@ Project ..\..\..\..\..\bin\SharpDevelop.exe AllRules.ruleset + obj\ True @@ -55,6 +58,9 @@ False AllRules.ruleset + + False + ..\Libraries\itextsharp.dll diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Commands/ViewCommands.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Commands/ViewCommands.cs index 5991c9f25b..1334850e75 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Commands/ViewCommands.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Commands/ViewCommands.cs @@ -24,30 +24,33 @@ namespace ICSharpCode.Reports.Addin.Commands public override void Run() { - WorkbenchSingleton.Workbench.ShowView(SetupDesigner()); +// WorkbenchSingleton.Workbench.ShowView(SetupDesigner()); + throw new NotImplementedException("Run"); } - public static ReportDesignerView SetupDesigner () + /* + private static ReportDesignerView SetupDesigner () { ReportModel model = ReportModel.Create(); - Properties customizer = new Properties(); - customizer.Set("ReportLayout",GlobalEnums.ReportLayout.ListLayout); - IReportGenerator generator = new GeneratePlainReport(model,customizer); + Properties properties = new Properties(); + properties.Set("ReportLayout",GlobalEnums.ReportLayout.ListLayout); + IReportGenerator generator = new GeneratePlainReport(model,properties); generator.GenerateReport(); - + Console.WriteLine("--Rework-----StartViewCommand----------"); // OpenedFile file = FileService.CreateUntitledOpenedFile(GlobalValues.PlainFileName,new byte[0]); // file.SetData(generator.Generated.ToArray()); // return SetupDesigner(file); return SetupDesigner(null); } - + */ public static ReportDesignerView SetupDesigner (OpenedFile file) { if (file == null) { throw new ArgumentNullException("file"); } + Console.WriteLine("StartViewCommand.SetupDesigner"); IDesignerGenerator generator = new ReportDesignerGenerator(); return new ReportDesignerView(file, generator); } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/InternalReportLoader.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/InternalReportLoader.cs index 1d1f42f294..36da6ca46c 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/InternalReportLoader.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/InternalReportLoader.cs @@ -6,9 +6,9 @@ using System.ComponentModel; using System.ComponentModel.Design.Serialization; using System.IO; using System.Windows.Forms; + using ICSharpCode.Core; using ICSharpCode.Reports.Core; -using ICSharpCode.Reports.Core.Interfaces; using ICSharpCode.SharpDevelop; namespace ICSharpCode.Reports.Addin @@ -31,6 +31,10 @@ namespace ICSharpCode.Reports.Addin if (generator == null) { throw new ArgumentNullException("generator"); } + if (stream == null) { + throw new ArgumentNullException("stream"); + } + Console.WriteLine("---------InternalReportLoader------------"); this.host = host; this.generator = generator; this.stream = stream; @@ -38,9 +42,8 @@ namespace ICSharpCode.Reports.Addin public void LoadOrCreateReport() { - + Console.WriteLine("LoadOrCreateReport()"); Application.UseWaitCursor = true; -// Application.DoEvents(); try { IComponent cc = this.host.CreateComponent(typeof(ICSharpCode.Reports.Addin.Designer.RootReportModel),"RootReportModel"); ICSharpCode.Reports.Addin.Designer.RootReportModel rootControl = cc as ICSharpCode.Reports.Addin.Designer.RootReportModel; @@ -55,17 +58,18 @@ namespace ICSharpCode.Reports.Addin } } + private void UpdateStatusbar () { string message; - if (this.generator.ViewContent.PrimaryFile.IsDirty) { - message = String.Format("Create Report <{0}> ...",Path.GetFileName(this.generator.ViewContent.PrimaryFile.FileName)); - } else { - message = String.Format("Load Report <{0}> ...",Path.GetFileName(this.generator.ViewContent.PrimaryFile.FileName)); - } - SharpDevelop.Gui.WorkbenchSingleton.StatusBar.SetMessage(message); + if (this.generator.ViewContent.PrimaryFile.IsDirty) { + message = String.Format("Create Report <{0}> ...",Path.GetFileName(this.generator.ViewContent.PrimaryFile.FileName)); + } else { + message = String.Format("Load Report <{0}> ...",Path.GetFileName(this.generator.ViewContent.PrimaryFile.FileName)); + } + SD.StatusBar.SetMessage(message); } - + private void CreateNamedSurface () { diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDefinitionDeserializer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDefinitionDeserializer.cs index 1d22bd84bc..9649363220 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDefinitionDeserializer.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDefinitionDeserializer.cs @@ -32,6 +32,7 @@ namespace ICSharpCode.Reports.Addin if (stream == null) { throw new ArgumentNullException("stream"); } + Console.WriteLine("ReportDefinitionDeserializer"); this.host = host; this.stream = stream; } @@ -40,7 +41,7 @@ namespace ICSharpCode.Reports.Addin public ReportModel LoadObjectFromFileDefinition() { - + Console.WriteLine("LoadObjectFromFileDefinition()"); XmlDocument doc = new XmlDocument(); doc.Load(this.stream); if (doc.FirstChild.NodeType == XmlNodeType.XmlDeclaration) @@ -54,6 +55,7 @@ namespace ICSharpCode.Reports.Addin private ReportModel LoadObjectFromXmlDocument(XmlElement elem) { + Console.WriteLine("LoadObjectFromXmlDocumen)"); //ReportSettings OpenedFile file =(OpenedFile) host.GetService(typeof(OpenedFile)); BaseItemLoader baseItemLoader = new BaseItemLoader(); diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDesignerGenerator.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDesignerGenerator.cs index 741303e04b..610f4748b5 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDesignerGenerator.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDesignerGenerator.cs @@ -25,6 +25,7 @@ namespace ICSharpCode.Reports.Addin public ReportDesignerGenerator() { + Console.WriteLine("Create ReportDesignerGenerator()"); } public CodeDomProvider CodeDomProvider { @@ -41,6 +42,7 @@ namespace ICSharpCode.Reports.Addin public void Attach(ReportDesignerView viewContent) { + Console.WriteLine("ReportDesignerGenerator:Attach"); if (viewContent == null) { throw new ArgumentNullException("viewContent"); } @@ -56,13 +58,14 @@ namespace ICSharpCode.Reports.Addin public IEnumerable GetSourceFiles(out OpenedFile designerCodeFile) { + Console.WriteLine("ReportDesignerGenerator:getSourceFile"); designerCodeFile = this.viewContent.PrimaryFile; return new [] {designerCodeFile}; } public void MergeFormChanges(CodeCompileUnit unit){ - + Console.WriteLine("ReportDesignerGenerator:MergeFormChanges"); System.Diagnostics.Trace.WriteLine("Generator:MergeFormChanges"); StringWriterWithEncoding writer = new StringWriterWithEncoding(System.Text.Encoding.UTF8); XmlTextWriter xml = XmlHelper.CreatePropperWriter(writer); @@ -77,7 +80,7 @@ namespace ICSharpCode.Reports.Addin if (xml == null) { throw new ArgumentNullException("xml"); } - + Console.WriteLine("ReportDesignerGenerator:internalMergeFormChanges"); ReportDesignerWriter rpd = new ReportDesignerWriter(); XmlHelper.CreatePropperDocument(xml); diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDesignerLoader.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDesignerLoader.cs index 7f27b716b4..3ca8493a47 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDesignerLoader.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDesignerLoader.cs @@ -10,7 +10,6 @@ using System.Xml; using ICSharpCode.Reports.Core; using ICSharpCode.Reports.Core.Globals; -using ICSharpCode.SharpDevelop; namespace ICSharpCode.Reports.Addin { @@ -26,6 +25,7 @@ namespace ICSharpCode.Reports.Addin public ReportDesignerLoader(IDesignerGenerator generator, Stream stream) { + Console.WriteLine("ReportDesignerLoader:Ctor"); if (stream == null) throw new ArgumentNullException("stream"); if (generator == null) { @@ -83,6 +83,7 @@ namespace ICSharpCode.Reports.Addin public ReportModel CreateRenderableModel() { + Console.WriteLine("ReportDesignerLoader:CreateRenderableModel"); ReportModel m = new ReportModel(); generator.MergeFormChanges((System.CodeDom.CodeCompileUnit)null); XmlDocument doc = new XmlDocument(); @@ -122,6 +123,7 @@ namespace ICSharpCode.Reports.Addin public static Type GetReportType(Type baseType) { + Console.WriteLine("ReportLoader:GetReportType"); if (baseType == null) return null; if (baseToReport == null) { baseToReport = new Dictionary(); diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportDesignerView.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportDesignerView.cs index b3c599ba1b..4bfde85c6e 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportDesignerView.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportDesignerView.cs @@ -69,6 +69,7 @@ namespace ICSharpCode.Reports.Addin if (generator == null) { throw new ArgumentNullException("generator"); } + Console.WriteLine("ReportDesignerView"); this.generator = generator; this.generator.Attach(this); base.TabPageText = ResourceService.GetString("SharpReport.Design"); @@ -88,6 +89,7 @@ namespace ICSharpCode.Reports.Addin private void SetupSecondaryView () { + Console.WriteLine("SetupSecondaryView ()"); xmlView = new XmlView(generator,this); SecondaryViewContents.Add(xmlView); preview = new ReportPreview(loader,this); @@ -106,6 +108,7 @@ namespace ICSharpCode.Reports.Addin private void LoadDesigner(Stream stream) { + Console.WriteLine("LoadDesigner(Stream stream)"); LoggingService.Info("Form Designer: BEGIN INITIALIZE"); CreatePanel(); defaultServiceContainer = new DefaultServiceContainer(); @@ -247,6 +250,7 @@ namespace ICSharpCode.Reports.Addin private void MergeFormChanges() { + LoggingService.Info("MergeFormChanges()"); System.Diagnostics.Trace.WriteLine("View:MergeFormChanges()"); this.designSurface.Flush(); generator.MergeFormChanges(null); @@ -268,6 +272,7 @@ namespace ICSharpCode.Reports.Addin private void StartReportExplorer () { + LoggingService.Info("StartReportExplorer ()"); ReportExplorerPad explorerPad = CheckReportExplorer(); WorkbenchSingleton.Workbench.GetPad(typeof(ReportExplorerPad)).BringPadToFront(); explorerPad.AddContent(this.loader.ReportModel); @@ -277,6 +282,7 @@ namespace ICSharpCode.Reports.Addin private void ReportExplorer_PropertyChanged (object sender,System.ComponentModel.PropertyChangedEventArgs e) { + Console.WriteLine("ReportExplorer_PropertyChanged"); this.MakeDirty(); ReportExplorerPad explorerPad = CheckReportExplorer(); IComponentChangeService change = Host.GetService(typeof(IComponentChangeService)) as IComponentChangeService; @@ -369,6 +375,7 @@ namespace ICSharpCode.Reports.Addin private void UpdatePropertyPad() { + Console.WriteLine("UpdatePropertyPad()"); if (IsFormsDesignerVisible && Host != null) { propertyContainer.Host = Host; propertyContainer.SelectableObjects = Host.Container.Components; @@ -550,6 +557,9 @@ namespace ICSharpCode.Reports.Addin public PrintDocument PrintDocument { get { + Console.WriteLine(""); + Console.WriteLine("----ReportdesignerView:PrintDocument------"); + Console.WriteLine(""); ReportModel model = loader.CreateRenderableModel(); IReportCreator reportCreator = null; var paramCmd = new CollectParametersCommand(model); diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Xml/ReportDefinitionParser.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Xml/ReportDefinitionParser.cs index 9fecae79d3..832e21bb9b 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Xml/ReportDefinitionParser.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Xml/ReportDefinitionParser.cs @@ -52,7 +52,7 @@ namespace ICSharpCode.Reports.Addin } //Trace.Assert(t != null, "Type "+cname+" could not be determined."); // Debug.WriteLine("Looking for " + cname + " and got " + t.FullName); - + Console.WriteLine("ReportDefinitionParser - Looking for " + cname + " and got " + t.FullName); try { ret=Activator.CreateInstance(t); @@ -223,6 +223,7 @@ namespace ICSharpCode.Reports.Addin if (tc.CanConvertFrom(typeof(string))) { object val=tc.ConvertFromInvariantString(value); + Console.WriteLine("\tRDP -> SetPropertyToString {0} - {1}",pi.Name,value.ToString()); pi.SetValue(obj, val, null); } else if (pi.PropertyType == typeof(Type)) { pi.SetValue(obj, Type.GetType(value), null); diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj index 26c69e617b..30d1593866 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj @@ -12,10 +12,10 @@ False Auto 123731968 - x86 + AnyCPU 4096 4 - false + False OnBuildSuccess v4.5 "C:\Program Files\SharpDevelop\bin\..\AddIns\AddIns\Misc\SourceAnalysis\Settings.SourceAnalysis" @@ -37,6 +37,8 @@ true + False + obj\$(Configuration)\ False @@ -44,6 +46,7 @@ true Full True + obj\ True @@ -52,6 +55,9 @@ None False + + False + ..\Libraries\Irony.dll diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportEngine.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportEngine.cs index 8e41320374..bb36419a6a 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportEngine.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportEngine.cs @@ -38,6 +38,7 @@ namespace ICSharpCode.Reports.Core { public ReportEngine() { + Console.WriteLine("reportEngine"); } #endregion @@ -96,6 +97,7 @@ namespace ICSharpCode.Reports.Core { internal static void CheckForParameters (IReportModel model,ReportParameters reportParameters) { + Console.WriteLine("ReportEngine:CheckforParameters"); if (reportParameters != null) { if (reportParameters.SortColumnCollection.Count > 0) { @@ -117,6 +119,7 @@ namespace ICSharpCode.Reports.Core { private static void SetReportParam (IReportModel model,BasicParameter param) { + Console.WriteLine("ReportEngine:SetReportParameters"); var p = model.ReportSettings.ParameterCollection.Find(param.ParameterName); if (p != null) { p.ParameterValue = param.ParameterValue; @@ -126,6 +129,7 @@ namespace ICSharpCode.Reports.Core { private static void SetSqlParam (IReportModel model,SqlParameter param) { + Console.WriteLine("ReportEngine:SetSqlparameters"); var p = model.ReportSettings.SqlParameters.Find(param.ParameterName); if (p != null) { p.ParameterValue = param.ParameterValue; @@ -162,8 +166,9 @@ namespace ICSharpCode.Reports.Core { /// - protected AbstractRenderer SetupStandardRenderer (IReportModel model,ReportParameters parameters) { - + protected AbstractRenderer SetupStandardRenderer (IReportModel model,ReportParameters parameters) + { + Console.WriteLine("ReportEngine:SetupStandardRenderer"); AbstractRenderer abstr = null; try { switch (model.ReportSettings.ReportType) { @@ -190,8 +195,9 @@ namespace ICSharpCode.Reports.Core { protected AbstractRenderer SetupPushDataRenderer (IReportModel model, - IList list) { - + IList list) + { + Console.WriteLine("ReportEngine:SetupPushDataRenderer_1"); if (model == null) { throw new ArgumentNullException("model"); } @@ -215,7 +221,7 @@ namespace ICSharpCode.Reports.Core { protected AbstractRenderer SetupPushDataRenderer (IReportModel model, DataTable dataTable) { - + Console.WriteLine("ReportEngine:SetupPushRenderer_2"); if (model == null) { throw new ArgumentNullException("model"); } @@ -249,6 +255,7 @@ namespace ICSharpCode.Reports.Core { /// with /// this is an easy way to ask the report for desired paramaters public static ReportParameters LoadParameters (string fileName) { + Console.WriteLine("ReportEngine:LoadParameters"); if (String.IsNullOrEmpty(fileName)) { throw new ArgumentNullException("fileName"); } @@ -274,6 +281,7 @@ namespace ICSharpCode.Reports.Core { /// /// public static ReportModel LoadReportModel (string fileName) { + Console.WriteLine("ReportEngine:LoadReportModel_1"); if (String.IsNullOrEmpty(fileName)) { throw new ArgumentNullException("fileName"); } @@ -291,6 +299,7 @@ namespace ICSharpCode.Reports.Core { if (stream == null) { throw new ArgumentNullException("stream"); } + Console.WriteLine("ReportEngine:LoadReportModel_2"); var doc = new XmlDocument(); doc.Load(stream); return LoadModel(doc); @@ -299,6 +308,7 @@ namespace ICSharpCode.Reports.Core { static ReportModel LoadModel(XmlDocument doc) { + Console.WriteLine("ReportEngine:LoadModel"); BaseItemLoader loader = new BaseItemLoader(); object root = loader.Load(doc.DocumentElement); @@ -316,6 +326,7 @@ namespace ICSharpCode.Reports.Core { public void PreviewStandardReport (string fileName,ReportParameters reportParameters) { + Console.WriteLine("ReportEngine:PreviewStandardReport"); if (String.IsNullOrEmpty(fileName)) { throw new ArgumentNullException("fileName"); } @@ -336,6 +347,7 @@ namespace ICSharpCode.Reports.Core { public void PreviewPushDataReport (string fileName,DataTable dataTable,ReportParameters reportParameters) { + Console.WriteLine("ReportEngine:PreviewPushDataReport_1"); if (String.IsNullOrEmpty(fileName)) { throw new ArgumentNullException("fileName"); } @@ -358,6 +370,7 @@ namespace ICSharpCode.Reports.Core { public void PreviewPushDataReport (string fileName,IList list,ReportParameters reportParameters) { + Console.WriteLine("ReportEngine:PreviewPushDataReport_2"); if (String.IsNullOrEmpty(fileName)) { throw new ArgumentNullException("fileName"); } @@ -392,6 +405,7 @@ namespace ICSharpCode.Reports.Core { public static IReportCreator CreatePageBuilder (string fileName, ReportParameters reportParameters) { + Console.WriteLine("ReportEngine:CreatePageBuilder_1"); if (String.IsNullOrEmpty(fileName)) { throw new ArgumentNullException("fileName"); } @@ -437,6 +451,7 @@ namespace ICSharpCode.Reports.Core { DataSet dataSet, ReportParameters reportParameter) { + Console.WriteLine("ReportEngine:CreatePageBuilder_2"); if (reportModel == null) { throw new ArgumentNullException("reportModel"); } @@ -460,6 +475,7 @@ namespace ICSharpCode.Reports.Core { DataTable dataTable, ReportParameters reportParameters) { + Console.WriteLine("ReportEngine:CreatePageBuilder_3"); if (reportModel == null) { throw new ArgumentNullException("reportModel"); } @@ -488,6 +504,7 @@ namespace ICSharpCode.Reports.Core { IList list, ReportParameters reportParameters) { + Console.WriteLine("ReportEngine:CreatePageBuilder_4"); if (reportModel == null) { throw new ArgumentNullException("reportModel"); } @@ -510,6 +527,7 @@ namespace ICSharpCode.Reports.Core { #region Printing private static void ReportToPrinter (AbstractRenderer renderer,IReportModel model) { + Console.WriteLine("ReportEngine:reportToPrinter"); if (renderer == null) { throw new ArgumentNullException("renderer"); } @@ -550,6 +568,7 @@ namespace ICSharpCode.Reports.Core { // public void PrintStandardReport (string fileName,ReportParameters reportParameters) { + Console.WriteLine("ReportEngine:PrintStandardReport"); if (String.IsNullOrEmpty(fileName)) { throw new ArgumentNullException("fileName"); } @@ -579,6 +598,7 @@ namespace ICSharpCode.Reports.Core { /// public void PrintPushDataReport (string fileName,DataTable dataTable) { + Console.WriteLine("ReportEngine:PrintPushDataReport_1"); if (String.IsNullOrEmpty(fileName)) { throw new ArgumentNullException("fileName"); } @@ -597,6 +617,7 @@ namespace ICSharpCode.Reports.Core { public void PrintPushDataReport (string fileName,DataTable dataTable, ReportParameters reportParameters) { + Console.WriteLine("ReportEngine:PrintPushDataReport_2"); if (String.IsNullOrEmpty(fileName)) { throw new ArgumentNullException("fileName"); } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Xml/BaseItemLoader.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Xml/BaseItemLoader.cs index bd761c0c4b..a2a8ab4262 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Xml/BaseItemLoader.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Xml/BaseItemLoader.cs @@ -9,7 +9,9 @@ namespace ICSharpCode.Reports.Core { protected override Type GetTypeByName(string ns, string name) { + Console.WriteLine("BaseItemLoader - GetTypeByName {0}",name); return typeof(BaseSection).Assembly.GetType(typeof(BaseSection).Namespace + "." + name); } } } + \ No newline at end of file diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Xml/MycroParser.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Xml/MycroParser.cs index 6047a6717e..df5964f9c2 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Xml/MycroParser.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Xml/MycroParser.cs @@ -48,6 +48,7 @@ namespace ICSharpCode.Reports.Core // Trace.Assert(t != null, "Type "+cname+" could not be determined."); // Debug.WriteLine("Looking for " + cname + " and got " + t.FullName); + Console.WriteLine("Looking for " + cname + " and got " + t.FullName); try { ret=Activator.CreateInstance(t); @@ -200,6 +201,7 @@ namespace ICSharpCode.Reports.Core void SetPropertyToString(object obj, PropertyInfo pi, string value) { + Console.WriteLine("MP - SetPropertyToString {0} - {1}",pi.Name,value.ToString()); // it's string, so use a type converter. TypeConverter tc=TypeDescriptor.GetConverter(pi.PropertyType); try