diff --git a/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs b/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs index 87cc75c94..522a8c4ff 100644 --- a/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs +++ b/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs @@ -642,10 +642,11 @@ namespace TBF.BenchControl.Sequences { if (sensPath.RegisterReaders[i] != null) { - data.WmPulses[i] = WMPulses[i]; - data.WmRefPulses[i] = WMRefPulses[i]; - data.WmVolume[i] = Formulas.VolumeFromPulses(WMPulses[i], sensPath.RegisterReaders[i].PulsesPerLtr); - data.WmErrPct[i] = Formulas.ErrorFromVolumes(data.WmVolume[i], data.Volume.Val); + data.TestResult.Meters[i].PulsesMeter = WMPulses[i]; + data.TestResult.Meters[i].PulsesMaster = WMRefPulses[i]; + data.TestResult.Meters[i].VolumeMeter = Formulas.VolumeFromPulses(WMPulses[i], sensPath.RegisterReaders[i].PulsesPerLtr); + data.TestResult.Meters[i].VolumeRef = data.Volume.Val; + data.TestResult.Meters[i].VolumeErrorPct = Formulas.ErrorFromVolumes(data.TestResult.Meters[i].VolumeMeter, data.Volume.Val); } } } diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs b/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs index 9db72e833..9425e451d 100644 --- a/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs @@ -246,13 +246,20 @@ namespace TBF.BenchControl.TestMethods.CombinedMeters { logstr += string.Format(" M{0}=({1},{2})", i + 1, WMRefPulses[i], WMPulses[i]); } - log.Info(logstr); + log.Debug(logstr); float progress = Formulas.TestProgress(cBrd.EtPulses(0), totalPulses, estFlowSetTime, test.TstTime); TestProgressEventArgs data = GetTestProgressData(test, tstRslt, true, cBrd, cBrd.TTime, progress); - // TODO: The following is Munchen specific, NOK for Fuzhou150 - data.WmVolume[2] = data.WmVolume[0] + data.WmVolume[1]; - if (data.Volume.Valid) { data.WmErrPct[2] = Formulas.ErrorFromVolumes(data.WmVolume[2], data.Volume.Val); } + for (int i = 0; i < Program.WMsCount / 2; i++) + { + data.TestResult.CombinedMeters[i].VolumeMeter = data.TestResult.Meters[2 * i].VolumeMeter + + data.TestResult.Meters[2 * i + 1].VolumeMeter; + if (data.Volume.Valid) + { + data.TestResult.CombinedMeters[i].VolumeErrorPct = + Formulas.ErrorFromVolumes(data.TestResult.CombinedMeters[i].VolumeMeter, data.Volume.Val); + } + } Bridge.OnTestProgress(this, data); } /// Measurement loop - end diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs index 20f871b53..98ca7b8ae 100644 --- a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs @@ -453,13 +453,21 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection { logstr += string.Format(" M{0}=({1},{2})", i + 1, WMRefPulses[i], WMPulses[i]); } - log.Info(logstr); + log.Debug(logstr); float progress = Formulas.TestProgress(cBrd.EtPulses(0), totalPulses, estFlowSetTime, test.TstTime); TestProgressEventArgs data = GetTestProgressData(test, tstRslt, true, cBrd, cBrd.TTime, progress); - data.WmVolume[2] = data.WmVolume[0] + data.WmVolume[1]; - if (data.Volume.Valid) { data.WmErrPct[2] = Formulas.ErrorFromVolumes(data.WmVolume[2], data.Volume.Val); } + for (int i = 0; i < Program.WMsCount / 2; i++) + { + data.TestResult.CombinedMeters[i].VolumeMeter = data.TestResult.Meters[2 * i].VolumeMeter + + data.TestResult.Meters[2 * i + 1].VolumeMeter; + if (data.Volume.Valid) + { + data.TestResult.CombinedMeters[i].VolumeErrorPct = + Formulas.ErrorFromVolumes(data.TestResult.CombinedMeters[i].VolumeMeter, data.Volume.Val); + } + } Bridge.OnTestProgress(this, data); } /// Measurement loop - end diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs index 68e33dc4c..0662d702d 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs @@ -316,7 +316,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection { logstr += string.Format(" M{0}=({1},{2})", i + 1, WMRefPulses[i], WMPulses[i]); } - log.Info(logstr); + log.Debug(logstr); float progress = Formulas.TestProgress(cBrd.EtPulses(0), totalPulses, estFlowSetTime, test.TstTime); diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs index 15e42b88e..2c939ac25 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs @@ -223,7 +223,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart { logstr += string.Format(" M{0}=({1},{2})", i + 1, WMRefPulses[i], WMPulses[i]); } - log.Info(logstr); + log.Debug(logstr); float progress = Formulas.TestProgress(cBrd.EtPulses(0), totalPulses, estFlowSetTime, test.TstTime); diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs index c850cd279..8497cb879 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs @@ -254,7 +254,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod { logstr += string.Format(" M{0}=({1},{2})", i + 1, WMRefPulses[i], WMPulses[i]); } - log.Info(logstr); + log.Debug(logstr); float progress = Formulas.TestProgress(cBrd.EtPulses(0), totalPulses, estFlowSetTime, test.TstTime); diff --git a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs index df1c6682f..015152fcb 100644 --- a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs @@ -240,7 +240,7 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration { logstr += string.Format(" M{0}=({1},{2})", i + 1, WMRefPulses[i], WMPulses[i]); } - log.Info(logstr); + log.Debug(logstr); float progress = Formulas.TestProgress(cBrd.EtPulses(0), totalPulses, estFlowSetTime, test.TstTime); diff --git a/TestBenchFramework/Screens/MeasurementTabPageCtrl.cs b/TestBenchFramework/Screens/MeasurementTabPageCtrl.cs index 30e9783d9..d2894ba40 100644 --- a/TestBenchFramework/Screens/MeasurementTabPageCtrl.cs +++ b/TestBenchFramework/Screens/MeasurementTabPageCtrl.cs @@ -146,12 +146,12 @@ namespace TBF.Screens public void OnTestProgress(object sender, TestProgressEventArgs data) { - if (data.WmVolume != null) + if (data.TestResult != null) { for (int i = 0; i < Program.WMsCount; i++) { - measurementTbl1Col2.SetData(i, data.WmVolume[i].ToString("F1")); - measurementTbl1Col3.SetData(i, data.WmErrPct[i].ToString("F1")); + measurementTbl1Col2.SetData(i, data.TestResult.Meters[i].VolumeMeter.ToString("F1")); + measurementTbl1Col3.SetData(i, data.TestResult.Meters[i].VolumeErrorPct.ToString("F1")); } } measurementTbl2Col2.SetData(0, data.RefPulses); diff --git a/TestBenchFramework/Screens/ProcessTabPageCtrl.cs b/TestBenchFramework/Screens/ProcessTabPageCtrl.cs index 0af4eb74f..c30701bda 100644 --- a/TestBenchFramework/Screens/ProcessTabPageCtrl.cs +++ b/TestBenchFramework/Screens/ProcessTabPageCtrl.cs @@ -354,68 +354,65 @@ namespace TBF.Screens tDivLabel.Text = args.Tdiv.ToString(); /// Bottom part - pulses1Label.Text = args.WmPulses[0].ToString(); - refPulses1Label.Text = args.WmRefPulses[0].ToString(); - volume1Label.Text = args.WmVolume[0].ToString(); - error1Label.Text = args.WmErrPct[0].ToString(); + pulses1Label.Text = args.TestResult.Meters[0].PulsesMeter.ToString(); + refPulses1Label.Text = args.TestResult.Meters[0].PulsesMaster.ToString(); + volume1Label.Text = args.TestResult.Meters[0].VolumeMeter.ToString(); + error1Label.Text = args.TestResult.Meters[0].VolumeErrorPct.ToString(); if (Program.WMsCount >= 2) { - pulses2Label.Text = args.WmPulses[1].ToString(); - refPulses2Label.Text = args.WmRefPulses[1].ToString(); - volume2Label.Text = args.WmVolume[1].ToString(); - error2Label.Text = args.WmErrPct[1].ToString(); - } + pulses2Label.Text = args.TestResult.Meters[1].PulsesMeter.ToString(); + refPulses2Label.Text = args.TestResult.Meters[1].PulsesMaster.ToString(); + volume2Label.Text = args.TestResult.Meters[1].VolumeMeter.ToString(); + error2Label.Text = args.TestResult.Meters[1].VolumeErrorPct.ToString(); + } if (currentMetersKind == Entities.MetersKind.Combined && Program.WMsCount >= 2) { - // TODO: Fuzhou (Muenchen is OK) - volume1zLabel.Text = args.WmVolume[2].ToString(); - error1zLabel.Text = args.WmErrPct[2].ToString(); + volume1zLabel.Text = args.TestResult.CombinedMeters[0].VolumeMeter.ToString(); + error1zLabel.Text = args.TestResult.CombinedMeters[0].VolumeErrorPct.ToString(); } if ((currentMetersKind == Entities.MetersKind.Single && Program.WMsCount >= 3) || (currentMetersKind == Entities.MetersKind.Combined && Program.WMsCount >= 4)) { - pulses3Label.Text = args.WmPulses[2].ToString(); - refPulses3Label.Text = args.WmRefPulses[2].ToString(); - volume3Label.Text = args.WmVolume[2].ToString(); - error3Label.Text = args.WmErrPct[2].ToString(); - } + pulses3Label.Text = args.TestResult.Meters[2].PulsesMeter.ToString(); + refPulses3Label.Text = args.TestResult.Meters[2].PulsesMaster.ToString(); + volume3Label.Text = args.TestResult.Meters[2].VolumeMeter.ToString(); + error3Label.Text = args.TestResult.Meters[2].VolumeErrorPct.ToString(); + } if (Program.WMsCount >= 4) { - pulses4Label.Text = args.WmPulses[3].ToString(); - refPulses4Label.Text = args.WmRefPulses[3].ToString(); - volume4Label.Text = args.WmVolume[3].ToString(); - error4Label.Text = args.WmErrPct[3].ToString(); - } + pulses4Label.Text = args.TestResult.Meters[3].PulsesMeter.ToString(); + refPulses4Label.Text = args.TestResult.Meters[3].PulsesMaster.ToString(); + volume4Label.Text = args.TestResult.Meters[3].VolumeMeter.ToString(); + error4Label.Text = args.TestResult.Meters[3].VolumeErrorPct.ToString(); + } if (currentMetersKind == Entities.MetersKind.Combined && Program.WMsCount >= 4) { - // TODO: Fuzhou - volume2zLabel.Text = args.WmVolume[2].ToString(); - error2zLabel.Text = args.WmErrPct[2].ToString(); - } + volume2zLabel.Text = args.TestResult.CombinedMeters[1].VolumeMeter.ToString(); + error2zLabel.Text = args.TestResult.CombinedMeters[1].VolumeErrorPct.ToString(); + } if ((currentMetersKind == Entities.MetersKind.Single && Program.WMsCount >= 5) || (currentMetersKind == Entities.MetersKind.Combined && Program.WMsCount >= 6)) { - pulses5Label.Text = args.WmPulses[4].ToString(); - refPulses5Label.Text = args.WmRefPulses[4].ToString(); - volume5Label.Text = args.WmVolume[4].ToString(); - error5Label.Text = args.WmErrPct[4].ToString(); - } + pulses5Label.Text = args.TestResult.Meters[4].PulsesMeter.ToString(); + refPulses5Label.Text = args.TestResult.Meters[4].PulsesMaster.ToString(); + volume5Label.Text = args.TestResult.Meters[4].VolumeMeter.ToString(); + error5Label.Text = args.TestResult.Meters[4].VolumeErrorPct.ToString(); + } if (Program.WMsCount >= 6) { - pulses6Label.Text = args.WmPulses[5].ToString(); - refPulses6Label.Text = args.WmRefPulses[5].ToString(); - volume6Label.Text = args.WmVolume[5].ToString(); - error6Label.Text = args.WmErrPct[5].ToString(); - } + pulses6Label.Text = args.TestResult.Meters[5].PulsesMeter.ToString(); + refPulses6Label.Text = args.TestResult.Meters[5].PulsesMaster.ToString(); + volume6Label.Text = args.TestResult.Meters[5].VolumeMeter.ToString(); + error6Label.Text = args.TestResult.Meters[5].VolumeErrorPct.ToString(); + } if (currentMetersKind == Entities.MetersKind.Combined && Program.WMsCount >= 6) { - // TODO: Fuzhou - volume3zLabel.Text = args.WmVolume[2].ToString(); - error3zLabel.Text = args.WmErrPct[2].ToString(); - } + volume3zLabel.Text = args.TestResult.CombinedMeters[2].VolumeMeter.ToString(); + error3zLabel.Text = args.TestResult.CombinedMeters[2].VolumeErrorPct.ToString(); + } tInLabel.Text = args.Tin.ToString(); tOutLabel.Text = args.Tout.ToString(); diff --git a/TestBenchFramework/UiBridge/TestProgressEventArgs.cs b/TestBenchFramework/UiBridge/TestProgressEventArgs.cs index 1ba67c651..4149e5e84 100644 --- a/TestBenchFramework/UiBridge/TestProgressEventArgs.cs +++ b/TestBenchFramework/UiBridge/TestProgressEventArgs.cs @@ -28,11 +28,6 @@ namespace TBF.UiBridge public FloatBox AmbientPressure; public FloatBox AmbientHumidity; - public int[] WmPulses = new int[Program.WMsCount]; - public int[] WmRefPulses = new int[Program.WMsCount]; - public float[] WmVolume = new float[Program.WMsCount]; - public float[] WmErrPct = new float[Program.WMsCount]; - public Entities.TestResult TestResult; } }