diff --git a/samples/SharpDevelopReports/src/SharpReportSamples/ContributorsList.cs b/samples/SharpDevelopReports/src/SharpReportSamples/ContributorsList.cs index da159c6444..4c616dc80a 100644 --- a/samples/SharpDevelopReports/src/SharpReportSamples/ContributorsList.cs +++ b/samples/SharpDevelopReports/src/SharpReportSamples/ContributorsList.cs @@ -19,17 +19,6 @@ namespace SharpReportSamples { /* This list is by no means exhaustive: - - - - - - - - - - - •Siegfried Pammer */ public static ContributorCollection CreateContributorsList () { @@ -59,6 +48,7 @@ namespace SharpReportSamples } } + public class Contributor { string last; string first; diff --git a/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.Designer.cs b/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.Designer.cs index d9004f05e9..594b89cc14 100644 --- a/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.Designer.cs +++ b/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.Designer.cs @@ -109,15 +109,13 @@ namespace SharpReportSamples // // previewControl1 // - this.previewControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); this.previewControl1.BackColor = System.Drawing.SystemColors.GradientActiveCaption; - this.previewControl1.Location = new System.Drawing.Point(68, 10); + this.previewControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.previewControl1.Location = new System.Drawing.Point(10, 10); this.previewControl1.Messages = null; this.previewControl1.Name = "previewControl1"; this.previewControl1.Padding = new System.Windows.Forms.Padding(5); - this.previewControl1.Size = new System.Drawing.Size(644, 424); + this.previewControl1.Size = new System.Drawing.Size(649, 449); this.previewControl1.TabIndex = 2; // // menuStrip2 diff --git a/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs b/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs index 008dce39c8..bba129dc31 100644 --- a/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs +++ b/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs @@ -142,13 +142,13 @@ namespace SharpReportSamples // List list = ContributorsReportData.CreateContributorsList(); // IDataManager dm = DataManager.CreateInstance(list,model.ReportSettings); - this.previewControl1.SectionRendering += new EventHandler(PushPrinting); +// this.previewControl1.SectionRendering += new EventHandler(PushPrinting); this.previewControl1.SetupAsynchron(model,dm); } - - + //Try this to react to SectionrenderEvent, + /* private void PushPrinting (object sender,SectionRenderEventArgs e) { @@ -179,7 +179,7 @@ namespace SharpReportSamples break; } } - + */ #endregion diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/SecondaryViews/ReportViewerSecondaryView.cs b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/SecondaryViews/ReportViewerSecondaryView.cs index 2bd5836d1d..e82385fba6 100644 --- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/SecondaryViews/ReportViewerSecondaryView.cs +++ b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/SecondaryViews/ReportViewerSecondaryView.cs @@ -25,7 +25,7 @@ namespace ICSharpCode.Reports.Addin { ReportDesignerLoader designerLoader; ICSharpCode.Reports.Core.ReportViewer.PreviewControl control; -// StandartPreviewManager reportManager; + public ReportViewerSecondaryView(ReportDesignerLoader designerLoader,IViewContent content):base(content) { diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/BaseItems/BaseDataItem.cs b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/BaseItems/BaseDataItem.cs index 09af995bbb..27e4a416fa 100644 --- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/BaseItems/BaseDataItem.cs +++ b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/BaseItems/BaseDataItem.cs @@ -120,17 +120,6 @@ namespace ICSharpCode.Reports.Core { } } - -// public string DataType -// { -// get { -// return dataType; -// } -// set { -// dataType = value; -// } -// } - /// /// Mappingname to Datasource /// diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs index f47aece8ca..4deba653ac 100644 --- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs +++ b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs @@ -90,10 +90,7 @@ namespace ICSharpCode.Reports.Core.Exporter if (exportLineBuilder != null) { - this.dataNavigator.Fill(row.Items); - ExportContainer lineItem = this.exportItemsConverter.ConvertToContainer(row); - BaseReportItem baseReportItem = row as BaseReportItem; this.exportItemsConverter.ParentLocation = baseReportItem.Location; diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs index d7d718ba28..79014aa730 100644 --- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs +++ b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs @@ -150,8 +150,8 @@ namespace ICSharpCode.Reports.Core.ReportViewer this.bgw = new BackgroundWorker(); this.bgw.WorkerReportsProgress = true; this.bgw.WorkerSupportsCancellation = true; - this.bgw.RunWorkerCompleted += new RunWorkerCompletedEventHandler(backgroundWorker1_RunWorkerCompleted); - this.bgw.ProgressChanged += new ProgressChangedEventHandler(backgroundWorker1_ProgressChanged); + this.bgw.RunWorkerCompleted += new RunWorkerCompletedEventHandler(BackgroundWorker_RunWorkerCompleted); + this.bgw.ProgressChanged += new ProgressChangedEventHandler(BackgroundWorker_ProgressChanged); } @@ -175,8 +175,10 @@ namespace ICSharpCode.Reports.Core.ReportViewer #endregion + #region WorkerEvents - private void backgroundWorker1_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e) + + private void BackgroundWorker_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e) { if (e.Error != null) { @@ -190,13 +192,14 @@ namespace ICSharpCode.Reports.Core.ReportViewer } - private void backgroundWorker1_ProgressChanged(object sender, ProgressChangedEventArgs e) + private void BackgroundWorker_ProgressChanged(object sender, ProgressChangedEventArgs e) { this.ShowSelectedPage(); } #endregion + #region Worker private object RunFormSheet (ReportModel reportModel,BackgroundWorker worker, DoWorkEventArgs e) { @@ -246,6 +249,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer ILayouter layouter = new Layouter(); IReportCreator reportCreator = DataPageBuilder.CreateInstance(reportModel,data,layouter); + //testcode to handle sectionrenderevent reportCreator.SectionRendering += new EventHandler(PushPrinting); reportCreator.PageCreated += delegate (Object sender,PageCreatedEventArgs ee) { @@ -258,12 +262,51 @@ namespace ICSharpCode.Reports.Core.ReportViewer return null; } + #endregion + + #region Events from worker private void PushPrinting (object sender, SectionRenderEventArgs e ) { Console.WriteLine ("ReportViewer - SectionRenderEventargs from <{0}> with {1} items ",e.Section.Name,e.Section.Items.Count); EventHelper.Raise(SectionRendering,this,e); } + //testcode to handle sectionrenderevent + + /* + private void PushPrinting (object sender,SectionRenderEventArgs e) + { + + switch (e.CurrentSection) { + case GlobalEnums.ReportSection.ReportHeader: + break; + + case GlobalEnums.ReportSection.ReportPageHeader: + break; + + case GlobalEnums.ReportSection.ReportDetail: + BaseRowItem ri = e.Section.Items[0] as BaseRowItem; + if (ri != null) { + BaseDataItem r = (BaseDataItem)ri.Items.Find("Kategoriename"); + if (r != null) { + r.DBValue = "xxxxxxx"; + } + } + + break; + case GlobalEnums.ReportSection.ReportPageFooter: + break; + + case GlobalEnums.ReportSection.ReportFooter: + break; + + default: + break; + } + } + */ + + #endregion void ShowCompleted() {