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

Change of logic for 'disabled' water meters in LabelPrinter, version 2.0.164.

Browse Source
This commit is contained in:
Milan Hanajik 2015-12-09 14:31:40 +01:00
parent 852ffd0602
commit b2c944f9b1
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Config/Properties/AssemblyInfo.cs
View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.163.0")]
[assembly: AssemblyFileVersion("2.0.163.0")]
[assembly: AssemblyVersion("2.0.164.0")]
[assembly: AssemblyFileVersion("2.0.164.0")]

11
TestBenchFramework/BenchControl/ResultsPrinters/LabelPrinter/PrintLabelDocument.cs
View File

@ -164,14 +164,21 @@ namespace TBF.BenchControl.ResultsPrinters.LabelPrinter
}
else
{
if (!unsortedResults[0].Meters[nextWMNr].Disabled)
/// Skip disabled water meters
while ((nextWMNr < Config.Data.WMsCount) && unsortedResults[0].Meters[nextWMNr].Disabled) nextWMNr++;
if (nextWMNr < Config.Data.WMsCount)
{
PrintSingleWM(e, nextWMNr);
bool anyMore = false;
for (int i = nextWMNr + 1; i < Config.Data.WMsCount; i++)
{
if (!unsortedResults[0].Meters[i].Disabled) anyMore = true;
if (!unsortedResults[0].Meters[i].Disabled)
{
anyMore = true;
break;
}
}
e.HasMorePages = anyMore;
}

4
TestBenchFramework/Properties/AssemblyInfo.cs
View File

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.0.163.1")]
[assembly: AssemblyFileVersion("2.0.163.1")]
[assembly: AssemblyVersion("2.0.164.1")]
[assembly: AssemblyFileVersion("2.0.164.1")]