Browse Source

Cleanup, set C compiling Options to 'any processor (prefer 64 bit)

reports
Peter Forstmeier 13 years ago
parent
commit
52a13d7ada
  1. 10
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/ICSharpCode.Reports.Addin.csproj
  2. 17
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Commands/ViewCommands.cs
  3. 12
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/InternalReportLoader.cs
  4. 4
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDefinitionDeserializer.cs
  5. 7
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDesignerGenerator.cs
  6. 4
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDesignerLoader.cs
  7. 10
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportDesignerView.cs
  8. 3
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Xml/ReportDefinitionParser.cs
  9. 10
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj
  10. 31
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportEngine.cs
  11. 2
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Xml/BaseItemLoader.cs
  12. 2
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Xml/MycroParser.cs

10
src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/ICSharpCode.Reports.Addin.csproj

@ -12,10 +12,10 @@ @@ -12,10 +12,10 @@
<RegisterForComInterop>False</RegisterForComInterop>
<GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
<BaseAddress>125829120</BaseAddress>
<PlatformTarget>x86</PlatformTarget>
<PlatformTarget>AnyCPU</PlatformTarget>
<FileAlignment>4096</FileAlignment>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<OutputPath>..\..\..\..\..\AddIns\Misc\SharpDevelopReports\</OutputPath>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<SourceAnalysisOverrideSettingsFile>"C:\Program Files\SharpDevelop\bin\..\AddIns\AddIns\Misc\SourceAnalysis\Settings.SourceAnalysis"</SourceAnalysisOverrideSettingsFile>
@ -36,6 +36,8 @@ @@ -36,6 +36,8 @@
<BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<NoWin32Manifest>False</NoWin32Manifest>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<Optimize>False</Optimize>
@ -46,6 +48,7 @@ @@ -46,6 +48,7 @@
<StartAction>Project</StartAction>
<StartProgram>..\..\..\..\..\bin\SharpDevelop.exe</StartProgram>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<Optimize>True</Optimize>
@ -55,6 +58,9 @@ @@ -55,6 +58,9 @@
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
<Prefer32Bit>False</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="itextsharp">
<HintPath>..\Libraries\itextsharp.dll</HintPath>

17
src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Commands/ViewCommands.cs

@ -24,30 +24,33 @@ namespace ICSharpCode.Reports.Addin.Commands @@ -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);
}

12
src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/InternalReportLoader.cs

@ -6,9 +6,9 @@ using System.ComponentModel; @@ -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 @@ -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 @@ -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,6 +58,7 @@ namespace ICSharpCode.Reports.Addin @@ -55,6 +58,7 @@ namespace ICSharpCode.Reports.Addin
}
}
private void UpdateStatusbar ()
{
string message;
@ -63,7 +67,7 @@ namespace ICSharpCode.Reports.Addin @@ -63,7 +67,7 @@ namespace ICSharpCode.Reports.Addin
} else {
message = String.Format("Load Report <{0}> ...",Path.GetFileName(this.generator.ViewContent.PrimaryFile.FileName));
}
SharpDevelop.Gui.WorkbenchSingleton.StatusBar.SetMessage(message);
SD.StatusBar.SetMessage(message);
}

4
src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDefinitionDeserializer.cs

@ -32,6 +32,7 @@ namespace ICSharpCode.Reports.Addin @@ -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 @@ -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 @@ -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();

7
src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDesignerGenerator.cs

@ -25,6 +25,7 @@ namespace ICSharpCode.Reports.Addin @@ -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 @@ -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 @@ -56,13 +58,14 @@ namespace ICSharpCode.Reports.Addin
public IEnumerable<OpenedFile> 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 @@ -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);

4
src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/DesignerBinding/ReportDesignerLoader.cs

@ -10,7 +10,6 @@ using System.Xml; @@ -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 @@ -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 @@ -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 @@ -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<Type, Type>();

10
src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportDesignerView.cs

@ -69,6 +69,7 @@ namespace ICSharpCode.Reports.Addin @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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);

3
src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/Xml/ReportDefinitionParser.cs

@ -52,7 +52,7 @@ namespace ICSharpCode.Reports.Addin @@ -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 @@ -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);

10
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj

@ -12,10 +12,10 @@ @@ -12,10 +12,10 @@
<RegisterForComInterop>False</RegisterForComInterop>
<GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
<BaseAddress>123731968</BaseAddress>
<PlatformTarget>x86</PlatformTarget>
<PlatformTarget>AnyCPU</PlatformTarget>
<FileAlignment>4096</FileAlignment>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<SourceAnalysisOverrideSettingsFile>"C:\Program Files\SharpDevelop\bin\..\AddIns\AddIns\Misc\SourceAnalysis\Settings.SourceAnalysis"</SourceAnalysisOverrideSettingsFile>
@ -37,6 +37,8 @@ @@ -37,6 +37,8 @@
<BootstrapperEnabled>true</BootstrapperEnabled>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<NoWin32Manifest>False</NoWin32Manifest>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<Optimize>False</Optimize>
@ -44,6 +46,7 @@ @@ -44,6 +46,7 @@
<DebugSymbols>true</DebugSymbols>
<DebugType>Full</DebugType>
<CheckForOverflowUnderflow>True</CheckForOverflowUnderflow>
<BaseIntermediateOutputPath>obj\</BaseIntermediateOutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<Optimize>True</Optimize>
@ -52,6 +55,9 @@ @@ -52,6 +55,9 @@
<DebugType>None</DebugType>
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
</PropertyGroup>
<PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
<Prefer32Bit>False</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Irony">
<HintPath>..\Libraries\Irony.dll</HintPath>

31
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportEngine.cs

@ -38,6 +38,7 @@ namespace ICSharpCode.Reports.Core { @@ -38,6 +38,7 @@ namespace ICSharpCode.Reports.Core {
public ReportEngine()
{
Console.WriteLine("reportEngine");
}
#endregion
@ -96,6 +97,7 @@ namespace ICSharpCode.Reports.Core { @@ -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 { @@ -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 { @@ -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 { @@ -162,8 +166,9 @@ namespace ICSharpCode.Reports.Core {
/// <returns></returns>
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 { @@ -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 { @@ -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 { @@ -249,6 +255,7 @@ namespace ICSharpCode.Reports.Core {
/// with <see cref="SqlParameters">
/// this is an easy way to ask the report for desired paramaters</see></summary>
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 { @@ -274,6 +281,7 @@ namespace ICSharpCode.Reports.Core {
/// <param name="fileName"></param>
/// <returns><see cref="ReportModel"></see></returns>
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 { @@ -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 { @@ -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 { @@ -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 { @@ -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 { @@ -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 { @@ -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 { @@ -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 { @@ -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 { @@ -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 { @@ -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 { @@ -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 { @@ -579,6 +598,7 @@ namespace ICSharpCode.Reports.Core {
/// <param name="dataTable"></param>
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 { @@ -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");
}

2
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Xml/BaseItemLoader.cs

@ -9,7 +9,9 @@ namespace ICSharpCode.Reports.Core @@ -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);
}
}
}

2
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Xml/MycroParser.cs

@ -48,6 +48,7 @@ namespace ICSharpCode.Reports.Core @@ -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 @@ -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

Loading…
Cancel
Save