From 6a7e1e5052a3ce99a1d27b04d64556a2e12db1fa Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Sat, 22 Aug 2015 14:28:20 +0200 Subject: [PATCH] Start/Stop volume and time in logs for iPerl (datastream), ver.1.5.91. --- .../BenchControl/Sequences/SequenceBase.cs | 16 ++++++++-------- .../FlyingStartCollectionMethodSeq.cs | 9 ++++++--- TestBenchFramework/Entities/MeterTestResult.cs | 4 ++++ TestBenchFramework/Properties/AssemblyInfo.cs | 4 ++-- 4 files changed, 20 insertions(+), 13 deletions(-) diff --git a/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs b/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs index 730a9f901..98a929b1b 100644 --- a/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs +++ b/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs @@ -913,10 +913,10 @@ namespace TBF.BenchControl.Sequences bool ok = (mtrRslt.VolumeErrorPct >= tstRslt.ErrLimLo) && (mtrRslt.VolumeErrorPct <= tstRslt.ErrLimHi); sb.Append(";"); sb.Append(ok ? "OK" : "NOK"); /// WM Vysledok (t.j. ci je v hraniciach chyb) - OK/NOK sb.Append(";"); sb.Append(" "); /// WM AN value - hodnota z analogoveho prevodnika (teraz nic) - sb.Append(";"); sb.Append(" "); /// WM Vinit - pri datastreamovych hodnotach (alebo kamera) - sb.Append(";"); sb.Append(" "); /// WM Time init ??? - sb.Append(";"); sb.Append(" "); /// WM Vend ??? - sb.Append(";"); sb.Append(" "); /// WM Time end ??? + sb.Append(";"); sb.Append(mtrRslt.VolumeStart); /// WM Volume_start - pri datastreamovych hodnotach (alebo kamera) + sb.Append(";"); sb.Append(mtrRslt.TimeStart); /// WM Time_start - ' ' - + sb.Append(";"); sb.Append(mtrRslt.VolumeEnd); /// WM Volume_end - ' ' - + sb.Append(";"); sb.Append(mtrRslt.TimeEnd); /// WM Time_end - ' ' - } for (int i = 0; i < tstRslt.CombinedMeters.Count; i++) { @@ -935,10 +935,10 @@ namespace TBF.BenchControl.Sequences bool ok = (mtrRslt.VolumeErrorPct >= tstRslt.ErrLimLo) && (mtrRslt.VolumeErrorPct <= tstRslt.ErrLimHi); sb.Append(";"); sb.Append(ok ? "OK" : "NOK"); /// WM Vysledok (t.j. ci je v hraniciach chyb) - OK/NOK sb.Append(";"); sb.Append(" "); /// WM AN value - hodnota z analogoveho prevodnika (teraz nic) - sb.Append(";"); sb.Append(" "); /// WM Vinit - pri datastreamovych hodnotach (alebo kamera) - sb.Append(";"); sb.Append(" "); /// WM Time init ??? - sb.Append(";"); sb.Append(" "); /// WM Vend ??? - sb.Append(";"); sb.Append(" "); /// WM Time end ??? + sb.Append(";"); sb.Append(mtrRslt.VolumeStart); /// WM Volume_start - pri datastreamovych hodnotach (alebo kamera) + sb.Append(";"); sb.Append(mtrRslt.TimeStart); /// WM Time_start - ' ' - + sb.Append(";"); sb.Append(mtrRslt.VolumeEnd); /// WM Volume_end - ' ' - + sb.Append(";"); sb.Append(mtrRslt.TimeEnd); /// WM Time_end - ' ' - } sb.Append(";"); diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs index 821fa8145..689ca778b 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs @@ -457,17 +457,20 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod tstRslt.Meters[i].VolumeMeter = (float)Math.Abs(iPerl.VolumeLtrEnd - iPerl.VolumeLtrStart); tstRslt.Meters[i].VolumeRef = tstRslt.VolumeCTV * (float)(iPerl.TimestampSecEnd - iPerl.TimestampSecStart) / tstRslt.Time; iPerl.VolumeLtrRef = (double)tstRslt.Meters[i].VolumeRef; - } + tstRslt.Meters[i].Time = (float)(iPerl.TimestampSecEnd - iPerl.TimestampSecStart); + tstRslt.Meters[i].TimeStart = (float)iPerl.TimestampSecStart; + tstRslt.Meters[i].TimeEnd = (float)iPerl.TimestampSecEnd; + } else { if (sensPath.RegisterReaders[i].PulsesPerLtr <= float.Epsilon) tstRslt.Meters[i].VolumeMeter = 0; else tstRslt.Meters[i].VolumeMeter = Convert.ToSingle(WMPulses[i]) / sensPath.RegisterReaders[i].PulsesPerLtr; tstRslt.Meters[i].VolumeRef = tstRslt.ConstMaster * WMRefPulses[i]; /// liter - } + tstRslt.Meters[i].Time = cBrd.TTime; + } tstRslt.Meters[i].PulsesMeter = WMPulses[i]; tstRslt.Meters[i].PulsesMaster = WMRefPulses[i]; - tstRslt.Meters[i].Time = cBrd.TTime; if (WMPulses[i] > 0 && tstRslt.Meters[i].VolumeRef > 0) { tstRslt.Meters[i].VolumeErrorPct = diff --git a/TestBenchFramework/Entities/MeterTestResult.cs b/TestBenchFramework/Entities/MeterTestResult.cs index 921cb0460..67198f8e1 100644 --- a/TestBenchFramework/Entities/MeterTestResult.cs +++ b/TestBenchFramework/Entities/MeterTestResult.cs @@ -22,6 +22,8 @@ namespace TBF.Entities public virtual float PulsesPerLiter { get; set; } /// Pulses per liter public virtual float PulsesMaster { get; set; } public virtual float Time { get; set; } /// sec. + public virtual float TimeStart { get; set; } /// sec. + public virtual float TimeEnd { get; set; } /// sec. public virtual bool Passed { get; set; } /// true = test passed public MeterTestResult() @@ -51,6 +53,8 @@ namespace TBF.Entities result.PulsesPerLiter = PulsesPerLiter; result.PulsesMaster = PulsesMaster; result.Time = Time; + result.TimeStart = TimeStart; + result.TimeEnd = TimeEnd; result.Passed = Passed; return result; diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index 1432702fe..b72772e4b 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("1.5.90.1")] -[assembly: AssemblyFileVersion("1.5.90.1")] +[assembly: AssemblyVersion("1.5.91.1")] +[assembly: AssemblyFileVersion("1.5.91.1")]