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

Water meter numbers in results are their positions on the bench (as originally)

Browse Source
This commit is contained in:
Milan Hanajik
2015-03-26 08:14:58 +01:00
parent 545677dc7a
commit acd64bb427
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/ResultsPrinters/Basic/BasicPrintDocument.cs
+1 -2
View File
@@ -178,11 +178,10 @@ namespace TBF.BenchControl.ResultsPrinters.Basic
} }
else else
{ {
int printedWMNr = 1;
for (int wmNr = 0; wmNr < Program.WMsCount; wmNr++) /// wmNr is 0-based for (int wmNr = 0; wmNr < Program.WMsCount; wmNr++) /// wmNr is 0-based
{ {
if (!unsortedResults[0].Meters[wmNr].Disabled) if (!unsortedResults[0].Meters[wmNr].Disabled)
nextWmTop += PrintSingleWM(e, wmNr, printedWMNr++, nextWmTop); nextWmTop += PrintSingleWM(e, wmNr, wmNr + 1, nextWmTop);
} }
} }
TestBenchFramework/BenchControl/ResultsWriters/Basic/Writer.cs
+1 -2
View File
@@ -178,11 +178,10 @@ namespace TBF.BenchControl.ResultsWriters.Basic
} }
else else
{ {
int printedWMNr = 1;
for (int wmNr = 0; wmNr < Program.WMsCount; wmNr++) /// wmNr is 0-based for (int wmNr = 0; wmNr < Program.WMsCount; wmNr++) /// wmNr is 0-based
{ {
if (!unsortedResults[0].Meters[wmNr].Disabled) if (!unsortedResults[0].Meters[wmNr].Disabled)
WriteSingleWM(wmNr, printedWMNr++); WriteSingleWM(wmNr, wmNr + 1);
} }
} }
} }
TestBenchFramework/Screens/ResultsTabPageCtrl.cs
+2 -3
View File
@@ -168,20 +168,19 @@ namespace TBF.Screens
flowLayoutPanel.AutoScroll = true; flowLayoutPanel.AutoScroll = true;
bool first = true; bool first = true;
int printedWMNr = 1;
for (int mtr = 1; mtr <= (combined ? Program.WMsCount / 2 : Program.WMsCount); mtr++) for (int mtr = 1; mtr <= (combined ? Program.WMsCount / 2 : Program.WMsCount); mtr++)
{ {
if (combined || (testResults != null && testResults.Count > 0 && !testResults[0].Meters[mtr - 1].Disabled)) if (combined || (testResults != null && testResults.Count > 0 && !testResults[0].Meters[mtr - 1].Disabled))
{ {
if (TestsArrangement == Forms.ResultsConfig.TestsAre.Rows) if (TestsArrangement == Forms.ResultsConfig.TestsAre.Rows)
{ {
ListView lview = GetResultsTestsAreRows(mtr, printedWMNr++); ListView lview = GetResultsTestsAreRows(mtr, mtr);
if (first) { firstListView = lview; first = false; } if (first) { firstListView = lview; first = false; }
if (lview != null) flowLayoutPanel.Controls.Add(lview); if (lview != null) flowLayoutPanel.Controls.Add(lview);
} }
else else
{ {
ListView lview = GetResultsTestsAreColumns(mtr, printedWMNr++); ListView lview = GetResultsTestsAreColumns(mtr, mtr);
if (first) { firstListView = lview; first = false; } if (first) { firstListView = lview; first = false; }
if (lview != null) flowLayoutPanel.Controls.Add(lview); if (lview != null) flowLayoutPanel.Controls.Add(lview);
} }