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

CycleNr added to LocalSettings, Entities.TestResults, Mappings, is used in sequences (DB change)

Browse Source
This commit is contained in:
Milan Hanajik
2015-01-25 08:11:40 +01:00
parent dc57c1464b
commit 5cf5fe5eba
12 changed files with 79 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/ResultsWriters/Basic/Writer.cs
+34 -33
View File
@@ -13,6 +13,12 @@ namespace TBF.BenchControl.ResultsWriters.Basic
readonly WriterCfg writerCfg;
/// <summary>
/// Result items to print
/// </summary>
IList<TBF.Forms.ResultItemSpec> resultItems;
bool combined;
/// <summary>
/// Results to print
/// </summary>
@@ -34,12 +40,25 @@ namespace TBF.BenchControl.ResultsWriters.Basic
/// <returns>Reference to the operation</returns>
public IOperation WriteResultsOp(IList<Entities.TestResult> results)
{
if ((results == null) || (results.Count == 0))
if ((results == null) || (results.Count == 0) ||
((results[0].MetersKind != Entities.MetersKind.Single) &&
(results[0].MetersKind != Entities.MetersKind.Combined)))
{
writer = null;
return this;
}
if (results[0].MetersKind == Entities.MetersKind.Single)
{
resultItems = Forms.ResultItemSpec.FromStrArray(Program.LocalSettings.RsltItems_Disk_SingleWM);
combined = false;
}
else
{
resultItems = Forms.ResultItemSpec.FromStrArray(Program.LocalSettings.RsltItems_Disk_CombinedWM);
combined = true;
}
this.results = results;
now = DateTime.Now;
try
@@ -85,44 +104,26 @@ namespace TBF.BenchControl.ResultsWriters.Basic
}
writer.WriteLine("Bereich : 22,9 °C 947 mbar 43 %");
writer.WriteLine("");
writer.WriteLine("Test Metode MIDFehler Durchfluss Test Zeit T1 T2 Dichte Masse Druck Volume Bor");
writer.WriteLine(" [%] [m3/h] [s] [°C] [°C] [kg/m3] [kg] [MPa] [L] [m3/h]");
foreach (var item in resultItems) writer.Write(item.ClmnHeaderText);
writer.WriteLine(string.Empty);
writer.WriteLine("---------------------------------------------------------------------------------------------------------------------------------------");
foreach (var tr in results)
{
if (tr.MetersKind == Entities.MetersKind.Single)
foreach (var item in resultItems)
{
writer.WriteLine(string.Format("{0} {1} {2} {3} {4} {5} {6} {7} {8} {9} {10} {11}",
tr.Name,
tr.Method,
tr.Meters[0].VolumeErrorPct,
tr.FlowMass,
tr.Time,
tr.TempInAvrg,
tr.TempDivAvrg,
tr.DensityOut,
tr.MassDiff,
tr.PressInAvrg,
tr.PressOutAvrg,
tr.VolumeCTV));
}
else if (tr.MetersKind == Entities.MetersKind.Combined)
{
writer.WriteLine(string.Format("{0} {1} {2} {3} {4} {5} {6} {7} {8} {9} {10} {11}",
tr.Name,
tr.Method,
tr.CombinedMeters[0].VolumeErrorPct,
tr.FlowMass,
tr.Time,
tr.TempInAvrg,
tr.TempDivAvrg,
tr.DensityOut,
tr.MassDiff,
tr.PressInAvrg,
tr.PressOutAvrg,
tr.VolumeCTV));
if (combined)
{
writer.Write(item.PrintCombined(tr.CombinedMeters[0], tr.Meters[0], tr.Meters[1]));
}
else
{
writer.Write(item.Print(tr.Meters[0]));
}
}
writer.WriteLine(string.Empty);
}
writer.WriteLine("---------------------------------------------------------------------------------------------------------------------------------------");