diff --git a/samples/SharpDevelopReports/SampleReports/Customized/EventLog.srd b/samples/SharpDevelopReports/SampleReports/Customized/EventLog.srd
index 8a152ea70e..b40166bb3b 100644
--- a/samples/SharpDevelopReports/SampleReports/Customized/EventLog.srd
+++ b/samples/SharpDevelopReports/SampleReports/Customized/EventLog.srd
@@ -27,7 +27,7 @@
- 727, 82
+ 727, 91
ReportHeader
False
0
@@ -53,12 +53,12 @@
TopCenter
True
False
- Microsoft Sans Serif, 8.25pt
+ Microsoft Sans Serif, 15pt
False
BaseTextItem2147483643
White
- 568, 20
+ 568, 33
ControlText
@@ -74,20 +74,37 @@
White
- 12, 13
+ 12, 3
BaseRowItem2
+
+ White
+ False
+ None
+ Image
+ 20, 7
+ TopCenter
+ True
+ False
+ Microsoft Sans Serif, 12pt
+ False
+
+ BaseTextItem2147483642
+ White
+ 100, 20
+ ControlText
+
White
False
None
EntryType
135, 7
- TopLeft
+ TopCenter
True
False
- Microsoft Sans Serif, 8.25pt
+ Microsoft Sans Serif, 12pt
False
BaseTextItem2147483644
@@ -101,10 +118,10 @@
None
DateWritten
261, 7
- TopLeft
+ TopCenter
True
False
- Microsoft Sans Serif, 8.25pt
+ Microsoft Sans Serif, 12pt
False
BaseTextItem2147483645
@@ -121,7 +138,7 @@
TopLeft
True
False
- Microsoft Sans Serif, 8.25pt
+ Microsoft Sans Serif, 12pt
False
BaseTextItem2147483646
@@ -133,13 +150,13 @@
False
0
White
- 697, 30
+ 697, 44
White
True
Black
- 50, 147
+ 50, 156
False
@@ -156,7 +173,7 @@
BaseRowItem1
- File
+ Database
20, 7
BaseImageItem1
75, 53
@@ -228,7 +245,7 @@
Black
- 50, 222
+ 50, 231
False
@@ -238,8 +255,26 @@
0
0
White
-
- 50, 327
+
+
+ White
+ False
+ None
+ ='Page (' + Globals!PageNumber + ') of ( ' + Globals!TotalPages + ' ) Pages'
+ 403, 21
+ TopLeft
+ True
+ False
+ Microsoft Sans Serif, 8.25pt
+ False
+
+ ='Page ' + Global!PageNumber + 'of ' + Global!Pages + 'Pages'
+ White
+ 166, 20
+ ControlText
+
+
+ 50, 336
False
@@ -250,7 +285,7 @@
0
White
- 50, 402
+ 50, 411
False
diff --git a/samples/SharpDevelopReports/src/SharpReportSamples/EventLogger.cs b/samples/SharpDevelopReports/src/SharpReportSamples/EventLogger.cs
index 05ebd03a19..ca1fd8648e 100644
--- a/samples/SharpDevelopReports/src/SharpReportSamples/EventLogger.cs
+++ b/samples/SharpDevelopReports/src/SharpReportSamples/EventLogger.cs
@@ -11,21 +11,11 @@ using System.Collections;
using System.Diagnostics;
using System.Drawing;
using System.IO;
-using System.Management;
using System.Reflection;
-using System.Resources;
using System.Windows.Forms;
-using ICSharpCode.Reports.Core;
-
-//using System.Collections.Generic;
-
namespace SharpReportSamples
{
-// public class EventList: List{
-// }
-//
-//
///
/// Description of EventLogger.
///
@@ -45,30 +35,16 @@ namespace SharpReportSamples
EventLog ev = new EventLog();
ev.Log = "System";
ev.MachineName = "."; // Lokale Maschine
-
FillImageList();
-
- // EventLog dosn't implement IList, so we have to convert it to the 'cheapest'
- // IList implementaion
-//
-
ArrayList ar = new ArrayList();
-
foreach (System.Diagnostics.EventLogEntry entry in ev.Entries)
{
if (entry.TimeWritten > DateTime.Now.AddDays(-1))
{
-// Console.WriteLine ("{0} {1}",entry.TimeWritten,entry.Message);
ar.Add(entry);
}
}
this.EventLog = ar;
- // ReportEngine engine = new ReportEngine();
-
- // engine.SectionRendering += new EventHandler(PushPrinting);
- // engine.SectionRendered += new EventHandler(PushPrinted);
- // engine.PreviewPushDataReport(fileName,ar,null);
-
}
@@ -76,53 +52,20 @@ namespace SharpReportSamples
// using (var provider = ProfilingDataSQLiteProvider.FromFile("ProfilingSession.sdps"))
// var functions = provider.GetFunctions(0, provider.DataSets.Count - 1);
// foreach (CallTreeNode n in functions) Console.WriteLine("{0}: {1} calls, {2:f2}ms", n.Name, n.CallCount, n.TimeSpent);
- private void filter (EventLog e)
- {
- /*
- int i = 0;
- foreach (System.Diagnostics.EventLogEntry entry in e.Entries)
- {
- if (entry.TimeWritten > DateTime.Now.AddDays(-1))
- {
- Console.WriteLine ("{0} {1}",entry.TimeWritten,entry.Message);
- i++;
- }
- }
- */
-
- //http://blog-mstechnology.blogspot.com/2009/08/filter-eventlog-entries-thru-c-code.html
-/*
- string SomeDateTime = "20100324000000.000000+000";
- string Query = String.Format("SELECT * FROM Win32_NTLogEvent WHERE Logfile = 'Application' AND TimeGenerated > '{0}'", SomeDateTime);
-
- ManagementObjectSearcher mos = new ManagementObjectSearcher(Query);
- object o;
- foreach (ManagementObject mo in mos.Get())
- {
- foreach (PropertyData pd in mo.Properties)
- {
- o = mo[pd.Name];
- if (o != null)
- {
-// listBox1.Items.Add(String.Format("{0}: {1}", pd.Name,mo[pd.Name].ToString()));
- }
- }
-
- }
- */
- }
+
+
private void FillImageList() {
string ns = this.GetType().Namespace;
- System.Console.WriteLine("{0}",ns);
+// System.Console.WriteLine("{0}",ns);
Assembly a = Assembly.GetExecutingAssembly();
string [] resNames = a.GetManifestResourceNames();
- foreach(string s in resNames)
- {
- System.Console.WriteLine("{0}",s);
- }
+// foreach(string s in resNames)
+// {
+// System.Console.WriteLine("{0}",s);
+// }
this.imageList = new ImageList();
@@ -135,11 +78,13 @@ namespace SharpReportSamples
imgStream = a.GetManifestResourceStream("SharpReportSamples.Resources.Warning.png");
this.imageList.Images.Add(Image.FromStream(imgStream));
- System.Console.WriteLine("imagelist contains {0} images",this.imageList.Images.Count);
+// System.Console.WriteLine("imagelist contains {0} images",this.imageList.Images.Count);
}
+
public ArrayList EventLog {get;set;}
+
public ImageList Images
{
get {return this.imageList;}
diff --git a/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs b/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs
index 4da0a278c5..bb6d0ab65e 100644
--- a/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs
+++ b/samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs
@@ -101,7 +101,7 @@ namespace SharpReportSamples
} else if (s == "NoConnectionReport") {
this.RunProviderIndependent(reportName);
} else if (s =="EventLog")
- this.RunEventLogger(reportName);
+ this.RunEventLogger(reportName);
// this.RunEventLogger_Pdf(reportName);
else {
@@ -169,20 +169,22 @@ namespace SharpReportSamples
{
this.previewControl1.RunReport(model,dataManager);
};
-
this.previewControl1.RunReport(model,dataManager);
}
-
-
-
private void RunEventLogger_Pdf (string fileName)
{
- EventLogger eLog = new EventLogger(fileName);
+ Cursor.Current = Cursors.WaitCursor;
+ EventLogger eventLogger = new EventLogger(fileName);
+ Cursor.Current = Cursors.Default;
+
+ this.imageList = eventLogger.Images;
+
ReportModel model = ReportEngine.LoadReportModel(fileName);
- IReportCreator creator = ReportEngine.CreatePageBuilder(model,eLog.EventLog,null);
+ IReportCreator creator = ReportEngine.CreatePageBuilder(model,eventLogger.EventLog,null);
+ creator.SectionRendering += PushPrinting;
creator.BuildExportList();
using (PdfRenderer pdfRenderer = PdfRenderer.CreateInstance(creator,SelectFilename(),true))
{
@@ -192,24 +194,18 @@ namespace SharpReportSamples
}
}
- private string SelectFilename()
- {
- using (SaveFileDialog saveDialog = new SaveFileDialog()){
-
- saveDialog.FileName = "_pdf";
- saveDialog.DefaultExt = "PDF";
- saveDialog.ValidateNames = true;
- if(saveDialog.ShowDialog() == DialogResult.OK){
- return saveDialog.FileName;
- } else {
- return String.Empty;
- }
- }
- }
-
private void RunEventLogger (string fileName)
{
+ /*
+ using (var provider = ProfilingDataSQLiteProvider.FromFile("ProfilingSession.sdps")){
+ var functions = provider.GetFunctions(0, provider.DataSets.Count - 1);
+ foreach (CallTreeNode n in functions) {
+ Console.WriteLine("{0}: {1} calls, {2:f2}ms", n.Name, n.CallCount, n.TimeSpent);
+ }
+
+ }
+ */
Cursor.Current = Cursors.WaitCursor;
EventLogger eLog = new EventLogger(fileName);
Cursor.Current = Cursors.Default;
@@ -309,6 +305,21 @@ namespace SharpReportSamples
}
+ private string SelectFilename()
+ {
+ using (SaveFileDialog saveDialog = new SaveFileDialog()){
+
+ saveDialog.FileName = "_pdf";
+ saveDialog.DefaultExt = "PDF";
+ saveDialog.ValidateNames = true;
+ if(saveDialog.ShowDialog() == DialogResult.OK){
+ return saveDialog.FileName;
+ } else {
+ return String.Empty;
+ }
+ }
+ }
+
#endregion
diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/BaseExportColumn.cs b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/BaseExportColumn.cs
index 901de01856..031a335616 100644
--- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/BaseExportColumn.cs
+++ b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/BaseExportColumn.cs
@@ -137,8 +137,6 @@ namespace ICSharpCode.Reports.Core.Exporter
private void DrawFrame (Graphics graphics)
{
- System.Diagnostics.Trace.WriteLine("draw border {0}",this.styleDecorator.DrawBorder.ToString());
- System.Console.WriteLine("draw border {0}",this.styleDecorator.DrawBorder);
if (this.styleDecorator.DrawBorder) {
Border b = this.CreateDefaultBorder();
b.DrawBorder(graphics,this.styleDecorator.DisplayRectangle);
diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/ExportImage.cs b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/ExportImage.cs
index 94fe814424..3c6cc9b41b 100644
--- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/ExportImage.cs
+++ b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/ExportImage.cs
@@ -61,7 +61,6 @@ namespace ICSharpCode.Reports.Core.Exporter
{
base.DrawItem(pdfWriter, converter);
-
iTextSharp.text.Image im = iTextSharp.text.Image.GetInstance(image,null,false);
iTextSharp.text.Rectangle r = base.ConvertToPdfRectangle();
diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Printing/Graphics/Border.cs b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Printing/Graphics/Border.cs
index c7864bde0c..2ae53e20f8 100644
--- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Printing/Graphics/Border.cs
+++ b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Printing/Graphics/Border.cs
@@ -34,7 +34,6 @@ namespace ICSharpCode.Reports.Core {
this.top = baseLine;
this.right = baseLine;
this.bottom = baseLine;
- System.Console.WriteLine("baseline color {0}",baseline.Color);
}
@@ -42,10 +41,7 @@ namespace ICSharpCode.Reports.Core {
if (graphics == null) {
throw new ArgumentNullException("graphics");
}
- System.Console.WriteLine("drawBorder color {0}",baseline.Color);
-
using (Pen p = baseline.CreatePen(baseline.Thickness)) {
- Console.WriteLine("pen {0}",p.Color);
Rectangle r = System.Drawing.Rectangle.Inflate(rectangle,1,1);
graphics.DrawRectangle (p,rectangle);
}