Bug fix: Error flags related bug fixed, ver. 2.17.689
This commit is contained in:
@@ -384,12 +384,15 @@ 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
|
||||||
|
if (ErrorFlagsComp != null)
|
||||||
|
{
|
||||||
for (int i = 0; i < BatchRslts.WMPositionsCount; i++)
|
for (int i = 0; i < BatchRslts.WMPositionsCount; i++)
|
||||||
{
|
{
|
||||||
if (BatchRslts.WaterMeters[i] != null)
|
if (BatchRslts.WaterMeters[i] != null)
|
||||||
{
|
{
|
||||||
BatchRslts.WaterMeters[i].ErrorFlags = ErrorFlagsComp.GetWMtrErrorFlags(BatchRslts.WaterMeters[i].MeterTestRslts);
|
BatchRslts.WaterMeters[i].ErrorFlags = ErrorFlagsComp.GetWMtrErrorFlags(BatchRslts.WaterMeters[i].MeterTestRslts);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Update results
|
/// Update results
|
||||||
|
|||||||
+3
@@ -712,6 +712,8 @@ 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
|
||||||
|
if (ErrorFlagsComp != null)
|
||||||
|
{
|
||||||
for (int i = 0; i < BatchRslts.WMPositionsCount; i++)
|
for (int i = 0; i < BatchRslts.WMPositionsCount; i++)
|
||||||
{
|
{
|
||||||
if (BatchRslts.WaterMeters[i] != null)
|
if (BatchRslts.WaterMeters[i] != null)
|
||||||
@@ -719,6 +721,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
|
|||||||
BatchRslts.WaterMeters[i].ErrorFlags = ErrorFlagsComp.GetWMtrErrorFlags(BatchRslts.WaterMeters[i].MeterTestRslts);
|
BatchRslts.WaterMeters[i].ErrorFlags = ErrorFlagsComp.GetWMtrErrorFlags(BatchRslts.WaterMeters[i].MeterTestRslts);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// Update results
|
/// Update results
|
||||||
Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, tstRslt));
|
Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, tstRslt));
|
||||||
|
|||||||
@@ -440,6 +440,8 @@ 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
|
||||||
|
if (ErrorFlagsComp != null)
|
||||||
|
{
|
||||||
for (int i = 0; i < BatchRslts.WMPositionsCount; i++)
|
for (int i = 0; i < BatchRslts.WMPositionsCount; i++)
|
||||||
{
|
{
|
||||||
if (BatchRslts.WaterMeters[i] != null)
|
if (BatchRslts.WaterMeters[i] != null)
|
||||||
@@ -447,6 +449,7 @@ namespace TBF.BenchControl.TestMethods.Endurance
|
|||||||
BatchRslts.WaterMeters[i].ErrorFlags = ErrorFlagsComp.GetWMtrErrorFlags(BatchRslts.WaterMeters[i].MeterTestRslts);
|
BatchRslts.WaterMeters[i].ErrorFlags = ErrorFlagsComp.GetWMtrErrorFlags(BatchRslts.WaterMeters[i].MeterTestRslts);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// Update results
|
/// Update results
|
||||||
Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, tstRslt));
|
Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, tstRslt));
|
||||||
|
|||||||
+3
@@ -575,6 +575,8 @@ 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
|
||||||
|
if (ErrorFlagsComp != null)
|
||||||
|
{
|
||||||
for (int i = 0; i < BatchRslts.WMPositionsCount; i++)
|
for (int i = 0; i < BatchRslts.WMPositionsCount; i++)
|
||||||
{
|
{
|
||||||
if (BatchRslts.WaterMeters[i] != null)
|
if (BatchRslts.WaterMeters[i] != null)
|
||||||
@@ -582,6 +584,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced
|
|||||||
BatchRslts.WaterMeters[i].ErrorFlags = ErrorFlagsComp.GetWMtrErrorFlags(BatchRslts.WaterMeters[i].MeterTestRslts);
|
BatchRslts.WaterMeters[i].ErrorFlags = ErrorFlagsComp.GetWMtrErrorFlags(BatchRslts.WaterMeters[i].MeterTestRslts);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// Update results
|
/// Update results
|
||||||
Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, tstRslt));
|
Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, tstRslt));
|
||||||
|
|||||||
+3
@@ -1057,6 +1057,8 @@ 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
|
||||||
|
if (ErrorFlagsComp != null)
|
||||||
|
{
|
||||||
for (int i = 0; i < BatchRslts.WMPositionsCount; i++)
|
for (int i = 0; i < BatchRslts.WMPositionsCount; i++)
|
||||||
{
|
{
|
||||||
if (BatchRslts.WaterMeters[i] != null)
|
if (BatchRslts.WaterMeters[i] != null)
|
||||||
@@ -1064,6 +1066,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
|
|||||||
BatchRslts.WaterMeters[i].ErrorFlags = ErrorFlagsComp.GetWMtrErrorFlags(BatchRslts.WaterMeters[i].MeterTestRslts);
|
BatchRslts.WaterMeters[i].ErrorFlags = ErrorFlagsComp.GetWMtrErrorFlags(BatchRslts.WaterMeters[i].MeterTestRslts);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// Update results
|
/// Update results
|
||||||
Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, tstRslt));
|
Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, tstRslt));
|
||||||
|
|||||||
@@ -638,6 +638,8 @@ 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
|
||||||
|
if (ErrorFlagsComp != null)
|
||||||
|
{
|
||||||
for (int i = 0; i < BatchRslts.WMPositionsCount; i++)
|
for (int i = 0; i < BatchRslts.WMPositionsCount; i++)
|
||||||
{
|
{
|
||||||
if (BatchRslts.WaterMeters[i] != null)
|
if (BatchRslts.WaterMeters[i] != null)
|
||||||
@@ -645,6 +647,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
|
|||||||
BatchRslts.WaterMeters[i].ErrorFlags = ErrorFlagsComp.GetWMtrErrorFlags(BatchRslts.WaterMeters[i].MeterTestRslts);
|
BatchRslts.WaterMeters[i].ErrorFlags = ErrorFlagsComp.GetWMtrErrorFlags(BatchRslts.WaterMeters[i].MeterTestRslts);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// Update results
|
/// Update results
|
||||||
Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, tstRslt));
|
Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, tstRslt));
|
||||||
|
|||||||
+3
@@ -1020,12 +1020,15 @@ 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
|
||||||
|
if (ErrorFlagsComp != null)
|
||||||
|
{
|
||||||
for (int i = 0; i < BatchRslts.WMPositionsCount; i++)
|
for (int i = 0; i < BatchRslts.WMPositionsCount; i++)
|
||||||
{
|
{
|
||||||
if (BatchRslts.WaterMeters[i] != null)
|
if (BatchRslts.WaterMeters[i] != null)
|
||||||
{
|
{
|
||||||
BatchRslts.WaterMeters[i].ErrorFlags = ErrorFlagsComp.GetWMtrErrorFlags(BatchRslts.WaterMeters[i].MeterTestRslts);
|
BatchRslts.WaterMeters[i].ErrorFlags = ErrorFlagsComp.GetWMtrErrorFlags(BatchRslts.WaterMeters[i].MeterTestRslts);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Update results
|
/// Update results
|
||||||
|
|||||||
+3
@@ -365,6 +365,8 @@ 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
|
||||||
|
if (ErrorFlagsComp != null)
|
||||||
|
{
|
||||||
for (int i = 0; i < BatchRslts.WMPositionsCount; i++)
|
for (int i = 0; i < BatchRslts.WMPositionsCount; i++)
|
||||||
{
|
{
|
||||||
if (BatchRslts.WaterMeters[i] != null)
|
if (BatchRslts.WaterMeters[i] != null)
|
||||||
@@ -372,6 +374,7 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration
|
|||||||
BatchRslts.WaterMeters[i].ErrorFlags = ErrorFlagsComp.GetWMtrErrorFlags(BatchRslts.WaterMeters[i].MeterTestRslts);
|
BatchRslts.WaterMeters[i].ErrorFlags = ErrorFlagsComp.GetWMtrErrorFlags(BatchRslts.WaterMeters[i].MeterTestRslts);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// Update results
|
/// Update results
|
||||||
Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, tstRslt));
|
Bridge.OnTestCompleted(this, new TestCompletedEventArgs(testName, tstRslt));
|
||||||
|
|||||||
@@ -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")]
|
||||||
|
|||||||
Reference in New Issue
Block a user