pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Add patches from Alex Rednic , center page in ReportViewer, better drawing of bitmap 

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@5502 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
pull/1/head
Peter Forstmeier 16 years ago
parent
fa8cbc56ff
commit
f39aff62c8
4 changed files with 83 additions and 65 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 37
      samples/SharpDevelopReports/SampleReports/Ilist/ContributorsList.srd
  2. 35
      samples/SharpDevelopReports/SampleReports/ProviderIndependent/NoConnectionReport.srd
  3. 9
      samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs
  4. 67
      src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs

37
samples/SharpDevelopReports/SampleReports/Ilist/ContributorsList.srd
Unescape View File

@ -2,28 +2,27 @@ @@ -2,28 +2,27 @@
<ReportModel>
<ReportSettings>
<ReportSettings>
<GridSize>8, 8</GridSize>
<PageSize>827, 1169</PageSize>
<CommandText />
<Landscape>False</Landscape>
<GroupColumnsCollection />
<RightMargin>50</RightMargin>
<NoDataMessage>No Data for this Report</NoDataMessage>
<DefaultFont>Microsoft Sans Serif, 10pt</DefaultFont>
<ReportType>DataReport</ReportType>
<DataModel>PushData</DataModel>
<RightMargin>50</RightMargin>
<UseStandardPrinter>True</UseStandardPrinter>
<CommandType>Text</CommandType>
<GraphicsUnit>Millimeter</GraphicsUnit>
<TopMargin>50</TopMargin>
<ConnectionString />
<Padding>5, 5, 5, 5</Padding>
<LeftMargin>50</LeftMargin>
<SortColumnCollection />
<DataModel>PushData</DataModel>
<BottomMargin>50</BottomMargin>
<AvailableFieldsCollection />
<ReportName>Report1</ReportName>
<NoDataMessage>No Data for this Report</NoDataMessage>
<LeftMargin>50</LeftMargin>
<PageSize>827, 1169</PageSize>
<Padding>5, 5, 5, 5</Padding>
<BottomMargin>50</BottomMargin>
<CommandType>Text</CommandType>
<ParameterCollection />
<Landscape>False</Landscape>
<ReportName>Report1</ReportName>
<TopMargin>50</TopMargin>
<GroupColumnsCollection />
<GraphicsUnit>Millimeter</GraphicsUnit>
<CommandText />
<ReportType>DataReport</ReportType>
<ConnectionString />
</ReportSettings>
</ReportSettings>
<SectionCollection>
@ -87,8 +86,8 @@ @@ -87,8 +86,8 @@
<Size>661, 42</Size>
<ScaleImageToSize>False</ScaleImageToSize>
<BackColor>Window</BackColor>
<RelativeFileName>D:\Reporting3.0_branches\SharpDevelop\samples\SharpDevelopReports\SampleReports\Logos\Bannerbeige2.gif</RelativeFileName>
<ImageFileName>D:\Reporting3.0_branches\SharpDevelop\samples\SharpDevelopReports\SampleReports\Logos\Bannerbeige2.gif</ImageFileName>
<RelativeFileName>..\Logos\Bannerbeige2.gif</RelativeFileName>
<ImageFileName>D:\SharpDevelop3.0_CHECKOUT\SharpDevelop\samples\SharpDevelopReports\SampleReports\Logos\Bannerbeige2.gif</ImageFileName>
</BaseImageItem>
<BaseLineItem>
<StartLineCap>Flat</StartLineCap>

35
samples/SharpDevelopReports/SampleReports/ProviderIndependent/NoConnectionReport.srd
Unescape View File

