From 224c9c4372828e3460cc7770ab081ef5f3dd7b6e Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Tue, 15 Mar 2016 15:31:32 +0800 Subject: [PATCH] Fuzhou: Bug-fix in results printers when tests do not fit onto one page, ver.2.3.241. --- .../BenchControl/ResultsPrinters/Basic/BasicPrintDocument.cs | 1 + .../BenchControl/ResultsPrinters/Cevak/PrintDocumentCevak.cs | 1 + .../BenchControl/ResultsPrinters/Zapiska/MyPrintDocument.cs | 3 ++- TestBenchFramework/Properties/AssemblyInfo.cs | 4 ++-- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/Basic/BasicPrintDocument.cs b/TestBenchFramework/BenchControl/ResultsPrinters/Basic/BasicPrintDocument.cs index 42393edf3..201f1b33f 100644 --- a/TestBenchFramework/BenchControl/ResultsPrinters/Basic/BasicPrintDocument.cs +++ b/TestBenchFramework/BenchControl/ResultsPrinters/Basic/BasicPrintDocument.cs @@ -111,6 +111,7 @@ namespace TBF.BenchControl.ResultsPrinters.Basic nrWMsOnFirstPage = (printHeight - BodyTop + TitleY - 2 * SpacingOne) / wmSectionHeight; nrWMsOnNextPage = (printHeight - 2 * SpacingOne) / wmSectionHeight; + nrWMsOnNextPage = Math.Max(nrWMsOnNextPage, 1); /// Prevent division by zero if there are too many WM tests nrPages = 1 + (batch.WaterMeters.Count - nrWMsOnFirstPage + nrWMsOnNextPage - 1) / nrWMsOnNextPage; diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/Cevak/PrintDocumentCevak.cs b/TestBenchFramework/BenchControl/ResultsPrinters/Cevak/PrintDocumentCevak.cs index 606b9bc3a..8cd496a08 100644 --- a/TestBenchFramework/BenchControl/ResultsPrinters/Cevak/PrintDocumentCevak.cs +++ b/TestBenchFramework/BenchControl/ResultsPrinters/Cevak/PrintDocumentCevak.cs @@ -125,6 +125,7 @@ namespace TBF.BenchControl.ResultsPrinters.Cevak nrWMsOnFirstPage = (printHeight - BodyTop + TitleY - 2 * SpacingOne) / wmSectionHeight; nrWMsOnNextPage = (printHeight - 2 * SpacingOne) / wmSectionHeight; + nrWMsOnNextPage = Math.Max(nrWMsOnNextPage, 1); /// Prevent division by zero if there are too many WM tests nrPages = 1 + (batch.WaterMeters.Count - nrWMsOnFirstPage + nrWMsOnNextPage - 1) / nrWMsOnNextPage; diff --git a/TestBenchFramework/BenchControl/ResultsPrinters/Zapiska/MyPrintDocument.cs b/TestBenchFramework/BenchControl/ResultsPrinters/Zapiska/MyPrintDocument.cs index 19dee7b49..ac2b06d58 100644 --- a/TestBenchFramework/BenchControl/ResultsPrinters/Zapiska/MyPrintDocument.cs +++ b/TestBenchFramework/BenchControl/ResultsPrinters/Zapiska/MyPrintDocument.cs @@ -263,8 +263,9 @@ namespace TBF.BenchControl.ResultsPrinters.Zapiska if (pageNr == 1) { /// Determine the number of pages once - nrTabLinesOnNextPage = (topMargin + printHeight - TableTopNextPage - 70) / SpacingOne; nrTabLinesOnFirstPage = (topMargin + printHeight - TableTopFirstPage - 70) / SpacingOne; + nrTabLinesOnNextPage = (topMargin + printHeight - TableTopNextPage - 70) / SpacingOne; + nrTabLinesOnNextPage = Math.Max(1, nrTabLinesOnNextPage); /// Prevent division by zero if (nrRows <= nrTabLinesOnFirstPage) { diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index 4b23da445..ce6fbb80e 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.3.240.1")] -[assembly: AssemblyFileVersion("2.3.240.1")] +[assembly: AssemblyVersion("2.3.241.1")] +[assembly: AssemblyFileVersion("2.3.241.1")]