From 22506e08aa2939ded59a2f9b12b74ab5ea3e34c6 Mon Sep 17 00:00:00 2001 From: Peter Forstmeier Date: Thu, 27 Jul 2006 07:26:45 +0000 Subject: [PATCH] More fixes from FxCop git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@1621 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../GraphicBased/ReportImageItem.cs | 8 +++-- .../SharpReport/SharpReportManager.cs | 10 +++---- .../SharpReportAddin/SharpReportView.cs | 8 ++--- .../BaseItems/Graphics/BaseImageItem.cs | 25 ++++++++++++++-- .../DataManager/DataManager.cs | 2 +- .../Factories/RendererFactory.cs | 4 +-- .../SharpReportCore/Globals/GlobalEnums.cs | 30 ++++++++----------- .../SharpReportCore/ReportModel.cs | 2 +- .../SharpReportCore/ReportSettings.cs | 18 +++++------ .../SharpReportCore/SharpReportEngine.cs | 18 +++++------ .../SharpReportWizard/GeneratorCommands.cs | 8 ++--- .../Generators/GenerateFormSheetReport.cs | 6 ++-- .../Generators/GeneratePullDataReport.cs | 6 ++-- .../Generators/GeneratePushDataReport.cs | 6 ++-- .../SharpReportWizard/ReportGenerator.cs | 8 ++--- .../WizardPanels/BaseSettingsPanel.cs | 6 ++-- 16 files changed, 92 insertions(+), 73 deletions(-) diff --git a/src/AddIns/Misc/SharpReport/SharpReport/ReportItems/GraphicBased/ReportImageItem.cs b/src/AddIns/Misc/SharpReport/SharpReport/ReportItems/GraphicBased/ReportImageItem.cs index 50441be8cf..d67a36ee92 100644 --- a/src/AddIns/Misc/SharpReport/SharpReport/ReportItems/GraphicBased/ReportImageItem.cs +++ b/src/AddIns/Misc/SharpReport/SharpReport/ReportItems/GraphicBased/ReportImageItem.cs @@ -9,16 +9,18 @@ //------------------------------------------------------------------------------ using System; - using System.ComponentModel; using System.Drawing; using System.Drawing.Design; +using System.Windows.Forms.Design; +using SharpReport.Designer; using SharpReportCore; + //using System.Windows.Forms; -using System.Windows.Forms.Design; -using SharpReport.Designer; + + /// /// /// diff --git a/src/AddIns/Misc/SharpReport/SharpReport/SharpReportManager.cs b/src/AddIns/Misc/SharpReport/SharpReport/SharpReportManager.cs index 0a4c3035d3..b177b0a7b5 100644 --- a/src/AddIns/Misc/SharpReport/SharpReport/SharpReportManager.cs +++ b/src/AddIns/Misc/SharpReport/SharpReport/SharpReportManager.cs @@ -51,7 +51,7 @@ namespace SharpReport{ #region privates private ConnectionObject BuildConnectionObject (ReportSettings settings) { - if (settings.ReportType == GlobalEnums.enmReportType.DataReport) { + if (settings.ReportType == GlobalEnums.ReportTypeEnum.DataReport) { try { if (settings.ConnectionString.Length > 0) { return new ConnectionObject(settings.ConnectionString); @@ -75,20 +75,20 @@ namespace SharpReport{ private ColumnCollection ReadColumnCollection() { ColumnCollection columnCollecion = new ColumnCollection(); switch (baseDesignerControl.ReportModel.DataModel) { - case GlobalEnums.enmPushPullModel.FormSheet: + case GlobalEnums.PushPullModelEnum.FormSheet: //Plain FormSheet we do nothing for the moment break; - case GlobalEnums.enmPushPullModel.PushData: + case GlobalEnums.PushPullModelEnum.PushData: //PushData columnCollecion = base.CollectFieldsFromModel(this.baseDesignerControl.ReportModel); break; - case GlobalEnums.enmPushPullModel.PullData: + case GlobalEnums.PushPullModelEnum.PullData: // PullData, query the Datasource and ask for the available Fields if (base.ConnectionObject == null) { base.ConnectionObject = this.BuildConnectionObject(baseDesignerControl.ReportModel.ReportSettings); } - if (this.baseDesignerControl.ReportModel.DataModel.Equals(GlobalEnums.enmPushPullModel.PullData)){ + if (this.baseDesignerControl.ReportModel.DataModel.Equals(GlobalEnums.PushPullModelEnum.PullData)){ try { using (DataManager dataManager = new DataManager(base.ConnectionObject, baseDesignerControl.ReportModel.ReportSettings)) { diff --git a/src/AddIns/Misc/SharpReport/SharpReportAddin/SharpReportView.cs b/src/AddIns/Misc/SharpReport/SharpReportAddin/SharpReportView.cs index 04f49bda2c..bd0035f639 100644 --- a/src/AddIns/Misc/SharpReport/SharpReportAddin/SharpReportView.cs +++ b/src/AddIns/Misc/SharpReport/SharpReportAddin/SharpReportView.cs @@ -231,15 +231,15 @@ namespace SharpReportAddin{ base.OnSaving(EventArgs.Empty); try { switch (designerControl.ReportModel.DataModel) { - case GlobalEnums.enmPushPullModel.FormSheet : { + case GlobalEnums.PushPullModelEnum.FormSheet : { PreviewStandartReport(standAlone); break; } - case GlobalEnums.enmPushPullModel.PullData:{ + case GlobalEnums.PushPullModelEnum.PullData:{ PreviewStandartReport(standAlone); break; } - case GlobalEnums.enmPushPullModel.PushData:{ + case GlobalEnums.PushPullModelEnum.PushData:{ PreviewPushReport (standAlone); break; } @@ -560,7 +560,7 @@ namespace SharpReportAddin{ public System.Drawing.Printing.PrintDocument PrintDocument { get { AbstractRenderer renderer; - if (this.designerControl.ReportModel.DataModel == GlobalEnums.enmPushPullModel.PushData) { + if (this.designerControl.ReportModel.DataModel == GlobalEnums.PushPullModelEnum.PushData) { renderer = reportManager.GetRendererForPushDataReports(this.designerControl.ReportModel, SharpReportView.DataSetFromFile()); diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/BaseItems/Graphics/BaseImageItem.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/BaseItems/Graphics/BaseImageItem.cs index 3dbf3d0aee..42a3d1be77 100644 --- a/src/AddIns/Misc/SharpReport/SharpReportCore/BaseItems/Graphics/BaseImageItem.cs +++ b/src/AddIns/Misc/SharpReport/SharpReportCore/BaseItems/Graphics/BaseImageItem.cs @@ -21,14 +21,18 @@ using System.Globalization; /// namespace SharpReportCore { + + public class BaseImageItem : SharpReportCore.BaseGraphicItem { /// - /// Default constructor - initializes all fields to default values + /// Default constructor /// + string fileName; Image image; bool scaleImageToSize; + GlobalEnums.ImageSourceEnum imageSource; public BaseImageItem():base() { } @@ -97,18 +101,35 @@ namespace SharpReportCore { set { fileName = value; this.image = null; + this.imageSource = GlobalEnums.ImageSourceEnum.File; LoadImage (fileName); base.NotifyPropertyChanged("FileName"); } } /// - /// The Image loaded from a File + /// The Image /// public virtual Image Image { get { return image; } + set { + this.fileName = String.Empty; + this.image = value; + this.imageSource = GlobalEnums.ImageSourceEnum.External; + base.NotifyPropertyChanged("Image"); + } + } + + /// + /// Where did the image come from + /// + /// + public GlobalEnums.ImageSourceEnum ImageSource { + get { + return imageSource; + } } /// diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/DataManager/DataManager.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/DataManager/DataManager.cs index c8c41bced1..e3bf26f106 100644 --- a/src/AddIns/Misc/SharpReport/SharpReportCore/DataManager/DataManager.cs +++ b/src/AddIns/Misc/SharpReport/SharpReportCore/DataManager/DataManager.cs @@ -124,7 +124,7 @@ namespace SharpReportCore { void CheckReportSettings(ReportSettings settings) { try { - if (settings.DataModel != GlobalEnums.enmPushPullModel.PushData) { + if (settings.DataModel != GlobalEnums.PushPullModelEnum.PushData) { SqlQueryChecker.Check(settings.CommandText); } diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/Factories/RendererFactory.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/Factories/RendererFactory.cs index 566ecaffb3..a509558da3 100644 --- a/src/AddIns/Misc/SharpReport/SharpReportCore/Factories/RendererFactory.cs +++ b/src/AddIns/Misc/SharpReport/SharpReportCore/Factories/RendererFactory.cs @@ -34,10 +34,10 @@ namespace SharpReportCore { public AbstractRenderer Create(ReportModel model,DataManager container) { if (model != null) { switch (model.ReportSettings.ReportType) { - case GlobalEnums.enmReportType.FormSheet :{ + case GlobalEnums.ReportTypeEnum.FormSheet :{ return new RenderFormSheetReport(model); } - case GlobalEnums.enmReportType.DataReport:{ + case GlobalEnums.ReportTypeEnum.DataReport:{ return new RenderDataReport(model,container); } } diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/Globals/GlobalEnums.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/Globals/GlobalEnums.cs index fbd9f390bd..913b54561c 100644 --- a/src/AddIns/Misc/SharpReport/SharpReportCore/Globals/GlobalEnums.cs +++ b/src/AddIns/Misc/SharpReport/SharpReportCore/Globals/GlobalEnums.cs @@ -26,11 +26,12 @@ namespace SharpReportCore { public class GlobalEnums : object { ///Technics to get the data - /// Push : report get'S a ready filld dataset + /// Push : report get's a ready filld dataset or something tah implements IList /// Pull : report has to fill data by themself - /// FormSheet : FormSheet report + /// FormSheet : FormSheet report, just labels and images are allowed /// - public enum enmPushPullModel { + /// + public enum PushPullModelEnum { PushData, PullData, FormSheet @@ -55,7 +56,7 @@ namespace SharpReportCore { /// FormSheet means a blank form with Labels, Lines and Checkboxes /// DataReport handles all Reports with Data /// - public enum enmReportType { + public enum ReportTypeEnum { FormSheet, DataReport, } @@ -70,19 +71,7 @@ namespace SharpReportCore { ReportPageFooter, ReportFooter } - /// - /// Output Format - /// - public enum enmRenderTo { - Text, - Pdf - } - - public enum ItemHorizontalAlign { - Left, - Center, - Right - } + /// ///Names of the different collections like Sorting,grouping etc @@ -95,6 +84,13 @@ namespace SharpReportCore { Groupings } + public enum ImageSourceEnum{ + File, +// DataBase, + External + } + + /// /// Convert any possible string-Value of a given enumeration /// type to its internal representation. diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/ReportModel.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/ReportModel.cs index 576a7e09a8..35511906ec 100644 --- a/src/AddIns/Misc/SharpReport/SharpReportCore/ReportModel.cs +++ b/src/AddIns/Misc/SharpReport/SharpReportCore/ReportModel.cs @@ -106,7 +106,7 @@ namespace SharpReportCore { // this Property is only a shortcut,,otherwise we have // to use 'ReportModel.reportSettings.DataModel' - public GlobalEnums.enmPushPullModel DataModel { + public GlobalEnums.PushPullModelEnum DataModel { get { return reportSettings.DataModel; } diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/ReportSettings.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/ReportSettings.cs index 376d6533ed..39113dbba8 100644 --- a/src/AddIns/Misc/SharpReport/SharpReportCore/ReportSettings.cs +++ b/src/AddIns/Misc/SharpReport/SharpReportCore/ReportSettings.cs @@ -48,8 +48,8 @@ namespace SharpReportCore{ GraphicsUnit.Point); - private GlobalEnums.enmReportType reportType; - private GlobalEnums.enmPushPullModel dataModel; + private GlobalEnums.ReportTypeEnum reportType; + private GlobalEnums.PushPullModelEnum dataModel; private AbstractParametersCollection reportParametersCollection; private ColumnCollection availableFields; @@ -81,8 +81,8 @@ namespace SharpReportCore{ sortingCollection = new ColumnCollection(); groupingsCollection = new ColumnCollection(); reportParametersCollection = new AbstractParametersCollection(); - this.reportType = GlobalEnums.enmReportType.FormSheet; - this.dataModel = GlobalEnums.enmPushPullModel.FormSheet; + this.reportType = GlobalEnums.ReportTypeEnum.FormSheet; + this.dataModel = GlobalEnums.PushPullModelEnum.FormSheet; } @@ -497,7 +497,7 @@ namespace SharpReportCore{ [Browsable(true), Category("Base Settings")] - public GlobalEnums.enmReportType ReportType { + public GlobalEnums.ReportTypeEnum ReportType { get { return reportType; } @@ -615,7 +615,7 @@ namespace SharpReportCore{ [Category("Data")] - public GlobalEnums.enmPushPullModel DataModel { + public GlobalEnums.PushPullModelEnum DataModel { get { return dataModel; } @@ -623,10 +623,10 @@ namespace SharpReportCore{ if (dataModel != value) { dataModel = value; - if (this.dataModel != GlobalEnums.enmPushPullModel.FormSheet) { - this.reportType = GlobalEnums.enmReportType.DataReport; + if (this.dataModel != GlobalEnums.PushPullModelEnum.FormSheet) { + this.reportType = GlobalEnums.ReportTypeEnum.DataReport; } else { - this.reportType = GlobalEnums.enmReportType.FormSheet; + this.reportType = GlobalEnums.ReportTypeEnum.FormSheet; } this.NotifyPropertyChanged("DataModel"); } diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/SharpReportEngine.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/SharpReportEngine.cs index fc544aa699..39b1198127 100644 --- a/src/AddIns/Misc/SharpReport/SharpReportCore/SharpReportEngine.cs +++ b/src/AddIns/Misc/SharpReport/SharpReportCore/SharpReportEngine.cs @@ -65,7 +65,7 @@ namespace SharpReportCore { #region ParameterHandling private bool CheckReportParameters (ReportModel model,ReportParameters reportParameters) { - if (model.ReportSettings.ReportType != GlobalEnums.enmReportType.FormSheet) { + if (model.ReportSettings.ReportType != GlobalEnums.ReportTypeEnum.FormSheet) { if (this.connectionObject == null) { if (!String.IsNullOrEmpty(model.ReportSettings.ConnectionString)) { @@ -136,14 +136,14 @@ namespace SharpReportCore { private ReportModel ValidatePushModel (string fileName) { ReportModel model = ModelFromFile (fileName); - if (model.ReportSettings.DataModel != GlobalEnums.enmPushPullModel.PushData) { + if (model.ReportSettings.DataModel != GlobalEnums.PushPullModelEnum.PushData) { throw new SharpReportException ("PrintPushdataReport: No valid ReportModel"); } return model; } private void InitDataContainer (ReportSettings settings) { - if (settings.ReportType == GlobalEnums.enmReportType.DataReport) { + if (settings.ReportType == GlobalEnums.ReportTypeEnum.DataReport) { if (settings.CommandText != null) { try { GrapSqlParameters (settings); @@ -191,11 +191,11 @@ namespace SharpReportCore { try { switch (model.ReportSettings.ReportType) { //FormSheets reports - case GlobalEnums.enmReportType.FormSheet: + case GlobalEnums.ReportTypeEnum.FormSheet: abstr = new RendererFactory().Create (model,null); break; //Databased reports - case GlobalEnums.enmReportType.DataReport : + case GlobalEnums.ReportTypeEnum.DataReport : InitDataContainer (model.ReportSettings); if (this.dataManager != null) { if (this.dataManager.DataSource != null) { @@ -252,10 +252,10 @@ namespace SharpReportCore { if (model == null) { throw new ArgumentNullException("model"); } - if (model.ReportSettings.ReportType != GlobalEnums.enmReportType.DataReport) { + if (model.ReportSettings.ReportType != GlobalEnums.ReportTypeEnum.DataReport) { throw new ArgumentException("SetupPushDataRenderer "); } - if (model.ReportSettings.DataModel != GlobalEnums.enmPushPullModel.PushData) { + if (model.ReportSettings.DataModel != GlobalEnums.PushPullModelEnum.PushData) { throw new ArgumentException("SetupPushDataRenderer "); } @@ -282,10 +282,10 @@ namespace SharpReportCore { if (model == null) { throw new ArgumentNullException("model"); } - if (model.ReportSettings.ReportType != GlobalEnums.enmReportType.DataReport) { + if (model.ReportSettings.ReportType != GlobalEnums.ReportTypeEnum.DataReport) { throw new ArgumentException("SetupPushDataRenderer "); } - if (model.ReportSettings.DataModel != GlobalEnums.enmPushPullModel.PushData) { + if (model.ReportSettings.DataModel != GlobalEnums.PushPullModelEnum.PushData) { throw new ArgumentException("SetupPushDataRenderer "); } diff --git a/src/AddIns/Misc/SharpReport/SharpReportWizard/GeneratorCommands.cs b/src/AddIns/Misc/SharpReport/SharpReportWizard/GeneratorCommands.cs index bf5255f6e4..d523b29cf7 100644 --- a/src/AddIns/Misc/SharpReport/SharpReportWizard/GeneratorCommands.cs +++ b/src/AddIns/Misc/SharpReport/SharpReportWizard/GeneratorCommands.cs @@ -64,20 +64,20 @@ namespace ReportGenerator{ } void DoCreate (ReportModel model) { - GlobalEnums.enmPushPullModel dataModel; + GlobalEnums.PushPullModelEnum dataModel; dataModel = model.DataModel; switch (dataModel) { - case GlobalEnums.enmPushPullModel.PullData: + case GlobalEnums.PushPullModelEnum.PullData: customizer.Set("DataRow",GlobalEnums.ReportItemType.ReportRowItem); GeneratePullDataReport generatePullDataReport = new GeneratePullDataReport(customizer,model); generatePullDataReport.GenerateReport(); break; - case GlobalEnums.enmPushPullModel.PushData: + case GlobalEnums.PushPullModelEnum.PushData: customizer.Set("DataRow",GlobalEnums.ReportItemType.ReportRowItem); GeneratePushDataReport generatePushDataReport = new GeneratePushDataReport(customizer,model); generatePushDataReport.GenerateReport(); break; - case GlobalEnums.enmPushPullModel.FormSheet: + case GlobalEnums.PushPullModelEnum.FormSheet: GenerateFormSheetReport generateFormSheetReport = new GenerateFormSheetReport (customizer,model); generateFormSheetReport.GenerateReport(); break; diff --git a/src/AddIns/Misc/SharpReport/SharpReportWizard/Generators/GenerateFormSheetReport.cs b/src/AddIns/Misc/SharpReport/SharpReportWizard/Generators/GenerateFormSheetReport.cs index 6f9b1c0d35..6fd1e98236 100644 --- a/src/AddIns/Misc/SharpReport/SharpReportWizard/Generators/GenerateFormSheetReport.cs +++ b/src/AddIns/Misc/SharpReport/SharpReportWizard/Generators/GenerateFormSheetReport.cs @@ -28,15 +28,15 @@ namespace ReportGenerator if (reportModel == null) { throw new ArgumentException("reportModel"); } - if (base.ReportModel.ReportSettings.DataModel != GlobalEnums.enmPushPullModel.FormSheet) { + if (base.ReportModel.ReportSettings.DataModel != GlobalEnums.PushPullModelEnum.FormSheet) { throw new ArgumentException ("Wrong DataModel in GeneratePullDataReport"); } base.ReportItemCollection.Clear(); } public override void GenerateReport() { - base.ReportModel.ReportSettings.ReportType = GlobalEnums.enmReportType.FormSheet; - base.ReportModel.ReportSettings.DataModel = GlobalEnums.enmPushPullModel.FormSheet; + base.ReportModel.ReportSettings.ReportType = GlobalEnums.ReportTypeEnum.FormSheet; + base.ReportModel.ReportSettings.DataModel = GlobalEnums.PushPullModelEnum.FormSheet; base.GenerateReport(); base.AdjustAllNames(); } diff --git a/src/AddIns/Misc/SharpReport/SharpReportWizard/Generators/GeneratePullDataReport.cs b/src/AddIns/Misc/SharpReport/SharpReportWizard/Generators/GeneratePullDataReport.cs index 6f09153e31..842934fa75 100644 --- a/src/AddIns/Misc/SharpReport/SharpReportWizard/Generators/GeneratePullDataReport.cs +++ b/src/AddIns/Misc/SharpReport/SharpReportWizard/Generators/GeneratePullDataReport.cs @@ -36,7 +36,7 @@ namespace ReportGenerator { throw new ArgumentException("reportModel"); } - if (base.ReportModel.ReportSettings.DataModel != GlobalEnums.enmPushPullModel.PullData) { + if (base.ReportModel.ReportSettings.DataModel != GlobalEnums.PushPullModelEnum.PullData) { throw new ArgumentException ("Wrong DataModel in GeneratePullDataReport"); } base.ReportItemCollection.Clear(); @@ -46,8 +46,8 @@ namespace ReportGenerator { #region ReportGenerator.IReportGenerator interface implementation public override void GenerateReport() { try { - base.ReportModel.ReportSettings.ReportType = GlobalEnums.enmReportType.DataReport; - base.ReportModel.ReportSettings.DataModel = GlobalEnums.enmPushPullModel.PullData; + base.ReportModel.ReportSettings.ReportType = GlobalEnums.ReportTypeEnum.DataReport; + base.ReportModel.ReportSettings.DataModel = GlobalEnums.PushPullModelEnum.PullData; this.ReportModel.ReportSettings.AvailableFieldsCollection = diff --git a/src/AddIns/Misc/SharpReport/SharpReportWizard/Generators/GeneratePushDataReport.cs b/src/AddIns/Misc/SharpReport/SharpReportWizard/Generators/GeneratePushDataReport.cs index b34fbab4fe..9252912bea 100644 --- a/src/AddIns/Misc/SharpReport/SharpReportWizard/Generators/GeneratePushDataReport.cs +++ b/src/AddIns/Misc/SharpReport/SharpReportWizard/Generators/GeneratePushDataReport.cs @@ -38,7 +38,7 @@ namespace ReportGenerator { if (reportModel == null) { throw new ArgumentException("reportModel"); } - if (base.ReportModel.ReportSettings.DataModel != GlobalEnums.enmPushPullModel.PushData) { + if (base.ReportModel.ReportSettings.DataModel != GlobalEnums.PushPullModelEnum.PushData) { throw new ArgumentException ("Wrong DataModel in GeneratePushReport"); } //we can't use the customizer here @@ -48,8 +48,8 @@ namespace ReportGenerator { public override void GenerateReport() { - base.ReportModel.ReportSettings.ReportType = GlobalEnums.enmReportType.DataReport; - base.ReportModel.ReportSettings.DataModel = GlobalEnums.enmPushPullModel.PushData; + base.ReportModel.ReportSettings.ReportType = GlobalEnums.ReportTypeEnum.DataReport; + base.ReportModel.ReportSettings.DataModel = GlobalEnums.PushPullModelEnum.PushData; base.ReportModel.ReportSettings.AvailableFieldsCollection = base.ReportGenerator.ColumnCollection; diff --git a/src/AddIns/Misc/SharpReport/SharpReportWizard/ReportGenerator.cs b/src/AddIns/Misc/SharpReport/SharpReportWizard/ReportGenerator.cs index 3eac71eefa..87daf7cf3c 100644 --- a/src/AddIns/Misc/SharpReport/SharpReportWizard/ReportGenerator.cs +++ b/src/AddIns/Misc/SharpReport/SharpReportWizard/ReportGenerator.cs @@ -42,11 +42,11 @@ namespace ReportGenerator { private string fileName; private string path; - private GlobalEnums.enmReportType reportType; + private GlobalEnums.ReportTypeEnum reportType; private GraphicsUnit graphicsUnit; //Database - private GlobalEnums.enmPushPullModel dataModel; + private GlobalEnums.PushPullModelEnum dataModel; private string connectionString; private string catalogName; @@ -125,7 +125,7 @@ namespace ReportGenerator { reportName = value; } } - public SharpReportCore.GlobalEnums.enmReportType ReportType { + public SharpReportCore.GlobalEnums.ReportTypeEnum ReportType { get { return reportType; } @@ -190,7 +190,7 @@ namespace ReportGenerator { } } - public SharpReportCore.GlobalEnums.enmPushPullModel DataModel { + public SharpReportCore.GlobalEnums.PushPullModelEnum DataModel { get { return dataModel; } diff --git a/src/AddIns/Misc/SharpReport/SharpReportWizard/WizardPanels/BaseSettingsPanel.cs b/src/AddIns/Misc/SharpReport/SharpReportWizard/WizardPanels/BaseSettingsPanel.cs index 5d1d20b245..4515433028 100644 --- a/src/AddIns/Misc/SharpReport/SharpReportWizard/WizardPanels/BaseSettingsPanel.cs +++ b/src/AddIns/Misc/SharpReport/SharpReportWizard/WizardPanels/BaseSettingsPanel.cs @@ -149,14 +149,14 @@ namespace ReportGenerator{ if (initDone) { if (this.radioPullModell.Checked == true) { base.NextWizardPanelID = "PullModel"; - generator.DataModel = GlobalEnums.enmPushPullModel.PullData; + generator.DataModel = GlobalEnums.PushPullModelEnum.PullData; GoOn(); } else if (this.radioPushModell.Checked == true){ base.NextWizardPanelID = "PushModel"; - generator.DataModel = GlobalEnums.enmPushPullModel.PushData; + generator.DataModel = GlobalEnums.PushPullModelEnum.PushData; GoOn(); } else if (this.radioFormSheet.Checked == true){ - generator.DataModel = GlobalEnums.enmPushPullModel.FormSheet; + generator.DataModel = GlobalEnums.PushPullModelEnum.FormSheet; base.EnableNext = false; base.IsLastPanel = true; }