diff --git a/src/AddIns/Misc/ICSharpCode.Reporting.Tests/Model/LoadPlainModelFixture.cs b/src/AddIns/Misc/ICSharpCode.Reporting.Tests/Model/LoadPlainModelFixture.cs index 240522094c..023109e9e8 100644 --- a/src/AddIns/Misc/ICSharpCode.Reporting.Tests/Model/LoadPlainModelFixture.cs +++ b/src/AddIns/Misc/ICSharpCode.Reporting.Tests/Model/LoadPlainModelFixture.cs @@ -36,6 +36,7 @@ namespace ICSharpCode.Reporting.Tests.Model Assert.IsNotNull(model); } + [Test] public void ReportSettingsFromPlainModel() { @@ -63,6 +64,7 @@ namespace ICSharpCode.Reporting.Tests.Model } + [SetUp] public void LoadFromStream() { diff --git a/src/AddIns/Misc/ICSharpCode.Reporting.Tests/Model/ReportSettingsFixture.cs b/src/AddIns/Misc/ICSharpCode.Reporting.Tests/Model/ReportSettingsFixture.cs index 33294d0770..bbf760e8fa 100644 --- a/src/AddIns/Misc/ICSharpCode.Reporting.Tests/Model/ReportSettingsFixture.cs +++ b/src/AddIns/Misc/ICSharpCode.Reporting.Tests/Model/ReportSettingsFixture.cs @@ -7,6 +7,7 @@ * To change this template use Tools | Options | Coding | Edit Standard Headers. */ using System; +using System.Drawing; using ICSharpCode.Reporting.Globals; using ICSharpCode.Reporting.Items; using NUnit.Framework; @@ -16,20 +17,35 @@ namespace ICSharpCode.Reporting.Tests [TestFixture] public class ReportSettingsFixture { + ReportSettings reportSettings; + [Test] public void DefaultConstructureShouldReturnStandardValues() { - ReportSettings rs = new ReportSettings(); - Assert.IsNotNull(rs,"Should not be 'null'"); - Assert.AreEqual(GlobalValues.DefaultReportName,rs.ReportName); + Assert.IsNotNull(reportSettings,"Should not be 'null'"); + Assert.AreEqual(GlobalValues.DefaultReportName,reportSettings.ReportName); } [Test] public void DefaultPageSize () { - ReportSettings rs = new ReportSettings(); - Assert.AreEqual(GlobalValues.DefaultPageSize,rs.PageSize); + Assert.AreEqual(GlobalValues.DefaultPageSize,reportSettings.PageSize); + } + + + [Test] + public void LandScape_True_Return_PageSize_For_LandScape () + { + reportSettings.Landscape = true; + var landscapeSize = new Size(Globals.GlobalValues.DefaultPageSize.Height, + Globals.GlobalValues.DefaultPageSize.Width); + Assert.That(reportSettings.PageSize,Is.EqualTo(landscapeSize)); + } + + [SetUp] + public void Setup () { + reportSettings = new ReportSettings(); } } } diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.csproj b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.csproj index 367c6921f8..4377114374 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.csproj +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.csproj @@ -7,8 +7,9 @@ Library ICSharpCode.Reporting ICSharpCode.Reporting - v4.0 - Client + v4.5 + + Properties @@ -46,6 +47,7 @@ + diff --git a/src/AddIns/Misc/Reporting/Src/Interfaces/IReportCreator.cs b/src/AddIns/Misc/Reporting/Src/Interfaces/IReportCreator.cs new file mode 100644 index 0000000000..822ab46345 --- /dev/null +++ b/src/AddIns/Misc/Reporting/Src/Interfaces/IReportCreator.cs @@ -0,0 +1,26 @@ +/* + * Created by SharpDevelop. + * User: Peter Forstmeier + * Date: 21.03.2013 + * Time: 20:06 + * + * To change this template use Tools | Options | Coding | Edit Standard Headers. + */ +using System; + +namespace ICSharpCode.Reporting.Interfaces +{ + /// + /// Description of IReportCreator. + /// + public interface IReportCreator + { + void BuildExportList (); +// PagesCollection Pages{get;} +// event EventHandler PageCreated; +// event EventHandler SectionRendering; +// event EventHandler GroupHeaderRendering; +// event EventHandler GroupFooterRendering; +// event EventHandler RowRendering; + } +} diff --git a/src/AddIns/Misc/Reporting/Src/Items/ReportSettings.cs b/src/AddIns/Misc/Reporting/Src/Items/ReportSettings.cs index d24b35f9ca..df55380756 100644 --- a/src/AddIns/Misc/Reporting/Src/Items/ReportSettings.cs +++ b/src/AddIns/Misc/Reporting/Src/Items/ReportSettings.cs @@ -20,7 +20,7 @@ namespace ICSharpCode.Reporting.Items public ReportSettings() { - this.PageSize = Globals.GlobalValues.DefaultPageSize; + this.pageSize = Globals.GlobalValues.DefaultPageSize; BaseValues(); } @@ -73,8 +73,23 @@ namespace ICSharpCode.Reporting.Items } } + private Size pageSize; + + public Size PageSize { + get { + if (!Landscape) { + return pageSize; + } else { + return new Size(pageSize.Height,pageSize.Width); + } + } + set { pageSize = value; } + } + +// [Category("Page Settings")] +// public Size PageSize {get;set;} // [Category("Page Settings")] - public Size PageSize {get;set;} + public bool Landscape {get;set;} } } diff --git a/src/AddIns/Misc/Reporting/Src/ReportingFactory.cs b/src/AddIns/Misc/Reporting/Src/ReportingFactory.cs index b33ba3f96f..fbdbabafc8 100644 --- a/src/AddIns/Misc/Reporting/Src/ReportingFactory.cs +++ b/src/AddIns/Misc/Reporting/Src/ReportingFactory.cs @@ -7,9 +7,12 @@ * To change this template use Tools | Options | Coding | Edit Standard Headers. */ using System; +using System.Collections.Generic; +using System.Collections; using System.IO; using System.Xml; +using ICSharpCode.Reporting.Interfaces; using ICSharpCode.Reporting.Items; using ICSharpCode.Reporting.Xml; @@ -25,7 +28,13 @@ namespace ICSharpCode.Reporting } - public ReportModel LoadReport (Stream stream) + public IReportCreator CreatePageBuilder (Stream stream, IList list) + { + return null; + } + + + internal ReportModel LoadReport (Stream stream) { Console.WriteLine("ReportEngine:LoadReportModel_2"); var doc = new XmlDocument(); 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 bb36419a6a..2410d019d0 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportEngine.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/ReportEngine.cs @@ -295,7 +295,7 @@ namespace ICSharpCode.Reports.Core { } - public static ReportModel LoadReportModel (Stream stream) { + internal static ReportModel LoadReportModel (Stream stream) { if (stream == null) { throw new ArgumentNullException("stream"); }