Browse Source

designer can generate Landscape Report's

pull/567/head
Peter Forstmeier 11 years ago
parent
commit
287b0456f4
  1. 2
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Designer/ReportSettingsDesigner.cs
  2. 24
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Designer/RootReportModel.cs
  3. 1
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignerBinding/DesignerGenerator.cs
  4. 7
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/ReportGenerator.cs
  5. 2
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataManager/DataCollection.cs
  6. 7
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Items/ReportSettings.cs

2
src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Designer/ReportSettingsDesigner.cs

@ -17,7 +17,7 @@ namespace ICSharpCode.Reporting.Addin.Designer
/// </summary> /// </summary>
class ReportSettingsDesigner:ComponentDesigner class ReportSettingsDesigner:ComponentDesigner
{ {
static string settingsName = "ReportSettings"; const string settingsName = "ReportSettings";
public ReportSettingsDesigner() public ReportSettingsDesigner()
{ {
} }

24
src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Designer/RootReportModel.cs

@ -44,7 +44,7 @@ namespace ICSharpCode.Reporting.Addin.Designer
void PrintMargin( Graphics graphics) 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}]", "[Size : {0}] [Landscape : {1}] [Bounds : {2}]",
Page.Size, Landscape, PageMargin); Page.Size, Landscape, PageMargin);
using (var font = DesignerGlobals.DesignerFont){ 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 Margins PageMargin {get;set;}
public Rectangle Page {get;set;} public Rectangle Page {get;set;}

1
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) { foreach (var component in viewContent.Host.Container.Components) {
var section = component as BaseSection; var section = component as BaseSection;
if (section != null) { if (section != null) {
// reportDesignerWriter.Save(component,xml);
reportDesignerWriter.Save(section,xml); reportDesignerWriter.Save(section,xml);
} }
} }

7
src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/ReportWizard/ReportGenerator.cs

@ -46,20 +46,20 @@ namespace ICSharpCode.Reporting.Addin.ReportWizard
void CreateFormSheetReport(ReportWizardContext context) void CreateFormSheetReport(ReportWizardContext context)
{ {
GenerateBaseSettings(context); ReportModel.ReportSettings = GenerateBaseSettings(context);
CreateReportHeader(context); CreateReportHeader(context);
} }
void CreateDataReport(ReportWizardContext context) void CreateDataReport(ReportWizardContext context)
{ {
GenerateBaseSettings(context); ReportModel.ReportSettings = GenerateBaseSettings(context);
CreateReportHeader(context); CreateReportHeader(context);
CreatePageHeader(context); CreatePageHeader(context);
CreateDetailsSection(context); CreateDetailsSection(context);
CreatePageFooter (); CreatePageFooter ();
} }
void GenerateBaseSettings (ReportWizardContext context) { ReportSettings GenerateBaseSettings (ReportWizardContext context) {
var pageOneContext = (PageOneContext)context.PageOneContext; var pageOneContext = (PageOneContext)context.PageOneContext;
var reportSettings = ReportModel.ReportSettings; var reportSettings = ReportModel.ReportSettings;
reportSettings.DataModel = pageOneContext.DataModel; reportSettings.DataModel = pageOneContext.DataModel;
@ -67,6 +67,7 @@ namespace ICSharpCode.Reporting.Addin.ReportWizard
reportSettings.Landscape = !pageOneContext.Legal; reportSettings.Landscape = !pageOneContext.Legal;
reportSettings.ReportName = pageOneContext.ReportName; reportSettings.ReportName = pageOneContext.ReportName;
reportSettings.ReportType = pageOneContext.ReportType; reportSettings.ReportType = pageOneContext.ReportType;
return reportSettings;
} }

2
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataManager/DataCollection.cs

@ -208,7 +208,7 @@ namespace ICSharpCode.Reporting.DataManager
} }
[DebuggerStepThrough] [DebuggerStepThrough]
IEnumerator System.Collections.IEnumerable.GetEnumerator() IEnumerator IEnumerable.GetEnumerator()
{ {
return list.GetEnumerator(); return list.GetEnumerator();
} }

7
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Items/ReportSettings.cs

@ -162,11 +162,10 @@ namespace ICSharpCode.Reporting.Items
get { get {
if (!Landscape) { if (!Landscape) {
return pageSize; return pageSize;
} else {
return new Size(pageSize.Height,pageSize.Width);
} }
} return new Size(pageSize.Height, pageSize.Width);
set { pageSize = value; } }
// set { pageSize = value; }
} }

Loading…
Cancel
Save