@ -2,25 +2,11 @@ @@ -2,25 +2,11 @@
<ReportModel>
<ReportSettings>
<ReportSettings>
<GridSize>8, 8</GridSize>
<PageSize>827, 1169</PageSize>
<CommandText>SELECT * FROM Kategorien</CommandText>
<Landscape>False</Landscape>
<GroupColumnsCollection />
<RightMargin>50</RightMargin>
<NoDataMessage>No Data for this Report</NoDataMessage>
<DefaultFont>Microsoft Sans Serif, 10pt</DefaultFont>
<ReportType>DataReport</ReportType>
<DataModel>PullData</DataModel>
<RightMargin>50</RightMargin>
<UseStandardPrinter>True</UseStandardPrinter>
<CommandType>Text</CommandType>
<GraphicsUnit>Millimeter</GraphicsUnit>
<TopMargin>50</TopMargin>
<ConnectionString />
<Padding>5, 5, 5, 5</Padding>
<LeftMargin>50</LeftMargin>
<SortColumnCollection />
<DataModel>PullData</DataModel>
<BottomMargin>50</BottomMargin>
<AvailableFieldsCollection>
<AbstractColumn>
<ColumnName>Kategorie-Nr</ColumnName>
@ -39,13 +25,26 @@ @@ -39,13 +25,26 @@
<DataTypeName>System.Byte[]</DataTypeName>
</AbstractColumn>
</AvailableFieldsCollection>
<ReportName>Report1</ReportName>
<NoDataMessage>No Data for this Report</NoDataMessage>
<LeftMargin>50</LeftMargin>
<PageSize>827, 1169</PageSize>
<Padding>5, 5, 5, 5</Padding>
<BottomMargin>50</BottomMargin>
<CommandType>Text</CommandType>
<ParameterCollection>
<BasicParameter>
<ParameterName>p1</ParameterName>
<ParameterValue>aaaaa</ParameterValue>
</BasicParameter>
</ParameterCollection>
<Landscape>False</Landscape>
<ReportName>Report1</ReportName>
<TopMargin>50</TopMargin>
<GroupColumnsCollection />
<GraphicsUnit>Millimeter</GraphicsUnit>
<CommandText>SELECT * FROM Kategorien</CommandText>
<ReportType>DataReport</ReportType>
<ConnectionString />
</ReportSettings>
</ReportSettings>
<SectionCollection>
@ -311,7 +310,7 @@ @@ -311,7 +310,7 @@
<BackColor>Gainsboro</BackColor>
<CanShrink>False</CanShrink>
<StringTrimming>None</StringTrimming>
<Text>'This Report contains : ' + count() + ' DataRows'</Text>
<Text>='This Report contains : ' + count() + ' DataRows'</Text>
<Location>5, 4</Location>
<ContentAlignment>MiddleCenter</ContentAlignment>
<Visible>True</Visible>

9
samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs
Unescape View File

