From 5f21b5ab26e24c28760fe93fafab1dab2c70357d Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Mon, 10 Oct 2016 14:29:26 +0200 Subject: [PATCH] ErrorLimitHi, ErrorLimitLo, EvaluateVolume test parameters added to all heat meters methods. --- .../FixedStartMassCollectionSeq.cs | 9 ++- .../HeatMeters/TestParams.cs | 78 ++++++++++++------- .../TestMethods/FlyingStart/FlyingStartSeq.cs | 13 ++-- .../FlyingStart/HeatMeters/TestParams.cs | 78 ++++++++++++------- .../FlyingStartMassCollectionSeq.cs | 9 ++- .../HeatMeters/TestParams.cs | 78 ++++++++++++------- .../Resources/Strings.Designer.cs | 9 +++ TestBenchFramework/Resources/Strings.resx | 3 + 8 files changed, 173 insertions(+), 104 deletions(-) diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs index ddd1f5e23..9dbda39da 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs @@ -763,8 +763,9 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection volumeRslt.TestTime = tstRslt.TestTime; volumeRslt.Error = Formulas.ErrorFromVolumes(volumeRslt.VolumeMeter, volumeRslt.VolumeRef); - volumeRslt.Passed = (volumeRslt.Error >= test.ErrLimLo + test.Uncertainty) - && (volumeRslt.Error <= test.ErrLimHi - test.Uncertainty); + volumeRslt.Passed = !heatMetersTestParams.EvaluateVolume || + ((volumeRslt.Error >= test.ErrLimLo + test.Uncertainty) && + (volumeRslt.Error <= test.ErrLimHi - test.Uncertainty)); volumeRslt.TestDone = true; } @@ -779,8 +780,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection energyRslt.PulsesMaster = tstRslt.PulsesMaster; /// <----------------- ??? energyRslt.Error = Formulas.ErrorFromVolumes(energyRslt.VolumeMeter, energyRslt.VolumeRef); - energyRslt.Passed = (energyRslt.Error >= test.ErrLimLo + test.Uncertainty) - && (energyRslt.Error <= test.ErrLimHi - test.Uncertainty); + energyRslt.Passed = (energyRslt.Error >= heatMetersTestParams.ErrorLimitLo) + && (energyRslt.Error <= heatMetersTestParams.ErrorLimitHi); energyRslt.TestDone = true; } } diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestParams.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestParams.cs index e33b83dfc..519faa0f6 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestParams.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestParams.cs @@ -13,10 +13,13 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection.HeatMeters { public class TestParams : TestParamsBase, IParamsProvider, ITestParams { - public float TempWarmLo; /// Low limit for warm temperature [C] - public float TempWarmHi; /// High limit for warm temperature [C] - public float TempColdLo; /// Low limit for cold temperature [C] - public float TempColdHi; /// High limit for cold temperature [C] + public float ErrorLimitLo; /// [%] + public float ErrorLimitHi; /// [%] + public bool EvaluateVolume; /// true = evaluate also the volume, false = evaluate only energy + public float TempWarmLo; /// Low limit for warm temperature [°C] + public float TempWarmHi; /// High limit for warm temperature [°C] + public float TempColdLo; /// Low limit for cold temperature [°C] + public float TempColdHi; /// High limit for cold temperature [°C] public bool FlowMeasuredAtHiTempPipe; /// true = flow measured at high temp. pipe, false = flow measured at low temp. pipe public float DeltaTempWarm; public float DeltaTempCold; @@ -32,6 +35,9 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection.HeatMeters string[] paramNames = new string[] { + Strings.Err_limit_neg_pct_chdr, + Strings.Err_limit_pos_pct_chdr, + Strings.Evaluate_volume, "T warm lo", "T warm hi", "T cold lo", @@ -50,16 +56,19 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection.HeatMeters { switch (i) { - case 0: return TempWarmLo.ToString(); - case 1: return TempWarmHi.ToString(); - case 2: return TempColdLo.ToString(); - case 3: return TempColdHi.ToString(); - case 4: return (FlowMeasuredAtHiTempPipe ? Strings.yes : Strings.no); - case 5: return DeltaTempWarm.ToString(); - case 6: return DeltaTempCold.ToString(); - case 7: return ChangeInTimeWarm.ToString(); - case 8: return ChangeInTimeCold.ToString(); - case 9: return Prompt; + case 0: return ErrorLimitLo.ToString(); + case 1: return ErrorLimitHi.ToString(); + case 2: return (EvaluateVolume ? Strings.yes : Strings.no); + case 3: return TempWarmLo.ToString(); + case 4: return TempWarmHi.ToString(); + case 5: return TempColdLo.ToString(); + case 6: return TempColdHi.ToString(); + case 7: return (FlowMeasuredAtHiTempPipe ? Strings.yes : Strings.no); + case 8: return DeltaTempWarm.ToString(); + case 9: return DeltaTempCold.ToString(); + case 10: return ChangeInTimeWarm.ToString(); + case 11: return ChangeInTimeCold.ToString(); + case 12: return Prompt; default: return string.Empty; } } @@ -68,16 +77,19 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection.HeatMeters { switch (i) { - case 0: TempWarmLo = Utils.ParseSFloat(strValue); return; - case 1: TempWarmHi = Utils.ParseSFloat(strValue); return; - case 2: TempColdLo = Utils.ParseSFloat(strValue); return; - case 3: TempColdHi = Utils.ParseSFloat(strValue); return; - case 4: FlowMeasuredAtHiTempPipe = strValue.Equals(Strings.yes); return; - case 5: DeltaTempWarm = Utils.ParseUFloat(strValue); return; - case 6: DeltaTempCold = Utils.ParseUFloat(strValue); return; - case 7: ChangeInTimeWarm = Utils.ParseUFloat(strValue); return; - case 8: ChangeInTimeCold = Utils.ParseUFloat(strValue); return; - case 9: Prompt = strValue; return; + case 0: ErrorLimitLo = Utils.ParseSFloat(strValue); return; + case 1: ErrorLimitHi = Utils.ParseSFloat(strValue); return; + case 2: EvaluateVolume = strValue.Equals(Strings.yes); return; + case 3: TempWarmLo = Utils.ParseSFloat(strValue); return; + case 4: TempWarmHi = Utils.ParseSFloat(strValue); return; + case 5: TempColdLo = Utils.ParseSFloat(strValue); return; + case 6: TempColdHi = Utils.ParseSFloat(strValue); return; + case 7: FlowMeasuredAtHiTempPipe = strValue.Equals(Strings.yes); return; + case 8: DeltaTempWarm = Utils.ParseUFloat(strValue); return; + case 9: DeltaTempCold = Utils.ParseUFloat(strValue); return; + case 10: ChangeInTimeWarm = Utils.ParseUFloat(strValue); return; + case 11: ChangeInTimeCold = Utils.ParseUFloat(strValue); return; + case 12: Prompt = strValue; return; default: return; } } @@ -91,20 +103,23 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection.HeatMeters { case 0: case 1: - case 2: case 3: - if (Utils.TryParseSFloat(strValue, out dummy)) return true; - break; case 4: - if (strValue.Equals(Strings.yes) || strValue.Equals(Strings.no)) return true; - break; case 5: case 6: + if (Utils.TryParseSFloat(strValue, out dummy)) return true; + break; + case 2: case 7: + if (strValue.Equals(Strings.yes) || strValue.Equals(Strings.no)) return true; + break; case 8: + case 9: + case 10: + case 11: if (Utils.TryParseUFloat(strValue, out dummy)) return true; break; - case 9: + case 12: return true; default: message = "Invalid index"; @@ -117,6 +132,9 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection.HeatMeters void CopyContentTo(TestParams prms) { + prms.ErrorLimitLo = ErrorLimitLo; + prms.ErrorLimitHi = ErrorLimitHi; + prms.EvaluateVolume = EvaluateVolume; prms.TempWarmLo = TempWarmLo; prms.TempWarmHi = TempWarmHi; prms.TempColdLo = TempColdLo; diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs index 386416e28..589a6bb81 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs @@ -414,9 +414,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStart volumeRslt.TestTime = tstRslt.TestTime; /// [s] volumeRslt.Error = Formulas.ErrorFromVolumes(volumeRslt.VolumeMeter, volumeRslt.VolumeRef); - volumeRslt.Passed = (volumeRslt.Error >= test.ErrLimLo + test.Uncertainty) - && (volumeRslt.Error <= test.ErrLimHi - test.Uncertainty); - volumeRslt.TestDone = true; + volumeRslt.Passed = !heatMetersTestParams.EvaluateVolume || + ((volumeRslt.Error >= test.ErrLimLo + test.Uncertainty) && + (volumeRslt.Error <= test.ErrLimHi - test.Uncertainty)); + volumeRslt.TestDone = true; } if (energyRslt != null && energyRegReader != null) @@ -431,9 +432,9 @@ namespace TBF.BenchControl.TestMethods.FlyingStart energyRslt.TestTime = tstRslt.TestTime; /// [s] energyRslt.Error = Formulas.ErrorFromVolumes(energyRslt.VolumeMeter, energyRslt.VolumeRef); - energyRslt.Passed = (energyRslt.Error >= test.ErrLimLo + test.Uncertainty) - && (energyRslt.Error <= test.ErrLimHi - test.Uncertainty); - energyRslt.TestDone = true; + energyRslt.Passed = (energyRslt.Error >= heatMetersTestParams.ErrorLimitLo) + && (energyRslt.Error <= heatMetersTestParams.ErrorLimitHi); + energyRslt.TestDone = true; } } } diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/HeatMeters/TestParams.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/HeatMeters/TestParams.cs index cb2ee385e..1471b52e2 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/HeatMeters/TestParams.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/HeatMeters/TestParams.cs @@ -13,10 +13,13 @@ namespace TBF.BenchControl.TestMethods.FlyingStart.HeatMeters { public class TestParams : TestParamsBase, IParamsProvider, ITestParams { - public float TempWarmLo; /// Low limit for warm temperature [C] - public float TempWarmHi; /// High limit for warm temperature [C] - public float TempColdLo; /// Low limit for cold temperature [C] - public float TempColdHi; /// High limit for cold temperature [C] + public float ErrorLimitLo; /// [%] + public float ErrorLimitHi; /// [%] + public bool EvaluateVolume; /// true = evaluate also the volume, false = evaluate only energy + public float TempWarmLo; /// Low limit for warm temperature [°C] + public float TempWarmHi; /// High limit for warm temperature [°C] + public float TempColdLo; /// Low limit for cold temperature [°C] + public float TempColdHi; /// High limit for cold temperature [°C] public bool FlowMeasuredAtHiTempPipe; /// true = flow measured at high temp. pipe, false = flow measured at low temp. pipe public float DeltaTempWarm; public float DeltaTempCold; @@ -32,6 +35,9 @@ namespace TBF.BenchControl.TestMethods.FlyingStart.HeatMeters string[] paramNames = new string[] { + Strings.Err_limit_neg_pct_chdr, + Strings.Err_limit_pos_pct_chdr, + Strings.Evaluate_volume, "T warm lo", "T warm hi", "T cold lo", @@ -50,16 +56,19 @@ namespace TBF.BenchControl.TestMethods.FlyingStart.HeatMeters { switch (i) { - case 0: return TempWarmLo.ToString(); - case 1: return TempWarmHi.ToString(); - case 2: return TempColdLo.ToString(); - case 3: return TempColdHi.ToString(); - case 4: return (FlowMeasuredAtHiTempPipe ? Strings.yes : Strings.no); - case 5: return DeltaTempWarm.ToString(); - case 6: return DeltaTempCold.ToString(); - case 7: return ChangeInTimeWarm.ToString(); - case 8: return ChangeInTimeCold.ToString(); - case 9: return Prompt; + case 0: return ErrorLimitLo.ToString(); + case 1: return ErrorLimitHi.ToString(); + case 2: return (EvaluateVolume ? Strings.yes : Strings.no); + case 3: return TempWarmLo.ToString(); + case 4: return TempWarmHi.ToString(); + case 5: return TempColdLo.ToString(); + case 6: return TempColdHi.ToString(); + case 7: return (FlowMeasuredAtHiTempPipe ? Strings.yes : Strings.no); + case 8: return DeltaTempWarm.ToString(); + case 9: return DeltaTempCold.ToString(); + case 10: return ChangeInTimeWarm.ToString(); + case 11: return ChangeInTimeCold.ToString(); + case 12: return Prompt; default: return string.Empty; } } @@ -68,16 +77,19 @@ namespace TBF.BenchControl.TestMethods.FlyingStart.HeatMeters { switch (i) { - case 0: TempWarmLo = Utils.ParseSFloat(strValue); return; - case 1: TempWarmHi = Utils.ParseSFloat(strValue); return; - case 2: TempColdLo = Utils.ParseSFloat(strValue); return; - case 3: TempColdHi = Utils.ParseSFloat(strValue); return; - case 4: FlowMeasuredAtHiTempPipe = strValue.Equals(Strings.yes); return; - case 5: DeltaTempWarm = Utils.ParseUFloat(strValue); return; - case 6: DeltaTempCold = Utils.ParseUFloat(strValue); return; - case 7: ChangeInTimeWarm = Utils.ParseUFloat(strValue); return; - case 8: ChangeInTimeCold = Utils.ParseUFloat(strValue); return; - case 9: Prompt = strValue; return; + case 0: ErrorLimitLo = Utils.ParseSFloat(strValue); return; + case 1: ErrorLimitHi = Utils.ParseSFloat(strValue); return; + case 2: EvaluateVolume = strValue.Equals(Strings.yes); return; + case 3: TempWarmLo = Utils.ParseSFloat(strValue); return; + case 4: TempWarmHi = Utils.ParseSFloat(strValue); return; + case 5: TempColdLo = Utils.ParseSFloat(strValue); return; + case 6: TempColdHi = Utils.ParseSFloat(strValue); return; + case 7: FlowMeasuredAtHiTempPipe = strValue.Equals(Strings.yes); return; + case 8: DeltaTempWarm = Utils.ParseUFloat(strValue); return; + case 9: DeltaTempCold = Utils.ParseUFloat(strValue); return; + case 10: ChangeInTimeWarm = Utils.ParseUFloat(strValue); return; + case 11: ChangeInTimeCold = Utils.ParseUFloat(strValue); return; + case 12: Prompt = strValue; return; default: return; } } @@ -91,20 +103,23 @@ namespace TBF.BenchControl.TestMethods.FlyingStart.HeatMeters { case 0: case 1: - case 2: case 3: - if (Utils.TryParseSFloat(strValue, out dummy)) return true; - break; case 4: - if (strValue.Equals(Strings.yes) || strValue.Equals(Strings.no)) return true; - break; case 5: case 6: + if (Utils.TryParseSFloat(strValue, out dummy)) return true; + break; + case 2: case 7: + if (strValue.Equals(Strings.yes) || strValue.Equals(Strings.no)) return true; + break; case 8: + case 9: + case 10: + case 11: if (Utils.TryParseUFloat(strValue, out dummy)) return true; break; - case 9: + case 12: return true; default: message = "Invalid index"; @@ -117,6 +132,9 @@ namespace TBF.BenchControl.TestMethods.FlyingStart.HeatMeters void CopyContentTo(TestParams prms) { + prms.ErrorLimitLo = ErrorLimitLo; + prms.ErrorLimitHi = ErrorLimitHi; + prms.EvaluateVolume = EvaluateVolume; prms.TempWarmLo = TempWarmLo; prms.TempWarmHi = TempWarmHi; prms.TempColdLo = TempColdLo; diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs index bb769170f..c62ea8f8c 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs @@ -687,8 +687,9 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection volumeRslt.TestTime = tstRslt.TestTime; /// [s] volumeRslt.Error = Formulas.ErrorFromVolumes(volumeRslt.VolumeMeter, volumeRslt.VolumeRef); - volumeRslt.Passed = (volumeRslt.Error >= test.ErrLimLo + test.Uncertainty) - && (volumeRslt.Error <= test.ErrLimHi - test.Uncertainty); + volumeRslt.Passed = !heatMetersTestParams.EvaluateVolume || + ((volumeRslt.Error >= test.ErrLimLo + test.Uncertainty) && + (volumeRslt.Error <= test.ErrLimHi - test.Uncertainty)); volumeRslt.TestDone = true; } @@ -704,8 +705,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection energyRslt.TestTime = tstRslt.TestTime; /// [s] energyRslt.Error = Formulas.ErrorFromVolumes(energyRslt.VolumeMeter, energyRslt.VolumeRef); - energyRslt.Passed = (energyRslt.Error >= test.ErrLimLo + test.Uncertainty) - && (energyRslt.Error <= test.ErrLimHi - test.Uncertainty); + energyRslt.Passed = (energyRslt.Error >= heatMetersTestParams.ErrorLimitLo) + && (energyRslt.Error <= heatMetersTestParams.ErrorLimitHi); energyRslt.TestDone = true; } } diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestParams.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestParams.cs index 435eba972..72fdc4c52 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestParams.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestParams.cs @@ -13,10 +13,13 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection.HeatMeters { public class TestParams : TestParamsBase, IParamsProvider, ITestParams { - public float TempWarmLo; /// Low limit for warm temperature [C] - public float TempWarmHi; /// High limit for warm temperature [C] - public float TempColdLo; /// Low limit for cold temperature [C] - public float TempColdHi; /// High limit for cold temperature [C] + public float ErrorLimitLo; /// [%] + public float ErrorLimitHi; /// [%] + public bool EvaluateVolume; /// true = evaluate also the volume, false = evaluate only energy + public float TempWarmLo; /// Low limit for warm temperature [°C] + public float TempWarmHi; /// High limit for warm temperature [°C] + public float TempColdLo; /// Low limit for cold temperature [°C] + public float TempColdHi; /// High limit for cold temperature [°C] public bool FlowMeasuredAtHiTempPipe; /// true = flow measured at high temp. pipe, false = flow measured at low temp. pipe public float DeltaTempWarm; public float DeltaTempCold; @@ -32,6 +35,9 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection.HeatMeters string[] paramNames = new string[] { + Strings.Err_limit_neg_pct_chdr, + Strings.Err_limit_pos_pct_chdr, + Strings.Evaluate_volume, "T warm lo", "T warm hi", "T cold lo", @@ -50,16 +56,19 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection.HeatMeters { switch (i) { - case 0: return TempWarmLo.ToString(); - case 1: return TempWarmHi.ToString(); - case 2: return TempColdLo.ToString(); - case 3: return TempColdHi.ToString(); - case 4: return (FlowMeasuredAtHiTempPipe ? Strings.yes : Strings.no); - case 5: return DeltaTempWarm.ToString(); - case 6: return DeltaTempCold.ToString(); - case 7: return ChangeInTimeWarm.ToString(); - case 8: return ChangeInTimeCold.ToString(); - case 9: return Prompt; + case 0: return ErrorLimitLo.ToString(); + case 1: return ErrorLimitHi.ToString(); + case 2: return (EvaluateVolume ? Strings.yes : Strings.no); + case 3: return TempWarmLo.ToString(); + case 4: return TempWarmHi.ToString(); + case 5: return TempColdLo.ToString(); + case 6: return TempColdHi.ToString(); + case 7: return (FlowMeasuredAtHiTempPipe ? Strings.yes : Strings.no); + case 8: return DeltaTempWarm.ToString(); + case 9: return DeltaTempCold.ToString(); + case 10: return ChangeInTimeWarm.ToString(); + case 11: return ChangeInTimeCold.ToString(); + case 12: return Prompt; default: return string.Empty; } } @@ -68,16 +77,19 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection.HeatMeters { switch (i) { - case 0: TempWarmLo = Utils.ParseSFloat(strValue); return; - case 1: TempWarmHi = Utils.ParseSFloat(strValue); return; - case 2: TempColdLo = Utils.ParseSFloat(strValue); return; - case 3: TempColdHi = Utils.ParseSFloat(strValue); return; - case 4: FlowMeasuredAtHiTempPipe = strValue.Equals(Strings.yes); return; - case 5: DeltaTempWarm = Utils.ParseUFloat(strValue); return; - case 6: DeltaTempCold = Utils.ParseUFloat(strValue); return; - case 7: ChangeInTimeWarm = Utils.ParseUFloat(strValue); return; - case 8: ChangeInTimeCold = Utils.ParseUFloat(strValue); return; - case 9: Prompt = strValue; return; + case 0: ErrorLimitLo = Utils.ParseSFloat(strValue); return; + case 1: ErrorLimitHi = Utils.ParseSFloat(strValue); return; + case 2: EvaluateVolume = strValue.Equals(Strings.yes); return; + case 3: TempWarmLo = Utils.ParseSFloat(strValue); return; + case 4: TempWarmHi = Utils.ParseSFloat(strValue); return; + case 5: TempColdLo = Utils.ParseSFloat(strValue); return; + case 6: TempColdHi = Utils.ParseSFloat(strValue); return; + case 7: FlowMeasuredAtHiTempPipe = strValue.Equals(Strings.yes); return; + case 8: DeltaTempWarm = Utils.ParseUFloat(strValue); return; + case 9: DeltaTempCold = Utils.ParseUFloat(strValue); return; + case 10: ChangeInTimeWarm = Utils.ParseUFloat(strValue); return; + case 11: ChangeInTimeCold = Utils.ParseUFloat(strValue); return; + case 12: Prompt = strValue; return; default: return; } } @@ -91,20 +103,23 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection.HeatMeters { case 0: case 1: - case 2: case 3: - if (Utils.TryParseSFloat(strValue, out dummy)) return true; - break; case 4: - if (strValue.Equals(Strings.yes) || strValue.Equals(Strings.no)) return true; - break; case 5: case 6: + if (Utils.TryParseSFloat(strValue, out dummy)) return true; + break; + case 2: case 7: + if (strValue.Equals(Strings.yes) || strValue.Equals(Strings.no)) return true; + break; case 8: + case 9: + case 10: + case 11: if (Utils.TryParseUFloat(strValue, out dummy)) return true; break; - case 9: + case 12: return true; default: message = "Invalid index"; @@ -117,6 +132,9 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection.HeatMeters void CopyContentTo(TestParams prms) { + prms.ErrorLimitLo = ErrorLimitLo; + prms.ErrorLimitHi = ErrorLimitHi; + prms.EvaluateVolume = EvaluateVolume; prms.TempWarmLo = TempWarmLo; prms.TempWarmHi = TempWarmHi; prms.TempColdLo = TempColdLo; diff --git a/TestBenchFramework/Resources/Strings.Designer.cs b/TestBenchFramework/Resources/Strings.Designer.cs index 97dc90e7c..ecb66501d 100644 --- a/TestBenchFramework/Resources/Strings.Designer.cs +++ b/TestBenchFramework/Resources/Strings.Designer.cs @@ -1311,6 +1311,15 @@ namespace TBF.Resources { } } + /// + /// Looks up a localized string similar to Evaluate volume. + /// + internal static string Evaluate_volume { + get { + return ResourceManager.GetString("Evaluate_volume", resourceCulture); + } + } + /// /// Looks up a localized string similar to Exit. /// diff --git a/TestBenchFramework/Resources/Strings.resx b/TestBenchFramework/Resources/Strings.resx index 764314823..96a52c9d7 100644 --- a/TestBenchFramework/Resources/Strings.resx +++ b/TestBenchFramework/Resources/Strings.resx @@ -1588,4 +1588,7 @@ Pulses per kWh + + Evaluate volume + \ No newline at end of file