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

Generic improvements: process page fixes, error format F2 or F3 (master), results page fixes, Comet ambient serial parameters (comment).

Browse Source
This commit is contained in:
Milan Hanajik
2015-08-16 19:58:43 +02:00
parent 752bfd98b1
commit 5db53ca6e3
8 changed files with 40 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/Screens/ResultsTabPageCtrl.cs
+15 -3
View File
@@ -146,6 +146,8 @@ namespace TBF.Screens
/// Determine how many water meters were enabled for result evaluation and printing
int enabledWMsCount = 0;
bool[] wmIsEnabled = new bool[Program.WMsCount];
if (combined)
{
enabledWMsCount = Program.CompoundWMsCount;
@@ -154,8 +156,18 @@ namespace TBF.Screens
{
for (int mtr0 = 0; mtr0 < Program.WMsCount; mtr0++)
{
if ((testResults != null) && (testResults.Count > 0) && !testResults[0].Meters[mtr0].Disabled)
enabledWMsCount++;
if (testResults != null)
{
for (int t = 0; t < testResults.Count; t++)
{
if ((testResults[t].Meters.Count > mtr0) && !testResults[t].Meters[mtr0].Disabled)
{
wmIsEnabled[mtr0] = true;
enabledWMsCount++;
break;
}
}
}
}
}
@@ -181,7 +193,7 @@ namespace TBF.Screens
bool first = true;
for (int mtr = 1; mtr <= (combined ? Program.CompoundWMsCount : Program.WMsCount); mtr++)
{
if (combined || (testResults != null && testResults.Count > 0 && !testResults[0].Meters[mtr - 1].Disabled))
if (combined || (testResults != null && testResults.Count > 0 && wmIsEnabled[mtr - 1]))
{
if (TestsArrangement == Forms.ResultsConfig.TestsAre.Rows)
{