diff --git a/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs b/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs
index 1cfe06117..3598de81d 100644
--- a/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs
+++ b/TestBenchFramework/BenchControl/Sequences/SequenceBase.cs
@@ -18,6 +18,8 @@ namespace TBF.BenchControl.Sequences
{
private static readonly ILog log = LogManager.GetLogger(typeof(SequenceBase));
protected static readonly ILog processDataLogger = LogManager.GetLogger("ProcessData");
+ protected static readonly ILog allResults = LogManager.GetLogger("AllResults");
+ protected static readonly ILog summaryResults = LogManager.GetLogger("SummaryResults");
///------------------------------------------------------------
/// Global static variables set only once.
diff --git a/TestBenchFramework/BenchControl/TbfComponents.cs b/TestBenchFramework/BenchControl/TbfComponents.cs
index 5ddede576..c88ee370e 100644
--- a/TestBenchFramework/BenchControl/TbfComponents.cs
+++ b/TestBenchFramework/BenchControl/TbfComponents.cs
@@ -57,9 +57,15 @@ namespace TBF.BenchControl
return null;
}
+ ///
+ /// Get a component configuration given a component DB entity
+ ///
+ /// DB entity
+ /// An appropriate component configuration or null if factory was not found
public static IComponentCfg CmpntCfgFromCmpntEntity(Entities.Component entity)
{
- return CmpntFactoryFromClassName(entity.ClassName).CmpntCfgFromCmpntEntity(entity);
+ IComponentFactory cmpntFactory = CmpntFactoryFromClassName(entity.ClassName);
+ return (cmpntFactory != null) ? cmpntFactory.CmpntCfgFromCmpntEntity(entity) : null;
}
///
@@ -81,9 +87,11 @@ namespace TBF.BenchControl
IList components = new List();
foreach (var entity in cmptnEntities)
{
- IComponent cmpnt = BenchControl.TbfComponents
- .CmpntFactoryFromClassName(entity.ClassName)
- .ComponentFromCmpntCfg(BenchControl.TbfComponents.CmpntCfgFromCmpntEntity(entity), components);
+ IComponentFactory cmpntFactory = BenchControl.TbfComponents.CmpntFactoryFromClassName(entity.ClassName);
+ if (cmpntFactory == null) continue;
+
+ IComponent cmpnt = cmpntFactory
+ .ComponentFromCmpntCfg(BenchControl.TbfComponents.CmpntCfgFromCmpntEntity(entity), components);
/// Inherit DebugMode from the parent (if any)
if ((cmpnt.Cfg.DebugLevel == Entities.DebugMode.Inherit) &&
diff --git a/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetectionSeq.cs
index 5defb26a3..e15967ed1 100644
--- a/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetectionSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/CameraRoiDetection/RoiDetectionSeq.cs
@@ -10,8 +10,6 @@ namespace TBF.BenchControl.TestMethods.CameraRoiDetection
public class RoiDetectionSeq : Sequences.SequenceBase
{
private static readonly ILog log = LogManager.GetLogger(typeof(RoiDetectionSeq));
- private static readonly ILog allResults = LogManager.GetLogger("AllResults");
- private static readonly ILog summaryResults = LogManager.GetLogger("SummaryResults");
public IList Execute(Entities.Test test)
diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs b/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs
index 4f5ed90df..4764c885d 100644
--- a/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/CombinedMeters/CombinedMetersSeq.cs
@@ -12,9 +12,6 @@ namespace TBF.BenchControl.TestMethods.CombinedMeters
public class CombinedMetersSeq : Sequences.SequenceBase
{
private static readonly ILog log = LogManager.GetLogger(typeof(CombinedMetersSeq));
- private static readonly ILog allResults = LogManager.GetLogger("AllResults");
- private static readonly ILog summaryResults = LogManager.GetLogger("SummaryResults");
- private static readonly ILog processDataLog = LogManager.GetLogger("ProcessData");
///
/// Flying start mass collection method sequence for combined meter
diff --git a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs
index 9f719ac60..989d3c737 100644
--- a/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs
@@ -11,9 +11,6 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
public class CombinedWithDetectionSeq : Sequences.SequenceBase
{
private static readonly ILog log = LogManager.GetLogger(typeof(CombinedWithDetectionSeq));
- private static readonly ILog allResults = LogManager.GetLogger("AllResults");
- private static readonly ILog summaryResults = LogManager.GetLogger("SummaryResults");
- private static readonly ILog processDataLog = LogManager.GetLogger("ProcessData");
const int DetectionBufferSize = 9;
const int DetectionKernelSize = 5;
diff --git a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
index a04e633e8..8feec2d99 100644
--- a/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
@@ -12,9 +12,6 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
public class FixedStartMassCollectionSeq : Sequences.SequenceBase
{
private static readonly ILog log = LogManager.GetLogger(typeof(FixedStartMassCollectionSeq));
- private static readonly ILog allResults = LogManager.GetLogger("AllResults");
- private static readonly ILog summaryResults = LogManager.GetLogger("SummaryResults");
- private static readonly ILog processDataLog = LogManager.GetLogger("ProcessData");
///
/// Flying start mass collection method sequence
@@ -69,7 +66,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
///
/// Measure the weight and skip emptying if there is enough room in the tank
///
- State.Create("FlyingStartCollectionMethod : Measuring the mass of water in the tank")
+ State.Create("FixedStartMassCollection : Measuring the mass of water in the tank")
.AddOperation(checkUiOp)
.AddOperation(outPath.Balance.ReadMassOp(ref mass))
.EnterState();
@@ -106,7 +103,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
Bridge.OnActivity(this, Strings.Setting_the_flow);
//------------------------------------------------
foreach (var pump in PumpsWithFM) pump.TurnOnDfltPower();
- State.Create("FlyingStartCollectionMethod : Starting the pump")
+ State.Create("FixedStartMassCollection : Starting the pump")
.AddOperation(checkUiOp)
.AddOperation(cBrd.SetValvesOp(inPath.Pump, null))
.EnterState();
@@ -123,7 +120,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
while (!e.Contains(Event.ValvesSet));
//--------------------------------
- State.Create("FlyingStartCollectionMethod : Setting the flow")
+ State.Create("FixedStartMassCollection : Setting the flow")
.AddOperation(checkUiOp)
.AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, test.Qfrom, test.Qto, refFlow, 600)) /// timeout = 10 min.
.EnterState();
@@ -143,6 +140,13 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
while (!e.Contains(Event.FlowReached));
flow_set:
+
+ ////------------------------------------------------
+ //Bridge.OnActivity(this, Strings.Stopping_the_flow_fixed_start);
+ ////------------------------------------------------
+ //State.Create("FixedStartMassCollection : Stopping the flow (fixed start test)")
+ // .AddOperation(checkUiOp)
+
int time = StateMachine.Time;
float currentFlow = refFlow.Val;
@@ -157,7 +161,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
//------------------------------------------------
Bridge.OnActivity(this, Strings.Measuring_the_weight);
//------------------------------------------------
- State.Create("FlyingStartCollectionMethod : Measuring the start mass")
+ State.Create("FixedStartMassCollection : Measuring the start mass")
.AddOperation(checkUiOp)
.AddOperation(benchPath.TempIn.ReadTempOp(ref tempIn))
.AddOperation(benchPath.TempOut.ReadTempOp(ref tempOut))
@@ -186,7 +190,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
//------------------------------------------------
Bridge.OnActivity(this, Strings.Test_in_progress);
//------------------------------------------------
- State.Create("FlyingStartCollectionMethod : Starting the test")
+ State.Create("FixedStartMassCollection : Starting the test")
.AddOperation(checkUiOp)
.AddOperations(measureOperations)
.AddOperation(cBrd.StartMeasurementOp(outPath.FlowMeter, totalPulses, Elde.TestMethods.Diverter | Elde.TestMethods.Synchro, (float)test.TolerRed))
@@ -263,7 +267,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
//------------------------------------------------
Bridge.OnActivity(this, Strings.Measuring_the_weight);
//------------------------------------------------
- State.Create("FlyingStartCollectionMethod : Measuring the end mass")
+ State.Create("FixedStartMassCollection : Measuring the end mass")
.AddOperation(checkUiOp)
.AddOperation(benchPath.TempIn.ReadTempOp(ref tempIn))
.AddOperation(benchPath.TempOut.ReadTempOp(ref tempOut))
@@ -380,7 +384,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
/// Quit this sequence ///
///----------------------///
- State.Create("FlyingStartCollectionMethod : Stopping diverter, gate, etc.")
+ State.Create("FixedStartMassCollection : Stopping diverter, gate, etc.")
.AddOperation(checkUiOp)
.AddOperation(cBrd.StopPreviousOp())
.EnterState();
diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
index 3ab018380..f09bb5fae 100644
--- a/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
@@ -12,9 +12,6 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
public class FlyingStartSeq : Sequences.SequenceBase
{
private static readonly ILog log = LogManager.GetLogger(typeof(FlyingStartSeq));
- private static readonly ILog allResults = LogManager.GetLogger("AllResults");
- private static readonly ILog summaryResults = LogManager.GetLogger("SummaryResults");
- private static readonly ILog processDataLog = LogManager.GetLogger("ProcessData");
///
/// Flying start mass collection method sequence
diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs
index 66eef7b80..01607b799 100644
--- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartCollectionMethod/FlyingStartCollectionMethodSeq.cs
@@ -12,8 +12,6 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
public class FlyingStartCollectionMethodSeq : Sequences.SequenceBase
{
private static readonly ILog log = LogManager.GetLogger(typeof(FlyingStartCollectionMethodSeq));
- private static readonly ILog allResults = LogManager.GetLogger("AllResults");
- private static readonly ILog summaryResults = LogManager.GetLogger("SummaryResults");
///
/// Flying start mass collection method sequence
@@ -142,6 +140,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartCollectionMethod
while (!e.Contains(Event.FlowReached));
flow_set:
+
int time = StateMachine.Time;
float currentFlow = refFlow.Val;
diff --git a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs
index aa08107f3..abfcf8a08 100644
--- a/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs
@@ -12,9 +12,6 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration
public class ReferenceFlowmeterCalibrationSeq : Sequences.SequenceBase
{
private static readonly ILog log = LogManager.GetLogger(typeof(ReferenceFlowmeterCalibrationSeq));
- private static readonly ILog allResults = LogManager.GetLogger("AllResults");
- private static readonly ILog summaryResults = LogManager.GetLogger("SummaryResults");
- private static readonly ILog processDataLog = LogManager.GetLogger("ProcessData");
///
/// Flying start mass collection method sequence
diff --git a/TestBenchFramework/Resources/Strings.Designer.cs b/TestBenchFramework/Resources/Strings.Designer.cs
index f7d5dffcb..43966b9ff 100644
--- a/TestBenchFramework/Resources/Strings.Designer.cs
+++ b/TestBenchFramework/Resources/Strings.Designer.cs
@@ -1662,6 +1662,15 @@ namespace TBF.Resources {
}
}
+ ///
+ /// Looks up a localized string similar to Stopping the flow (fixed start test).
+ ///
+ internal static string Stopping_the_flow_fixed_start {
+ get {
+ return ResourceManager.GetString("Stopping_the_flow_fixed_start", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized string similar to .
///
diff --git a/TestBenchFramework/Resources/Strings.resx b/TestBenchFramework/Resources/Strings.resx
index 72ce27823..545da4116 100644
--- a/TestBenchFramework/Resources/Strings.resx
+++ b/TestBenchFramework/Resources/Strings.resx
@@ -826,4 +826,7 @@
dflt
+
+ Stopping the flow (fixed start test)
+
\ No newline at end of file