Browse Source

ReportViewer show evaluated pages

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@5474 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
pull/1/head
Peter Forstmeier 16 years ago
parent
commit
93c044b4ba
  1. 8
      samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs
  2. 5
      src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs

8
samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs

@ -94,7 +94,6 @@ namespace SharpReportSamples
private void UpdateStatusbar (string text) private void UpdateStatusbar (string text)
{ {
this.label1.Text = text; this.label1.Text = text;
} }
@ -115,8 +114,6 @@ namespace SharpReportSamples
} }
this.previewControl1.PreviewLayoutChanged += delegate (object sender, EventArgs e) this.previewControl1.PreviewLayoutChanged += delegate (object sender, EventArgs e)
{ {
System.Console.WriteLine("---------");
System.Console.WriteLine("from event");
this.RunStandardReport(reportName); this.RunStandardReport(reportName);
}; };
this.previewControl1.RunReport(reportName,parameters); this.previewControl1.RunReport(reportName,parameters);
@ -167,13 +164,10 @@ namespace SharpReportSamples
this.previewControl1.PreviewLayoutChanged += delegate (object sender, EventArgs e) this.previewControl1.PreviewLayoutChanged += delegate (object sender, EventArgs e)
{ {
System.Console.WriteLine("---------");
System.Console.WriteLine("from event");
this.RunContributors(fileName); this.RunContributors(fileName);
}; };
this.previewControl1.RunReport(model,dataManager); this.previewControl1.RunReport(model,dataManager);
} }
//Try this to react to SectionrenderEvent, //Try this to react to SectionrenderEvent,
@ -261,8 +255,6 @@ namespace SharpReportSamples
} }
} }
} }
*/ */
} }
} }

5
src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs

@ -74,8 +74,8 @@ namespace ICSharpCode.Reports.Core.ReportViewer
if (String.IsNullOrEmpty(fileName)) { if (String.IsNullOrEmpty(fileName)) {
throw new ArgumentNullException("fileName"); throw new ArgumentNullException("fileName");
} }
ReportModel m = ReportEngine.LoadReportModel(fileName); ReportModel model = ReportEngine.LoadReportModel(fileName);
this.SetupAsynchron(m,parameters); this.RunReport(model,parameters);
} }
[Obsolete("Use RunReport (string fileName,ReportParameters parameters)" )] [Obsolete("Use RunReport (string fileName,ReportParameters parameters)" )]
@ -313,6 +313,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer
this.printButton.Enabled = true; this.printButton.Enabled = true;
this.pdfButton.Enabled = true; this.pdfButton.Enabled = true;
this.UpdateToolStrip(); this.UpdateToolStrip();
ShowSelectedPage();
} }
#endregion #endregion

Loading…
Cancel
Save