From 287b0456f4a8e12a38b339bfdf884caad911566c Mon Sep 17 00:00:00 2001 From: Peter Forstmeier Date: Thu, 18 Sep 2014 20:27:21 +0200 Subject: [PATCH] designer can generate Landscape Report's --- .../src/Designer/ReportSettingsDesigner.cs | 2 +- .../src/Designer/RootReportModel.cs | 24 +------------------ .../src/DesignerBinding/DesignerGenerator.cs | 1 - .../src/ReportWizard/ReportGenerator.cs | 7 +++--- .../Src/DataManager/DataCollection.cs | 2 +- .../Src/Items/ReportSettings.cs | 7 +++--- 6 files changed, 10 insertions(+), 33 deletions(-) diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Designer/ReportSettingsDesigner.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Designer/ReportSettingsDesigner.cs index fada28e3f6..8c93555c6c 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Designer/ReportSettingsDesigner.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Designer/ReportSettingsDesigner.cs @@ -17,7 +17,7 @@ namespace ICSharpCode.Reporting.Addin.Designer /// class ReportSettingsDesigner:ComponentDesigner { - static string settingsName = "ReportSettings"; + const string settingsName = "ReportSettings"; public ReportSettingsDesigner() { } diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Designer/RootReportModel.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Designer/RootReportModel.cs index d27d837fcb..596503d6da 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Designer/RootReportModel.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Designer/RootReportModel.cs @@ -44,7 +44,7 @@ namespace ICSharpCode.Reporting.Addin.Designer void PrintMargin( Graphics graphics) { - string header = String.Format(System.Globalization.CultureInfo.CurrentCulture, + var header = String.Format(System.Globalization.CultureInfo.CurrentCulture, "[Size : {0}] [Landscape : {1}] [Bounds : {2}]", Page.Size, Landscape, PageMargin); using (var font = DesignerGlobals.DesignerFont){ @@ -66,28 +66,6 @@ namespace ICSharpCode.Reporting.Addin.Designer } - void old_PrintMargin( Graphics graphics) - { - string header = String.Format(System.Globalization.CultureInfo.CurrentCulture, - "[Size : {0}] [Landscape : {1}] [Bounds : {2}]", - this.Page,this.Landscape,this.PageMargin); - using (var font = DesignerGlobals.DesignerFont){ - SizeF size = graphics.MeasureString(header,font); - graphics.DrawString(header,font, - new SolidBrush(Color.LightGray), - new Rectangle(PageMargin.Left + 100, - this.PageMargin.Top - (int)font.GetHeight() - 3, - (int)size.Width, - (int)size.Height)); - - var rect = new Rectangle(PageMargin.Left - 2,PageMargin.Top - 2, - Page.Width - PageMargin.Left - PageMargin.Right + 2, - Size.Height - PageMargin.Top - PageMargin.Bottom + 2); - graphics.DrawRectangle(new Pen(Color.LightGray,1),rect); - } - } - - public Margins PageMargin {get;set;} public Rectangle Page {get;set;} diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignerBinding/DesignerGenerator.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignerBinding/DesignerGenerator.cs index 6cde4855fa..f83b380e97 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignerBinding/DesignerGenerator.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignerBinding/DesignerGenerator.cs @@ -80,7 +80,6 @@ namespace ICSharpCode.Reporting.Addin.DesignerBinding foreach (var component in viewContent.Host.Container.Components) { var section = component as BaseSection; if (section != null) { -// reportDesignerWriter.Save(component,xml); reportDesignerWriter.Save(section,xml); } } diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/ReportGenerator.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/ReportGenerator.cs index 0a83527a3c..a44abbce69 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/ReportGenerator.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/ReportGenerator.cs @@ -46,20 +46,20 @@ namespace ICSharpCode.Reporting.Addin.ReportWizard void CreateFormSheetReport(ReportWizardContext context) { - GenerateBaseSettings(context); + ReportModel.ReportSettings = GenerateBaseSettings(context); CreateReportHeader(context); } void CreateDataReport(ReportWizardContext context) { - GenerateBaseSettings(context); + ReportModel.ReportSettings = GenerateBaseSettings(context); CreateReportHeader(context); CreatePageHeader(context); CreateDetailsSection(context); CreatePageFooter (); } - void GenerateBaseSettings (ReportWizardContext context) { + ReportSettings GenerateBaseSettings (ReportWizardContext context) { var pageOneContext = (PageOneContext)context.PageOneContext; var reportSettings = ReportModel.ReportSettings; reportSettings.DataModel = pageOneContext.DataModel; @@ -67,6 +67,7 @@ namespace ICSharpCode.Reporting.Addin.ReportWizard reportSettings.Landscape = !pageOneContext.Legal; reportSettings.ReportName = pageOneContext.ReportName; reportSettings.ReportType = pageOneContext.ReportType; + return reportSettings; } diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataManager/DataCollection.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataManager/DataCollection.cs index b069aeb09d..e79192a7b2 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataManager/DataCollection.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataManager/DataCollection.cs @@ -208,7 +208,7 @@ namespace ICSharpCode.Reporting.DataManager } [DebuggerStepThrough] - IEnumerator System.Collections.IEnumerable.GetEnumerator() + IEnumerator IEnumerable.GetEnumerator() { return list.GetEnumerator(); } diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Items/ReportSettings.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Items/ReportSettings.cs index c10f13ffe3..5f3bfe1f7d 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Items/ReportSettings.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Items/ReportSettings.cs @@ -162,11 +162,10 @@ namespace ICSharpCode.Reporting.Items get { if (!Landscape) { return pageSize; - } else { - return new Size(pageSize.Height,pageSize.Width); } - } - set { pageSize = value; } + return new Size(pageSize.Height, pageSize.Width); + } +// set { pageSize = value; } }