@ -135,7 +135,7 @@ namespace SharpReportSamples @@ -135,7 +135,7 @@ namespace SharpReportSamples
{
this.RunProviderIndependent(reportName);
};
this.previewControl1.SetupAsynchron(reportName,parameters);
this.previewControl1.RunReport(reportName,parameters);
}
@ -152,7 +152,12 @@ namespace SharpReportSamples @@ -152,7 +152,12 @@ namespace SharpReportSamples
private void RunContributors (string fileName)
{
ReportModel model = ReportEngine.LoadReportModel(fileName);
// sorting is done here, but, be carefull, misspelled fieldnames will cause an exception
//ReportSettings settings = model.ReportSettings;
//settings.SortColumnCollection.Add(new SortColumn("First",System.ComponentModel.ListSortDirection.Ascending));
// Both variable declarations are valid
ContributorCollection contributorCollection = ContributorsReportData.CreateContributorsList();

67
src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs
Unescape View File

@ -128,11 +128,11 @@ namespace ICSharpCode.Reports.Core.ReportViewer @@ -128,11 +128,11 @@ namespace ICSharpCode.Reports.Core.ReportViewer
this.dataManager = DataManagerFactory.CreateDataManager(reportModel,parameters);
RunDataReport (reportModel,dataManager);
}
*/
}
*/
}
public void RunReport (ReportModel reportModel,DataTable dataTable,ReportParameters parameters)
public void RunReport (ReportModel reportModel,DataTable dataTable,ReportParameters parameters)
{
if (reportModel == null) {
throw new ArgumentNullException("reportModel");
@ -143,8 +143,8 @@ namespace ICSharpCode.Reports.Core.ReportViewer @@ -143,8 +143,8 @@ namespace ICSharpCode.Reports.Core.ReportViewer
RunReport (reportModel,DataManagerFactory.CreateDataManager(reportModel,dataTable));
}
[Obsolete("Use RunReport(reportModel,dataTable,parameters)")]
[Obsolete("Use RunReport(reportModel,dataTable,parameters)")]
public void SetupAsynchron (ReportModel reportModel,DataTable dataTable,ReportParameters parameters)
{
RunReport(reportModel,dataTable,parameters);
@ -156,7 +156,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer @@ -156,7 +156,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer
throw new ArgumentNullException("dataTable");
}
SetupAsynchron (reportModel,DataManagerFactory.CreateDataManager(reportModel,dataTable));
*/
*/
}
@ -190,7 +190,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer @@ -190,7 +190,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer
this.SetupViewer(reportModel);
this.dataManager = dataManager;
RunDataReport(reportModel,dataManager);
*/
*/
}
#region Rendering
@ -218,7 +218,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer @@ -218,7 +218,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer
#endregion
#region Events from worker
@ -270,8 +270,8 @@ namespace ICSharpCode.Reports.Core.ReportViewer @@ -270,8 +270,8 @@ namespace ICSharpCode.Reports.Core.ReportViewer
default:
break;
}
}
*/
}
*/
#endregion
@ -353,6 +353,10 @@ namespace ICSharpCode.Reports.Core.ReportViewer @@ -353,6 +353,10 @@ namespace ICSharpCode.Reports.Core.ReportViewer
this.Invalidate(true);
this.Update();
this.AdjustDrawArea();
if ((this.pages != null) && (pageNumber < pages.Count))
{
this.ShowSelectedPage();
}
EventHelper.Raise<EventArgs>(this.PreviewLayoutChanged,this,e);
}
@ -437,9 +441,20 @@ namespace ICSharpCode.Reports.Core.ReportViewer @@ -437,9 +441,20 @@ namespace ICSharpCode.Reports.Core.ReportViewer
}
private void CenterDisplayPanel()
{
if (this.Width > drawingPanel.Width)
drawingPanel.Left = (this.Width - drawingPanel.Width) / 2;
else
drawingPanel.Left = 3;
}
private void DrawingPanelPaint(object sender, PaintEventArgs e)
{
e.Graphics.Clear(this.drawingPanel.BackColor);
CenterDisplayPanel();
if (this.bitmap != null) {
e.Graphics.DrawImage(this.bitmap,0,0);
}
@ -449,12 +464,12 @@ namespace ICSharpCode.Reports.Core.ReportViewer @@ -449,12 +464,12 @@ namespace ICSharpCode.Reports.Core.ReportViewer
private Bitmap CreateBitmap (ExporterPage page)
{
Bitmap bm = new Bitmap(this.drawingPanel.ClientSize.Width,this.drawingPanel.ClientSize.Height,System.Drawing.Imaging.PixelFormat.Format24bppRgb);
using (Graphics gr = Graphics.FromImage(bm)) {
// Reset Transform to org. Value
gr.Clear(this.drawingPanel.BackColor);
// this.Invalidate();
// this.Invalidate();
gr.ScaleTransform(1F,1F);
gr.Clear(this.drawingPanel.BackColor);
gr.ScaleTransform(this.zoom,this.zoom);
@ -573,9 +588,9 @@ namespace ICSharpCode.Reports.Core.ReportViewer @@ -573,9 +588,9 @@ namespace ICSharpCode.Reports.Core.ReportViewer
saveDialog.ValidateNames = true;
if(saveDialog.ShowDialog() == DialogResult.OK){
using (PdfRenderer pdfRenderer = PdfRenderer.CreateInstance(this.reportSettings,
this.pages,
saveDialog.FileName,
true)) {
this.pages,
saveDialog.FileName,
true)) {
pdfRenderer.Start();
pdfRenderer.RenderOutput();
pdfRenderer.End();
@ -622,7 +637,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer @@ -622,7 +637,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer
ReportModel m = ReportEngine.LoadReportModel(fileName);
this.SetupAsynchron(m,parameters);
}
*/
*/
/// <summary>
/// For internal use only
/// </summary>
@ -646,7 +661,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer @@ -646,7 +661,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer
}
this.bgw.RunWorkerAsync(reportModel);
}
*/
*/
#region PushModel - IList
/*
@ -677,7 +692,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer @@ -677,7 +692,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer
this.bgw.DoWork += new DoWorkEventHandler(PushPullWorker);
this.bgw.RunWorkerAsync(reportModel);
}
*/
*/
#endregion
/*
@ -689,7 +704,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer @@ -689,7 +704,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer
this.bgw.RunWorkerCompleted += new RunWorkerCompletedEventHandler(BackgroundWorker_RunWorkerCompleted);
this.bgw.ProgressChanged += new ProgressChangedEventHandler(BackgroundWorker_ProgressChanged);
}
*/
*/
#region Worker
@ -699,7 +714,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer @@ -699,7 +714,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer
BackgroundWorker worker = sender as BackgroundWorker;
e.Result = RunFormSheet((ReportModel)e.Argument,worker,e);
}
*/
*/
/*
private void PushPullWorker(object sender,DoWorkEventArgs e)
@ -707,7 +722,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer @@ -707,7 +722,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer
BackgroundWorker worker = sender as BackgroundWorker;
e.Result = RunDataReport((ReportModel)e.Argument,this.dataManager,worker,e);
}
*/
*/
#endregion
@ -726,15 +741,15 @@ namespace ICSharpCode.Reports.Core.ReportViewer @@ -726,15 +741,15 @@ namespace ICSharpCode.Reports.Core.ReportViewer
}
this.ShowCompleted();
}
*/
/*
*/
/*
private void BackgroundWorker_ProgressChanged(object sender, ProgressChangedEventArgs e)
{
this.pageNumber = e.ProgressPercentage;
this.ShowSelectedPage();
}
*/
*/
#endregion
#region Worker
@ -773,7 +788,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer @@ -773,7 +788,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer
}
return null;
}
*/
*/
/*
private object RunDataReport (ReportModel reportModel,IDataManager data,BackgroundWorker worker,DoWorkEventArgs e)
@ -799,7 +814,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer @@ -799,7 +814,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer
}
return null;
}
*/
*/
#endregion
#endregion

Write Preview
Loading…
Cancel
Save