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

Results to database consolidated, 1-based WMNr used in printing, saving

Browse Source
This commit is contained in:
Milan Hanajik
2015-02-02 10:35:15 +01:00
parent 56a9a7cf1b
commit 376056fb1a
5 changed files with 73 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/ResultsWriters/Basic/Writer.cs
+20 -23
View File
@@ -168,7 +168,6 @@ namespace TBF.BenchControl.ResultsWriters.Basic
writer.WriteLine(rightColumn[i]);
}
writer.WriteLine(string.Empty);
writer.WriteLine(string.Empty);
///--------
/// Body
@@ -176,21 +175,21 @@ namespace TBF.BenchControl.ResultsWriters.Basic
int nrWMs = (combined ? Program.WMsCount / 2 : Program.WMsCount);
if (combined)
{
for (int wmNr = 0; wmNr < Program.WMsCount / 2; wmNr++) WriteCombinedWM(wmNr);
for (int wmNr = 1; wmNr <= Program.WMsCount / 2; wmNr++) WriteCombinedWM(wmNr); /// wmNr is 1-based
}
else
{
for (int wmNr = 0; wmNr < Program.WMsCount; wmNr++) WriteSingleWM(wmNr);
for (int wmNr = 1; wmNr <= Program.WMsCount; wmNr++) WriteSingleWM(wmNr); /// wmNr is 1-based
}
}
/// <summary>
/// Write one water meter results
/// </summary>
/// <param name="wmNr">Water meter number</param>
void WriteSingleWM(int wmNr)
/// <param name="wmNr1">Water meter number (1-based)</param>
void WriteSingleWM(int wmNr1)
{
IList<Entities.TestResult> results = Utils.GetSortedTestResults(procedure, unsortedResults, wmNr);
IList<Entities.TestResult> results = Utils.GetSortedTestResults(procedure, unsortedResults, wmNr1);
/// Determine column widths
int[] columnWidths = new int[resultItems.Count];
@@ -202,7 +201,7 @@ namespace TBF.BenchControl.ResultsWriters.Basic
{
if (tr != null)
{
int len = resultItems[i].Print(tr.Meters[wmNr]).Length;
int len = resultItems[i].Print(tr.Meters[wmNr1 - 1]).Length;
if (len > columnWidths[i]) columnWidths[i] = len;
}
}
@@ -212,10 +211,10 @@ namespace TBF.BenchControl.ResultsWriters.Basic
/// Write water meter number and s/n
writer.Write(string.Format("Water meter {0}", wmNr + 1));
if (!string.IsNullOrEmpty(unsortedResults[0].Meters[wmNr].SerialNr))
writer.Write(string.Format("Water meter {0}", wmNr1));
if (!string.IsNullOrEmpty(unsortedResults[0].Meters[wmNr1 - 1].SerialNr))
{
writer.Write(string.Format(", s/n: {0}", unsortedResults[0].Meters[wmNr].SerialNr));
writer.Write(string.Format(" s/n: {0}", unsortedResults[0].Meters[wmNr1 - 1].SerialNr));
}
writer.WriteLine(string.Empty);
@@ -245,7 +244,7 @@ namespace TBF.BenchControl.ResultsWriters.Basic
{
for (int i = 0; i < resultItems.Count; i++)
{
string text = resultItems[i].Print(tr.Meters[wmNr]);
string text = resultItems[i].Print(tr.Meters[wmNr1 - 1]);
/// Get rid of the color information
string[] texts = text.Split(new char[] { '|' });
@@ -265,16 +264,15 @@ namespace TBF.BenchControl.ResultsWriters.Basic
writer.WriteLine(new String('-', totalWidth)); /// Horizontal line below the body
writer.WriteLine(string.Empty);
writer.WriteLine(string.Empty);
}
/// <summary>
/// Write one combined water meter results
/// </summary>
/// <param name="wmNr">Water meter number</param>
void WriteCombinedWM(int wmNr)
/// <param name="wmNr1">Combined water meter number (1-based)</param>
void WriteCombinedWM(int wmNr1)
{
IList<Entities.TestResult> results = Utils.GetSortedTestResults(procedure, unsortedResults, wmNr);
IList<Entities.TestResult> results = Utils.GetSortedTestResults(procedure, unsortedResults, wmNr1);
/// Determin column widths
int[] columnWidths = new int[resultItems.Count];
@@ -286,7 +284,7 @@ namespace TBF.BenchControl.ResultsWriters.Basic
{
if (tr != null)
{
int len = resultItems[i].PrintCombined(tr.Meters[2 * wmNr], tr.Meters[2 * wmNr + 1], tr.CombinedMeters[wmNr]).Length;
int len = resultItems[i].PrintCombined(tr.Meters[2 * wmNr1 - 2], tr.Meters[2 * wmNr1 - 1], tr.CombinedMeters[wmNr1 - 1]).Length;
if (len > columnWidths[i]) columnWidths[i] = len;
}
}
@@ -296,14 +294,14 @@ namespace TBF.BenchControl.ResultsWriters.Basic
/// Write water meter number and two s/n-s
writer.Write(string.Format("Water meter {0}", wmNr + 1));
if (!string.IsNullOrEmpty(unsortedResults[0].Meters[2 * wmNr].SerialNr))
writer.Write(string.Format("Water meter {0}", wmNr1));
if (!string.IsNullOrEmpty(unsortedResults[0].Meters[2 * wmNr1 - 2].SerialNr))
{
writer.Write(string.Format(", Main s/n: {0}", unsortedResults[0].Meters[2 * wmNr].SerialNr));
writer.Write(string.Format(", Main s/n: {0}", unsortedResults[0].Meters[2 * wmNr1 - 2].SerialNr));
}
if (!string.IsNullOrEmpty(unsortedResults[0].Meters[2 * wmNr + 1].SerialNr))
if (!string.IsNullOrEmpty(unsortedResults[0].Meters[2 * wmNr1 - 1].SerialNr))
{
writer.Write(string.Format(", Aux. s/n:{0}", unsortedResults[0].Meters[2 * wmNr + 1].SerialNr));
writer.Write(string.Format(", Aux. s/n:{0}", unsortedResults[0].Meters[2 * wmNr1 - 1].SerialNr));
}
writer.WriteLine(string.Empty);
@@ -331,7 +329,7 @@ namespace TBF.BenchControl.ResultsWriters.Basic
{
for (int i = 0; i < resultItems.Count; i++)
{
string text = resultItems[i].PrintCombined(tr.Meters[2 * wmNr], tr.Meters[2 * wmNr + 1], tr.CombinedMeters[wmNr]);
string text = resultItems[i].PrintCombined(tr.Meters[2 * wmNr1 - 2], tr.Meters[2 * wmNr1 - 1], tr.CombinedMeters[wmNr1 - 1]);
/// Get rid of the color information
string[] texts = text.Split(new char[] { '|' });
@@ -350,7 +348,6 @@ namespace TBF.BenchControl.ResultsWriters.Basic
writer.WriteLine(new String('-', totalWidth)); /// Horizontal line below the body
writer.WriteLine(string.Empty);
writer.WriteLine(string.Empty);
}
/// <summary>Run this operation</summary>