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

SequenceBase.TestResult2CsvLine( ) modified: isPressureTest, isStartStop, isDiverter, isCamera, ...

Browse Source
This commit is contained in:
Milan Hanajik
2018-02-26 13:13:36 +01:00
parent be86f791e4
commit 81951287c6
1 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/Sequences/SequenceBase.cs
+22 -16
View File
@@ -835,6 +835,10 @@ namespace TBF.BenchControl.Sequences
protected string TestResult2CsvLine(Results.Entities.TestRslt tstRslt)
{
bool isPressureTest = tstRslt.MethodClass.Contains("PMaxTest") || tstRslt.MethodClass.Contains("LeakTest");
bool isStartStop = tstRslt.MethodClass.Contains("FixedStart");
bool isDiverter = tstRslt.MethodClass.Contains("FlyingStart") && tstRslt.MethodClass.Contains("MassColl");
System.Text.StringBuilder sb = new System.Text.StringBuilder();
sb.Append(tstRslt.StartTime); /// A
@@ -920,16 +924,15 @@ namespace TBF.BenchControl.Sequences
/// BO Const.MID . konstanta eatlonu
sb.Append(";"); sb.Append(" "); /// BP Const.MA . . konstanta druheho etalonu
sb.Append(";"); sb.AppendFormat("{0:F0}", 1000.0F * tstRslt.DiverterStart); /// BQ [ms] Diverter start time
sb.Append(";"); sb.AppendFormat("{0:F0}", 1000.0F * tstRslt.DiverterEnd); /// BR [ms] Diverter end time
sb.Append(";"); sb.AppendFormat("{0:F0}", 1000.0F * tstRslt.DiverterStart); /// BS [ms] Start valve open time
sb.Append(";"); sb.AppendFormat("{0:F0}", 1000.0F * tstRslt.DiverterEnd); /// BT [ms] Start valve close time
sb.Append(";"); sb.AppendFormat("{0:F0}", isDiverter ? 1000.0F * tstRslt.DiverterStart : 0); /// BQ [ms] Diverter start time
sb.Append(";"); sb.AppendFormat("{0:F0}", isDiverter ? 1000.0F * tstRslt.DiverterEnd : 0); /// BR [ms] Diverter end time
sb.Append(";"); sb.AppendFormat("{0:F0}", isStartStop ? 1000.0F * tstRslt.DiverterStart : 0); /// BS [ms] Start valve open time
sb.Append(";"); sb.AppendFormat("{0:F0}", isStartStop ? 1000.0F * tstRslt.DiverterEnd : 0); /// BT [ms] Start valve close time
sb.Append(";"); sb.Append(tstRslt.TempUpMax); /// BU [°C]
sb.Append(";"); sb.Append(tstRslt.TempDownMax); /// BV [°C]
sb.Append(";"); sb.Append(tstRslt.TempUpMin); /// BW [°C]
sb.Append(";"); sb.Append(tstRslt.TempDownMin); /// BX [°C]
//sb.Append(";"); sb.Append(isPressureTest ? tstRslt.TestTime : 0); /// BY [s] Duration of the pressure test
sb.Append(";"); sb.Append(tstRslt.TestTime); /// BY [s] Duration of the pressure test
sb.Append(";"); sb.Append(isPressureTest ? tstRslt.TestTime : 0); /// BY [s] Duration of the pressure test
sb.Append(";"); sb.AppendFormat("{0:F1}", Units.ConvertTo(Unit.C, tstRslt.AmbTempEnd)); /// BZ [°C]
sb.Append(";"); sb.AppendFormat("{0:F0}", Units.ConvertTo(Unit.mbar, tstRslt.AmbPressEnd)); /// CA [mbar]
sb.Append(";"); sb.AppendFormat("{0:F1}", Units.ConvertTo(Unit.RPct, tstRslt.AmbHumiEnd)); /// CB [R%]
@@ -943,6 +946,7 @@ namespace TBF.BenchControl.Sequences
if (!ProcessData.BatchRslts.WaterMeters[i].Compound() && !ProcessData.BatchRslts.WaterMeters[i].HeatMeter())
{
Results.Entities.MeterTestRslt mtrRslt = ProcessData.BatchRslts.GetMeterTestRslt(tstRslt.Name(), i, CompoundMeterId.Single);
bool isCamera = mtrRslt.RegReaderClass.Equals("Network.Camera.Roi");
if (mtrRslt != null)
{
@@ -966,11 +970,11 @@ namespace TBF.BenchControl.Sequences
#else
sb.Append(";"); sb.Append(mtrRslt.PulsesPerLiter); /// CP Pulses per liter
#endif
sb.Append(";"); sb.Append(mtrRslt.VolumeStart * mtrRslt.PulsesPerLiter); /// CQ WM Phi_start - pri datastreamovych hodnotach (alebo kamera)
sb.Append(";"); sb.Append(mtrRslt.VolumeEnd * mtrRslt.PulsesPerLiter); /// CR WM Phi_end - ' ' -
sb.Append(";"); sb.Append(mtrRslt.TimestampStart); /// CS WM Time_start - ' ' -
sb.Append(";"); sb.Append(mtrRslt.TimestampEnd); /// CT WM Time_end - ' ' -
sb.Append(";"); sb.Append(mtrRslt.PulsesPerLiter); /// CU WM Degree per liter
sb.Append(";"); sb.Append(isCamera ? mtrRslt.VolumeStart * mtrRslt.PulsesPerLiter : 0); /// CQ WM Phi_start - pri hodnotach z kamery
sb.Append(";"); sb.Append(isCamera ? mtrRslt.VolumeEnd * mtrRslt.PulsesPerLiter : 0); /// CR WM Phi_end - ' ' -
sb.Append(";"); sb.Append(isCamera ? mtrRslt.TimestampStart : 0); /// CS WM Time_start - ' ' -
sb.Append(";"); sb.Append(isCamera ? mtrRslt.TimestampEnd : 0); /// CT WM Time_end - ' ' -
sb.Append(";"); sb.Append(isCamera ? mtrRslt.PulsesPerLiter : 0); /// CU WM Degree per liter
sb.Append(";"); sb.Append(0); /// CV Analog out 1 (max mA)
sb.Append(";"); sb.Append(0); /// CW Analog out 2 (V)
@@ -983,6 +987,7 @@ namespace TBF.BenchControl.Sequences
for (byte b = (byte)CompoundMeterId.CompoundMain; b <= (byte)CompoundMeterId.Compound; b++)
{
Results.Entities.MeterTestRslt mtrRslt = ProcessData.BatchRslts.GetMeterTestRslt(tstRslt.Name(), i, (CompoundMeterId)b);
bool isCamera = mtrRslt.RegReaderClass.Equals("Network.Camera.Roi");
if (mtrRslt != null)
{
@@ -1010,11 +1015,12 @@ namespace TBF.BenchControl.Sequences
sb.Append(";"); sb.Append(mtrRslt.TestTime); /// CN WM Tmet - cas merania (obmedzany pri synchro skuske)
sb.Append(";"); sb.Append(mtrRslt.Passed ? "OK" : "NOK"); /// CO WM Vysledok (t.j. ci je v hraniciach chyb) - OK/NOK
sb.Append(";"); sb.Append(" "); /// CP WM AN value - hodnota z analogoveho prevodnika (teraz nic)
sb.Append(";"); sb.Append(mtrRslt.VolumeStart * mtrRslt.PulsesPerLiter);/// CQ WM Volume_start - pri datastreamovych hodnotach (alebo kamera)
sb.Append(";"); sb.Append(mtrRslt.VolumeEnd * mtrRslt.PulsesPerLiter); /// CR WM Time_start - ' ' -
sb.Append(";"); sb.Append(mtrRslt.TimestampStart); /// CS WM Volume_end - ' ' -
sb.Append(";"); sb.Append(mtrRslt.TimestampEnd); /// CT WM Time_end - ' ' -
sb.Append(";"); sb.Append(mtrRslt.PulsesPerLiter); /// CU WM Degree per liter
sb.Append(";"); sb.Append(isCamera ? mtrRslt.VolumeStart * mtrRslt.PulsesPerLiter : 0); /// CQ WM Phi_start - pri hodnotach z kamery
sb.Append(";"); sb.Append(isCamera ? mtrRslt.VolumeEnd * mtrRslt.PulsesPerLiter : 0); /// CR WM Phi_end - ' ' -
sb.Append(";"); sb.Append(isCamera ? mtrRslt.TimestampStart : 0); /// CS WM Time_start - ' ' -
sb.Append(";"); sb.Append(isCamera ? mtrRslt.TimestampEnd : 0); /// CT WM Time_end - ' ' -
sb.Append(";"); sb.Append(isCamera ? mtrRslt.PulsesPerLiter : 0); /// CU WM Degree per liter
sb.Append(";"); sb.Append(0); /// CV Analog out 1 (max mA)
sb.Append(";"); sb.Append(0); /// CW Analog out 2 (V)