From ad665e5f0ba5c5906210f73d4604ebcc642facca Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Sat, 17 Jan 2015 08:57:50 +0100 Subject: [PATCH] Combined meters measurement corrections, Q_rise and Q_fall in results --- TODO.txt | 1 + .../TestMethods/CombinedMeters/CombinedMetersSeq.cs | 7 +++++-- .../CombinedWithDetection/CombinedWithDetectionSeq.cs | 11 ++++++++--- TestBenchFramework/Entities/TestResult.cs | 4 +++- TestBenchFramework/Forms/ResultItemSpec.cs | 2 ++ TestBenchFramework/Mappings/TestResultMap.cs | 2 ++ 6 files changed, 21 insertions(+), 6 deletions(-) diff --git a/TODO.txt b/TODO.txt index 8d919a43b..9452965f5 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1,5 +1,6 @@ - dokoncenie process obrazovky - brat desatinnu bodku aj ciarku +- dat zapamatanie polohy RV do Parametrov BUGS HI – High importance diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs b/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs index 47318594a..c6005a0d9 100644 --- a/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs @@ -321,8 +321,11 @@ namespace TBF.BenchControl.TestMethods.CombinedMeters /// Optionally supress pulses from the large water meter if (testParams.SupressTrills) { - WMPulses[0] = 0; - tstRslt.Meters[0].PulsesMeter = 0; + for (int i = 0; i < tstRslt.Meters.Count; i += 2) + { + WMPulses[i] = 0; + tstRslt.Meters[i].PulsesMeter = 0; + } } /// diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs index b2a22208a..3c51c7f19 100644 --- a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs @@ -225,7 +225,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection } int time = StateMachine.Time; - int diff = WMPulses[1] - lastWMPulses[1]; + int diff = WMPulses[(test.Part - 1) * 2 + 1] - lastWMPulses[(test.Part - 1) * 2 + 1]; flowsForDetection[0] = cBrd.ReferenceFreq * outPath.FlowMeter.NominalFlow / 2000.0f; pulseFreqsForDetection[0] = (float)diff / (float)(time - lastTime); lastTime = StateMachine.Time; @@ -300,10 +300,12 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection if (rvPulse > 0) { Qrise = detectedFlow; + tstRslt.QRise = detectedFlow; } else { Qfall = detectedFlow; + tstRslt.QFall = detectedFlow; } UiBridge.Bridge.OnLog(this, string.Format("detected flow={0}\r\n", detectedFlow.ToString("F2"))); @@ -533,8 +535,11 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection /// Optionally supress pulses from the large water meter if (testParams.SupressTrills) { - WMPulses[0] = 0; - tstRslt.Meters[0].PulsesMeter = 0; + for (int i = 0; i < tstRslt.Meters.Count; i += 2) + { + WMPulses[i] = 0; + tstRslt.Meters[i].PulsesMeter = 0; + } } /// diff --git a/TestBenchFramework/Entities/TestResult.cs b/TestBenchFramework/Entities/TestResult.cs index 89d68530d..fda597d20 100644 --- a/TestBenchFramework/Entities/TestResult.cs +++ b/TestBenchFramework/Entities/TestResult.cs @@ -77,7 +77,9 @@ namespace TBF.Entities public virtual float ErrorMaster { get; set; } public virtual float PulsesMaster { get; set; } public virtual float ConstMaster { get; set; } /// Pulses per liter master flow meter - public virtual float TimeDivStart0 { get; set; } + public virtual float QRise { get; set; } /// Detected Q_rise of a composed meter + public virtual float QFall { get; set; } /// Detected Q_fall of a composed meter + public virtual float TimeDivStart0 { get; set; } public virtual float TimeDivStart1 { get; set; } public virtual float TimeDivStart2 { get; set; } public virtual float TimeDivStart3 { get; set; } diff --git a/TestBenchFramework/Forms/ResultItemSpec.cs b/TestBenchFramework/Forms/ResultItemSpec.cs index 1da8ea450..432494706 100644 --- a/TestBenchFramework/Forms/ResultItemSpec.cs +++ b/TestBenchFramework/Forms/ResultItemSpec.cs @@ -111,6 +111,8 @@ namespace TBF.Forms AllItems.Add(new ResultItemSpec("Reference pulses", "Ref.pulses", x => x.PulsesMaster.ToString(), null)); /// Combined water meters only results + AllItems.Add(new ResultItemSpec("Q rise", "Q rise [m3/h]", null, (x, y, z) => Utils.FloatToStr(x.TestResult.QRise, 4))); + AllItems.Add(new ResultItemSpec("Q fall", "Q fall [m3/h]", null, (x, y, z) => Utils.FloatToStr(x.TestResult.QFall, 4))); AllItems.Add(new ResultItemSpec("Error large WM", "Error-L [%]", null, (x, y, z) => x.VolumeErrorPct.ToString("F2"))); AllItems.Add(new ResultItemSpec("Error small WM", "Error-S [%]", null, (x, y, z) => y.VolumeErrorPct.ToString("F2"))); AllItems.Add(new ResultItemSpec("Serial Nr large WM", "s/n", null, (x, y, z) => x.SerialNr)); diff --git a/TestBenchFramework/Mappings/TestResultMap.cs b/TestBenchFramework/Mappings/TestResultMap.cs index e67d8e2f3..36a39fb79 100644 --- a/TestBenchFramework/Mappings/TestResultMap.cs +++ b/TestBenchFramework/Mappings/TestResultMap.cs @@ -83,6 +83,8 @@ namespace TBF.Mappings Map(x => x.ErrorMaster); Map(x => x.PulsesMaster); Map(x => x.ConstMaster); /// Pulses per liter master flow meter + Map(x => x.QRise); + Map(x => x.QFall); Map(x => x.TimeDivStart0); Map(x => x.TimeDivStart1); Map(x => x.TimeDivStart2);