From 9ad087285424f4fc93f176984233ece497ce8264 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Wed, 4 Oct 2017 13:07:56 +0200 Subject: [PATCH] Bug fix: Error flags related bug fixed, ver. 2.17.689 --- .../BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs | 9 ++++++--- .../CombinedWithDetection/CombinedWithDetectionSeq.cs | 9 ++++++--- .../BenchControl/TestMethods/Endurance/EnduranceSeq.cs | 9 ++++++--- .../FixedStartAdvanced/FixedStartAdvancedSeq.cs | 9 ++++++--- .../FixedStartMassCollectionSeq.cs | 9 ++++++--- .../TestMethods/FlyingStart/FlyingStartSeq.cs | 9 ++++++--- .../FlyingStartMassCollectionSeq.cs | 9 ++++++--- .../ReferenceFlowmeterCalibrationSeq.cs | 9 ++++++--- TestBenchFramework/Properties/AssemblyInfo.cs | 4 ++-- 9 files changed, 50 insertions(+), 26 deletions(-) diff --git a/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs b/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs index f8ef7cc77..8f79713a5 100644 --- a/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs @@ -384,11 +384,14 @@ namespace TBF.BenchControl.TestMethods.Adjustment outPath.Diverter != null ? outPath.Diverter.Name : string.Empty)); /// Update water meter error flags - for (int i = 0; i < BatchRslts.WMPositionsCount; i++) + if (ErrorFlagsComp != null) { - if (BatchRslts.WaterMeters[i] != null) + for (int i = 0; i < BatchRslts.WMPositionsCount; i++) { - BatchRslts.WaterMeters[i].ErrorFlags = ErrorFlagsComp.GetWMtrErrorFlags(BatchRslts.WaterMeters[i].MeterTestRslts); + if (BatchRslts.WaterMeters[i] != null) + { + BatchRslts.WaterMeters[i].ErrorFlags = ErrorFlagsComp.GetWMtrErrorFlags(BatchRslts.WaterMeters[i].MeterTestRslts); + } } } diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs index ed57521ec..6a56ab0e2 100644 --- a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs @@ -712,11 +712,14 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection outPath.Diverter != null ? outPath.Diverter.Name : string.Empty)); /// Update water meter error flags - for (int i = 0; i < BatchRslts.WMPositionsCount; i++) + if (ErrorFlagsComp != null) { - if (BatchRslts.WaterMeters[i] != null) + for (int i = 0; i < BatchRslts.WMPositionsCount; i++) { - BatchRslts.WaterMeters[i].ErrorFlags = ErrorFlagsComp.GetWMtrErrorFlags(BatchRslts.WaterMeters[i].MeterTestRslts); + if (BatchRslts.WaterMeters[i] != null) + { + BatchRslts.WaterMeters[i].ErrorFlags = ErrorFlagsComp.GetWMtrErrorFlags(BatchRslts.WaterMeters[i].MeterTestRslts); + } } } diff --git a/TestBenchFramework/BenchControl/TestMethods/Endurance/EnduranceSeq.cs b/TestBenchFramework/BenchControl/TestMethods/Endurance/EnduranceSeq.cs index 5dd379cde..be7de3bf6 100644 --- a/TestBenchFramework/BenchControl/TestMethods/Endurance/EnduranceSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/Endurance/EnduranceSeq.cs @@ -440,11 +440,14 @@ namespace TBF.BenchControl.TestMethods.Endurance outPath.Diverter != null ? outPath.Diverter.Name : string.Empty)); /// Update water meter error flags - for (int i = 0; i < BatchRslts.WMPositionsCount; i++) + if (ErrorFlagsComp != null) { - if (BatchRslts.WaterMeters[i] != null) + for (int i = 0; i < BatchRslts.WMPositionsCount; i++) { - BatchRslts.WaterMeters[i].ErrorFlags = ErrorFlagsComp.GetWMtrErrorFlags(BatchRslts.WaterMeters[i].MeterTestRslts); + if (BatchRslts.WaterMeters[i] != null) + { + BatchRslts.WaterMeters[i].ErrorFlags = ErrorFlagsComp.GetWMtrErrorFlags(BatchRslts.WaterMeters[i].MeterTestRslts); + } } } diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs index e02cf59cd..628f4b64e 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs @@ -575,11 +575,14 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced outPath.Diverter != null ? outPath.Diverter.Name : string.Empty)); /// Update water meter error flags - for (int i = 0; i < BatchRslts.WMPositionsCount; i++) + if (ErrorFlagsComp != null) { - if (BatchRslts.WaterMeters[i] != null) + for (int i = 0; i < BatchRslts.WMPositionsCount; i++) { - BatchRslts.WaterMeters[i].ErrorFlags = ErrorFlagsComp.GetWMtrErrorFlags(BatchRslts.WaterMeters[i].MeterTestRslts); + if (BatchRslts.WaterMeters[i] != null) + { + BatchRslts.WaterMeters[i].ErrorFlags = ErrorFlagsComp.GetWMtrErrorFlags(BatchRslts.WaterMeters[i].MeterTestRslts); + } } } diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs index 702cdfad6..cb57baedc 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs @@ -1057,11 +1057,14 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection outPath.Diverter != null ? outPath.Diverter.Name : string.Empty)); /// Update water meter error flags - for (int i = 0; i < BatchRslts.WMPositionsCount; i++) + if (ErrorFlagsComp != null) { - if (BatchRslts.WaterMeters[i] != null) + for (int i = 0; i < BatchRslts.WMPositionsCount; i++) { - BatchRslts.WaterMeters[i].ErrorFlags = ErrorFlagsComp.GetWMtrErrorFlags(BatchRslts.WaterMeters[i].MeterTestRslts); + if (BatchRslts.WaterMeters[i] != null) + { + BatchRslts.WaterMeters[i].ErrorFlags = ErrorFlagsComp.GetWMtrErrorFlags(BatchRslts.WaterMeters[i].MeterTestRslts); + } } } diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs index c40405db2..2628518d0 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs @@ -638,11 +638,14 @@ namespace TBF.BenchControl.TestMethods.FlyingStart outPath.Diverter != null ? outPath.Diverter.Name : string.Empty)); /// Update water meter error flags - for (int i = 0; i < BatchRslts.WMPositionsCount; i++) + if (ErrorFlagsComp != null) { - if (BatchRslts.WaterMeters[i] != null) + for (int i = 0; i < BatchRslts.WMPositionsCount; i++) { - BatchRslts.WaterMeters[i].ErrorFlags = ErrorFlagsComp.GetWMtrErrorFlags(BatchRslts.WaterMeters[i].MeterTestRslts); + if (BatchRslts.WaterMeters[i] != null) + { + BatchRslts.WaterMeters[i].ErrorFlags = ErrorFlagsComp.GetWMtrErrorFlags(BatchRslts.WaterMeters[i].MeterTestRslts); + } } } diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs index 74fae4fe8..844980828 100644 --- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs @@ -1020,11 +1020,14 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection outPath.Diverter != null ? outPath.Diverter.Name : string.Empty)); /// Update water meter error flags - for (int i = 0; i < BatchRslts.WMPositionsCount; i++) + if (ErrorFlagsComp != null) { - if (BatchRslts.WaterMeters[i] != null) + for (int i = 0; i < BatchRslts.WMPositionsCount; i++) { - BatchRslts.WaterMeters[i].ErrorFlags = ErrorFlagsComp.GetWMtrErrorFlags(BatchRslts.WaterMeters[i].MeterTestRslts); + if (BatchRslts.WaterMeters[i] != null) + { + BatchRslts.WaterMeters[i].ErrorFlags = ErrorFlagsComp.GetWMtrErrorFlags(BatchRslts.WaterMeters[i].MeterTestRslts); + } } } diff --git a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs index d8ebf3418..9515ad5f3 100644 --- a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs +++ b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs @@ -365,11 +365,14 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration outPath.Diverter != null ? outPath.Diverter.Name : string.Empty)); /// Update water meter error flags - for (int i = 0; i < BatchRslts.WMPositionsCount; i++) + if (ErrorFlagsComp != null) { - if (BatchRslts.WaterMeters[i] != null) + for (int i = 0; i < BatchRslts.WMPositionsCount; i++) { - BatchRslts.WaterMeters[i].ErrorFlags = ErrorFlagsComp.GetWMtrErrorFlags(BatchRslts.WaterMeters[i].MeterTestRslts); + if (BatchRslts.WaterMeters[i] != null) + { + BatchRslts.WaterMeters[i].ErrorFlags = ErrorFlagsComp.GetWMtrErrorFlags(BatchRslts.WaterMeters[i].MeterTestRslts); + } } } diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index 4dfb24eb9..620bba9a3 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.17.687.1")] -[assembly: AssemblyFileVersion("2.17.687.1")] +[assembly: AssemblyVersion("2.17.689.1")] +[assembly: AssemblyFileVersion("2.17.689.1")]