michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fuzhou: Bug-fix in results printers when tests do not fit onto one page, ver.2.3.241.

Browse Source
This commit is contained in:
Milan Hanajik
2016-03-15 15:31:32 +08:00
parent c16964c1de
commit 224c9c4372
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/ResultsPrinters/Basic/BasicPrintDocument.cs
+1
View File
@@ -111,6 +111,7 @@ namespace TBF.BenchControl.ResultsPrinters.Basic
nrWMsOnFirstPage = (printHeight - BodyTop + TitleY - 2 * SpacingOne) / wmSectionHeight; nrWMsOnFirstPage = (printHeight - BodyTop + TitleY - 2 * SpacingOne) / wmSectionHeight;
nrWMsOnNextPage = (printHeight - 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; nrPages = 1 + (batch.WaterMeters.Count - nrWMsOnFirstPage + nrWMsOnNextPage - 1) / nrWMsOnNextPage;
TestBenchFramework/BenchControl/ResultsPrinters/Cevak/PrintDocumentCevak.cs
+1
View File
@@ -125,6 +125,7 @@ namespace TBF.BenchControl.ResultsPrinters.Cevak
nrWMsOnFirstPage = (printHeight - BodyTop + TitleY - 2 * SpacingOne) / wmSectionHeight; nrWMsOnFirstPage = (printHeight - BodyTop + TitleY - 2 * SpacingOne) / wmSectionHeight;
nrWMsOnNextPage = (printHeight - 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; nrPages = 1 + (batch.WaterMeters.Count - nrWMsOnFirstPage + nrWMsOnNextPage - 1) / nrWMsOnNextPage;
TestBenchFramework/BenchControl/ResultsPrinters/Zapiska/MyPrintDocument.cs
+2 -1
View File
@@ -263,8 +263,9 @@ namespace TBF.BenchControl.ResultsPrinters.Zapiska
if (pageNr == 1) if (pageNr == 1)
{ {
/// Determine the number of pages once /// Determine the number of pages once
nrTabLinesOnNextPage = (topMargin + printHeight - TableTopNextPage - 70) / SpacingOne;
nrTabLinesOnFirstPage = (topMargin + printHeight - TableTopFirstPage - 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) if (nrRows <= nrTabLinesOnFirstPage)
{ {
TestBenchFramework/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("2.3.240.1")] [assembly: AssemblyVersion("2.3.241.1")]
[assembly: AssemblyFileVersion("2.3.240.1")] [assembly: AssemblyFileVersion("2.3.241.1")]