From 6a3e3e7682e5e79eeb33fc8d3cd85aecae83bb31 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Wed, 28 Jan 2015 07:24:03 +0100 Subject: [PATCH] Layout changes, c:/TBF/header.png used --- .../ResultsPrinters/Basic/BasicPrintDocument.cs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/Basic/BasicPrintDocument.cs b/TestBenchFramework/BenchControl/ResultsPrinters/Basic/BasicPrintDocument.cs index 8e83d9301..1738d044a 100644 --- a/TestBenchFramework/BenchControl/ResultsPrinters/Basic/BasicPrintDocument.cs +++ b/TestBenchFramework/BenchControl/ResultsPrinters/Basic/BasicPrintDocument.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Drawing; using System.Drawing.Printing; +using System.IO; using TBF.Resources; namespace TBF.BenchControl.ResultsPrinters.Basic @@ -84,7 +85,11 @@ namespace TBF.BenchControl.ResultsPrinters.Basic /// Run base code base.OnPrintPage(e); - //e.Graphics.DrawImageUnscaled(Properties.Resources.Headpic, 0, 0); + if (File.Exists("C:\\TBF\\header.png")) + { + Image img = Image.FromFile("C:\\TBF\\header.png"); + e.Graphics.DrawImage(new Bitmap(img), new Rectangle(0, 0, 745, 1050)); + } /// Set print area size and margins (in dots using 80 dpi) int printHeight = base.DefaultPageSettings.PaperSize.Height - base.DefaultPageSettings.Margins.Top - base.DefaultPageSettings.Margins.Bottom; @@ -255,10 +260,10 @@ namespace TBF.BenchControl.ResultsPrinters.Basic string wmText = string.Format("Water meter {0}", wmNr + 1); PrintAt(e, 100, top, wmText); - if (!string.IsNullOrEmpty(results[0].Meters[wmNr].SerialNr)) + if (!string.IsNullOrEmpty(results[0].Meters[2 * wmNr].SerialNr)) { PrintAt(e, 100 + (int)e.Graphics.MeasureString(wmText, font).Width, top, - string.Format(", s/n = {0}", results[0].Meters[wmNr].SerialNr)); + string.Format(", Main s/n: {0}, Aux. s/n:{1}", results[0].Meters[2 * wmNr].SerialNr, results[0].Meters[2 * wmNr + 1].SerialNr)); } /// Horizontal line