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

Disabled watermeters will not appear in results (screen, ResultsPrinters.Basic and ResultsWriters.Basic).

Browse Source 
Updating Disabled (default = false) is provided by DataEntry.Standard when entering serial numbers.
This commit is contained in:
Milan Hanajik
2015-03-25 03:57:46 +01:00
parent 7dce565e4f
commit 23d5e6d19d
9 changed files with 114 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/ResultsWriters/Basic/Writer.cs
+14 -10
View File
@@ -172,24 +172,28 @@ namespace TBF.BenchControl.ResultsWriters.Basic
///--------
/// Body
///--------
int nrWMs = (combined ? Program.WMsCount / 2 : Program.WMsCount);
if (combined)
{
for (int wmNr = 1; wmNr <= Program.WMsCount / 2; wmNr++) WriteCombinedWM(wmNr); /// wmNr is 1-based
}
else
{
for (int wmNr = 1; wmNr <= Program.WMsCount; wmNr++) WriteSingleWM(wmNr); /// wmNr is 1-based
int printedWMNr = 1;
for (int wmNr = 0; wmNr < Program.WMsCount; wmNr++) /// wmNr is 0-based
{
if (!unsortedResults[0].Meters[wmNr].Disabled)
WriteSingleWM(wmNr, printedWMNr++);
}
}
}
/// <summary>
/// Write one water meter results
/// </summary>
/// <param name="wmNr1">Water meter number (1-based)</param>
void WriteSingleWM(int wmNr1)
/// <param name="wmNr">Water meter number (0-based)</param>
void WriteSingleWM(int wmNr, int printedWMNr)
{
IList<Entities.TestResult> results = Utils.GetSortedTestResults(procedure, unsortedResults, wmNr1);
IList<Entities.TestResult> results = Utils.GetSortedTestResults(procedure, unsortedResults, wmNr + 1);
/// Determine column widths
int[] columnWidths = new int[resultItems.Count];
@@ -201,7 +205,7 @@ namespace TBF.BenchControl.ResultsWriters.Basic
{
if (tr != null)
{
int len = resultItems[i].Print(tr.Meters[wmNr1 - 1]).Length;
int len = resultItems[i].Print(tr.Meters[wmNr]).Length;
if (len > columnWidths[i]) columnWidths[i] = len;
}
}
@@ -211,10 +215,10 @@ namespace TBF.BenchControl.ResultsWriters.Basic
/// Write water meter number and s/n
writer.Write(string.Format("Water meter {0}", wmNr1));
if (!string.IsNullOrEmpty(unsortedResults[0].Meters[wmNr1 - 1].SerialNr))
writer.Write(string.Format("Water meter {0}", printedWMNr));
if (!string.IsNullOrEmpty(unsortedResults[0].Meters[wmNr].SerialNr))
{
writer.Write(string.Format(" s/n: {0}", unsortedResults[0].Meters[wmNr1 - 1].SerialNr));
writer.Write(string.Format(" s/n: {0}", unsortedResults[0].Meters[wmNr].SerialNr));
}
writer.WriteLine(string.Empty);
@@ -244,7 +248,7 @@ namespace TBF.BenchControl.ResultsWriters.Basic
{
for (int i = 0; i < resultItems.Count; i++)
{
string text = resultItems[i].Print(tr.Meters[wmNr1 - 1]);
string text = resultItems[i].Print(tr.Meters[wmNr]);
/// Get rid of the color information
string[] texts = text.Split(new char[] { '|' });