michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug fix: Error flags related bug fixed, ver. 2.17.689

Browse Source
This commit is contained in:
Milan Hanajik
2017-10-04 13:08:28 +02:00
parent e6933922cd
commit 9ad0872854
9 changed files with 50 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs
+6 -3
View File
@@ -384,11 +384,14 @@ namespace TBF.BenchControl.TestMethods.Adjustment
outPath.Diverter != null ? outPath.Diverter.Name : string.Empty)); outPath.Diverter != null ? outPath.Diverter.Name : string.Empty));
/// Update water meter error flags /// 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);
}
} }
} }
TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs
+6 -3
View File
@@ -712,11 +712,14 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
outPath.Diverter != null ? outPath.Diverter.Name : string.Empty)); outPath.Diverter != null ? outPath.Diverter.Name : string.Empty));
/// Update water meter error flags /// 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);
}
} }
} }
TestBenchFramework/BenchControl/TestMethods/Endurance/EnduranceSeq.cs
+6 -3
View File
@@ -440,11 +440,14 @@ namespace TBF.BenchControl.TestMethods.Endurance
outPath.Diverter != null ? outPath.Diverter.Name : string.Empty)); outPath.Diverter != null ? outPath.Diverter.Name : string.Empty));
/// Update water meter error flags /// 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);
}
} }
} }
TestBenchFramework/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs
+6 -3
View File
@@ -575,11 +575,14 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced
outPath.Diverter != null ? outPath.Diverter.Name : string.Empty)); outPath.Diverter != null ? outPath.Diverter.Name : string.Empty));
/// Update water meter error flags /// 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);
}
} }
} }
TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
+6 -3
View File
@@ -1057,11 +1057,14 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
outPath.Diverter != null ? outPath.Diverter.Name : string.Empty)); outPath.Diverter != null ? outPath.Diverter.Name : string.Empty));
/// Update water meter error flags /// 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);
}
} }
} }
TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
+6 -3
View File
@@ -638,11 +638,14 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
outPath.Diverter != null ? outPath.Diverter.Name : string.Empty)); outPath.Diverter != null ? outPath.Diverter.Name : string.Empty));
/// Update water meter error flags /// 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);
}
} }
} }
TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs
+6 -3
View File
@@ -1020,11 +1020,14 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
outPath.Diverter != null ? outPath.Diverter.Name : string.Empty)); outPath.Diverter != null ? outPath.Diverter.Name : string.Empty));
/// Update water meter error flags /// 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);
}
} }
} }
TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs
+6 -3
View File
@@ -365,11 +365,14 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration
outPath.Diverter != null ? outPath.Diverter.Name : string.Empty)); outPath.Diverter != null ? outPath.Diverter.Name : string.Empty));
/// Update water meter error flags /// 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);
}
} }
} }
TestBenchFramework/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("2.17.687.1")] [assembly: AssemblyVersion("2.17.689.1")]
[assembly: AssemblyFileVersion("2.17.687.1")] [assembly: AssemblyFileVersion("2.17.689.1")]