diff --git a/TBF/Rig/TbfComponents.cs b/TBF/Rig/TbfComponents.cs index dcaa7bc70..63827ae46 100644 --- a/TBF/Rig/TbfComponents.cs +++ b/TBF/Rig/TbfComponents.cs @@ -132,9 +132,6 @@ namespace TBF.Rig Factories.Add(new TestMethods.FixedStartDeferredEval.Single.Factory()); Factories.Add(new TestMethods.FixedStartDeferredEval.Compound.Factory()); Factories.Add(new TestMethods.FixedStartDeferredEval.HeatMeters.Factory()); - Factories.Add(new TestMethods.FixedStartMassCollection.Single.Factory()); - Factories.Add(new TestMethods.FixedStartMassCollection.Compound.Factory()); - Factories.Add(new TestMethods.FixedStartMassCollection.HeatMeters.Factory()); Factories.Add(new TestMethods.FixedStartMassCollAdvanced.Single.Factory()); Factories.Add(new TestMethods.FixedStartMassCollAdvanced.Compound.Factory()); Factories.Add(new TestMethods.FixedStartMassCollAdvanced.HeatMeters.Factory()); @@ -162,6 +159,7 @@ namespace TBF.Rig Factories.Add(new TestMethods.FlyingStartTankCollection.Single.Factory()); Factories.Add(new TestMethods.FlyingStartTankCollection.Compound.Factory()); Factories.Add(new TestMethods.GrabImage.Factory()); + Factories.Add(new TestMethods.iPerlCommunication.TestMethodFactory()); /// iPerlCommunication Factories.Add(new TestMethods.LeakTest.TestMethodFactory()); Factories.Add(new TestMethods.LiveStream.Factory()); Factories.Add(new TestMethods.ManualEntry.Factory()); @@ -171,9 +169,11 @@ namespace TBF.Rig Factories.Add(new TestMethods.PulsesTest.Factory()); Factories.Add(new TestMethods.PulsesTestManual.Factory()); Factories.Add(new TestMethods.Q2CorrectionFromHistory.Factory()); - Factories.Add(new TestMethods.SensitivityTest.Factory()); - Factories.Add(new TestMethods.iPerlCommunication.TestMethodFactory()); /// iPerlCommunication Factories.Add(new TestMethods.RoiDetection.RoiDetectionFactory()); + Factories.Add(new TestMethods.SensitivityTest.Factory()); + Factories.Add(new TestMethods.StandingStartMassCollection.Single.Factory()); + Factories.Add(new TestMethods.StandingStartMassCollection.Compound.Factory()); + Factories.Add(new TestMethods.StandingStartMassCollection.HeatMeters.Factory()); Factories.Add(new BuiltIn.Valve.ValveFactory()); Factories.Add(new BuiltIn.ValveEx.ValveFactory()); Factories.Add(new Various.Drawing.Pipes.Factory()); diff --git a/TBF/Rig/TestMethods/FixedStartMassCollection/Compound/Component.cs b/TBF/Rig/TestMethods/StandingStartMassCollection/Compound/Component.cs similarity index 73% rename from TBF/Rig/TestMethods/FixedStartMassCollection/Compound/Component.cs rename to TBF/Rig/TestMethods/StandingStartMassCollection/Compound/Component.cs index 6324b2b74..114ba5f96 100644 --- a/TBF/Rig/TestMethods/FixedStartMassCollection/Compound/Component.cs +++ b/TBF/Rig/TestMethods/StandingStartMassCollection/Compound/Component.cs @@ -1,12 +1,12 @@ /// -/// Copyright (c) 2013-2017 Sensus Metering Systems +/// Copyright (c) 2013-2021 Sensus Slovensko a.s. /// using System; using System.Collections.Generic; using log4net; using Config.Entities; -namespace TBF.Rig.TestMethods.FixedStartMassCollection.Compound +namespace TBF.Rig.TestMethods.StandingStartMassCollection.Compound { public class Component : ComponentBase, GenericDevices.ITestMethod { @@ -17,7 +17,7 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollection.Compound public bool DoTransitions() { return true; } public bool CheckDeviceCaps(Test test, OutputPath devices, out string message) { - return FixedStartMassCollectionSeq.CheckDeviceCaps(test, devices, out message); + return StandingStartMassCollectionSeq.CheckDeviceCaps(test, devices, out message); } public Component() { } @@ -32,7 +32,7 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollection.Compound public IList Execute(Test test, int repetNr, bool isLastRepetition) { - return (new FixedStartMassCollectionSeq()).Execute(test, repetNr, isLastRepetition, true, null, DebugLevel); + return (new StandingStartMassCollectionSeq()).Execute(test, repetNr, isLastRepetition, true, null, DebugLevel); } } } diff --git a/TBF/Rig/TestMethods/FixedStartMassCollection/Compound/Factory.cs b/TBF/Rig/TestMethods/StandingStartMassCollection/Compound/Factory.cs similarity index 86% rename from TBF/Rig/TestMethods/FixedStartMassCollection/Compound/Factory.cs rename to TBF/Rig/TestMethods/StandingStartMassCollection/Compound/Factory.cs index bf6d03c3a..f26b37a88 100644 --- a/TBF/Rig/TestMethods/FixedStartMassCollection/Compound/Factory.cs +++ b/TBF/Rig/TestMethods/StandingStartMassCollection/Compound/Factory.cs @@ -1,11 +1,11 @@ /// -/// Copyright (c) 2013-2016 Sensus Metering Systems +/// Copyright (c) 2013-2021 Sensus Slovensko a.s. /// using System.Collections.Generic; using TBF.Rig.Generic; using TBF.Rig.Configs.NameOnly; -namespace TBF.Rig.TestMethods.FixedStartMassCollection.Compound +namespace TBF.Rig.TestMethods.StandingStartMassCollection.Compound { public class Factory : IComponentFactory { diff --git a/TBF/Rig/TestMethods/FixedStartMassCollection/HeatMeters/Component.cs b/TBF/Rig/TestMethods/StandingStartMassCollection/HeatMeters/Component.cs similarity index 73% rename from TBF/Rig/TestMethods/FixedStartMassCollection/HeatMeters/Component.cs rename to TBF/Rig/TestMethods/StandingStartMassCollection/HeatMeters/Component.cs index 5aea5cf08..804a5b926 100644 --- a/TBF/Rig/TestMethods/FixedStartMassCollection/HeatMeters/Component.cs +++ b/TBF/Rig/TestMethods/StandingStartMassCollection/HeatMeters/Component.cs @@ -1,12 +1,12 @@ /// -/// Copyright (c) 2013-2017 Sensus Metering Systems +/// Copyright (c) 2013-2021 Sensus Slovensko a.s. /// using System; using System.Collections.Generic; using log4net; using Config.Entities; -namespace TBF.Rig.TestMethods.FixedStartMassCollection.HeatMeters +namespace TBF.Rig.TestMethods.StandingStartMassCollection.HeatMeters { public class Component : ComponentBase, GenericDevices.ITestMethod { @@ -17,7 +17,7 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollection.HeatMeters public bool DoTransitions() { return true; } public bool CheckDeviceCaps(Test test, OutputPath devices, out string message) { - return FixedStartMassCollectionSeq.CheckDeviceCaps(test, devices, out message); + return StandingStartMassCollectionSeq.CheckDeviceCaps(test, devices, out message); } @@ -36,7 +36,7 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollection.HeatMeters public IList Execute(Test test, int repetNr, bool isLastRepetition) { - return (new FixedStartMassCollectionSeq()).Execute(test, repetNr, isLastRepetition, false, testMethodCfg.TestParams, DebugLevel); + return (new StandingStartMassCollectionSeq()).Execute(test, repetNr, isLastRepetition, false, testMethodCfg.TestParams, DebugLevel); } } } diff --git a/TBF/Rig/TestMethods/FixedStartMassCollection/HeatMeters/Factory.cs b/TBF/Rig/TestMethods/StandingStartMassCollection/HeatMeters/Factory.cs similarity index 86% rename from TBF/Rig/TestMethods/FixedStartMassCollection/HeatMeters/Factory.cs rename to TBF/Rig/TestMethods/StandingStartMassCollection/HeatMeters/Factory.cs index f7abe7ec6..d54e17dd8 100644 --- a/TBF/Rig/TestMethods/FixedStartMassCollection/HeatMeters/Factory.cs +++ b/TBF/Rig/TestMethods/StandingStartMassCollection/HeatMeters/Factory.cs @@ -1,10 +1,10 @@ /// -/// Copyright (c) 2013-2016 Sensus Metering Systems +/// Copyright (c) 2013-2021 Sensus Slovensko a.s. /// using System.Collections.Generic; using TBF.Rig.Generic; -namespace TBF.Rig.TestMethods.FixedStartMassCollection.HeatMeters +namespace TBF.Rig.TestMethods.StandingStartMassCollection.HeatMeters { public class Factory : IComponentFactory { diff --git a/TBF/Rig/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfg.cs b/TBF/Rig/TestMethods/StandingStartMassCollection/HeatMeters/TestMethodCfg.cs similarity index 95% rename from TBF/Rig/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfg.cs rename to TBF/Rig/TestMethods/StandingStartMassCollection/HeatMeters/TestMethodCfg.cs index b91c61ffb..9ed4c4b43 100644 --- a/TBF/Rig/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfg.cs +++ b/TBF/Rig/TestMethods/StandingStartMassCollection/HeatMeters/TestMethodCfg.cs @@ -8,7 +8,7 @@ using System.Xml.Serialization; using Config.Entities; using TBF.Rig.Generic; -namespace TBF.Rig.TestMethods.FixedStartMassCollection.HeatMeters +namespace TBF.Rig.TestMethods.StandingStartMassCollection.HeatMeters { public class TestMethodCfg : ComponentCfgBase, Generic.IComponentCfg { diff --git a/TBF/Rig/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfgCtrl.cs b/TBF/Rig/TestMethods/StandingStartMassCollection/HeatMeters/TestMethodCfgCtrl.cs similarity index 94% rename from TBF/Rig/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfgCtrl.cs rename to TBF/Rig/TestMethods/StandingStartMassCollection/HeatMeters/TestMethodCfgCtrl.cs index 547fb00ad..52243835f 100644 --- a/TBF/Rig/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfgCtrl.cs +++ b/TBF/Rig/TestMethods/StandingStartMassCollection/HeatMeters/TestMethodCfgCtrl.cs @@ -6,7 +6,7 @@ using System.Windows.Forms; using Config.Entities; using TBF.Rig.Generic; -namespace TBF.Rig.TestMethods.FixedStartMassCollection.HeatMeters +namespace TBF.Rig.TestMethods.StandingStartMassCollection.HeatMeters { public partial class TestMethodCfgCtrl : UserControl, IComponentCfgCtrl { diff --git a/TBF/Rig/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfgCtrl.designer.cs b/TBF/Rig/TestMethods/StandingStartMassCollection/HeatMeters/TestMethodCfgCtrl.designer.cs similarity index 97% rename from TBF/Rig/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfgCtrl.designer.cs rename to TBF/Rig/TestMethods/StandingStartMassCollection/HeatMeters/TestMethodCfgCtrl.designer.cs index 1e3477ddd..a4ef7e212 100644 --- a/TBF/Rig/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfgCtrl.designer.cs +++ b/TBF/Rig/TestMethods/StandingStartMassCollection/HeatMeters/TestMethodCfgCtrl.designer.cs @@ -1,7 +1,7 @@ /// /// Copyright (c) 2013-2016 Sensus Metering Systems /// -namespace TBF.Rig.TestMethods.FixedStartMassCollection.HeatMeters +namespace TBF.Rig.TestMethods.StandingStartMassCollection.HeatMeters { partial class TestMethodCfgCtrl { diff --git a/TBF/Rig/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfgCtrl.resx b/TBF/Rig/TestMethods/StandingStartMassCollection/HeatMeters/TestMethodCfgCtrl.resx similarity index 100% rename from TBF/Rig/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfgCtrl.resx rename to TBF/Rig/TestMethods/StandingStartMassCollection/HeatMeters/TestMethodCfgCtrl.resx diff --git a/TBF/Rig/TestMethods/FixedStartMassCollection/HeatMeters/TestParams.cs b/TBF/Rig/TestMethods/StandingStartMassCollection/HeatMeters/TestParams.cs similarity index 98% rename from TBF/Rig/TestMethods/FixedStartMassCollection/HeatMeters/TestParams.cs rename to TBF/Rig/TestMethods/StandingStartMassCollection/HeatMeters/TestParams.cs index 7a82f6511..4803b34af 100644 --- a/TBF/Rig/TestMethods/FixedStartMassCollection/HeatMeters/TestParams.cs +++ b/TBF/Rig/TestMethods/StandingStartMassCollection/HeatMeters/TestParams.cs @@ -1,5 +1,5 @@ /// -/// Copyright (c) 2013-2016 Sensus Metering Systems +/// Copyright (c) 2013-2021 Sensus Slovensko a.s. /// using System; using System.IO; @@ -9,7 +9,7 @@ using Config.Entities; using TBF.Rig.Generic; using TBF.Resources; -namespace TBF.Rig.TestMethods.FixedStartMassCollection.HeatMeters +namespace TBF.Rig.TestMethods.StandingStartMassCollection.HeatMeters { public class TestParams : TestParamsBase, IParamsProvider, ITestParams { diff --git a/TBF/Rig/TestMethods/FixedStartMassCollection/Single/Component.cs b/TBF/Rig/TestMethods/StandingStartMassCollection/Single/Component.cs similarity index 73% rename from TBF/Rig/TestMethods/FixedStartMassCollection/Single/Component.cs rename to TBF/Rig/TestMethods/StandingStartMassCollection/Single/Component.cs index 20660bf14..c213dc19f 100644 --- a/TBF/Rig/TestMethods/FixedStartMassCollection/Single/Component.cs +++ b/TBF/Rig/TestMethods/StandingStartMassCollection/Single/Component.cs @@ -1,12 +1,12 @@ /// -/// Copyright (c) 2013-2017 Sensus Metering Systems +/// Copyright (c) 2013-2021 Sensus Slovensko a.s. /// using System; using System.Collections.Generic; using log4net; using Config.Entities; -namespace TBF.Rig.TestMethods.FixedStartMassCollection.Single +namespace TBF.Rig.TestMethods.StandingStartMassCollection.Single { public class Component : ComponentBase, GenericDevices.ITestMethod { @@ -17,7 +17,7 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollection.Single public bool DoTransitions() { return true; } public bool CheckDeviceCaps(Test test, OutputPath devices, out string message) { - return FixedStartMassCollectionSeq.CheckDeviceCaps(test, devices, out message); + return StandingStartMassCollectionSeq.CheckDeviceCaps(test, devices, out message); } public Component() { } @@ -32,7 +32,7 @@ namespace TBF.Rig.TestMethods.FixedStartMassCollection.Single public IList Execute(Test test, int repetNr, bool isLastRepetition) { - return (new FixedStartMassCollectionSeq()).Execute(test, repetNr, isLastRepetition, false, null, DebugLevel); + return (new StandingStartMassCollectionSeq()).Execute(test, repetNr, isLastRepetition, false, null, DebugLevel); } } } diff --git a/TBF/Rig/TestMethods/FixedStartMassCollection/Single/Factory.cs b/TBF/Rig/TestMethods/StandingStartMassCollection/Single/Factory.cs similarity index 92% rename from TBF/Rig/TestMethods/FixedStartMassCollection/Single/Factory.cs rename to TBF/Rig/TestMethods/StandingStartMassCollection/Single/Factory.cs index b1c60475f..b76588306 100644 --- a/TBF/Rig/TestMethods/FixedStartMassCollection/Single/Factory.cs +++ b/TBF/Rig/TestMethods/StandingStartMassCollection/Single/Factory.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using TBF.Rig.Generic; using TBF.Rig.Configs.NameOnly; -namespace TBF.Rig.TestMethods.FixedStartMassCollection.Single +namespace TBF.Rig.TestMethods.StandingStartMassCollection.Single { public class Factory : IComponentFactory { diff --git a/TBF/Rig/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TBF/Rig/TestMethods/StandingStartMassCollection/StandingStartMassCollectionSeq.cs similarity index 99% rename from TBF/Rig/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs rename to TBF/Rig/TestMethods/StandingStartMassCollection/StandingStartMassCollectionSeq.cs index cca67ca53..69eeec107 100644 --- a/TBF/Rig/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs +++ b/TBF/Rig/TestMethods/StandingStartMassCollection/StandingStartMassCollectionSeq.cs @@ -9,11 +9,11 @@ using TBF.Resources; using TBF.UiBridge; using TBF.Rig.GenericDevices; -namespace TBF.Rig.TestMethods.FixedStartMassCollection +namespace TBF.Rig.TestMethods.StandingStartMassCollection { - public class FixedStartMassCollectionSeq : Sequences.SequenceBase + public class StandingStartMassCollectionSeq : Sequences.SequenceBase { - private static readonly ILog log = LogManager.GetLogger(typeof(FixedStartMassCollectionSeq)); + private static readonly ILog log = LogManager.GetLogger(typeof(StandingStartMassCollectionSeq)); /// /// Check capabilities of devces in the output path required for this test method diff --git a/TBF/TBF.csproj b/TBF/TBF.csproj index 15a7dcedd..75488d59f 100644 --- a/TBF/TBF.csproj +++ b/TBF/TBF.csproj @@ -1172,20 +1172,20 @@ - - - - - - + + + + + + UserControl - + TestMethodCfgCtrl.cs - - - + + + @@ -1764,7 +1764,7 @@ TestMethodCfgCtrl.cs - + @@ -2854,7 +2854,7 @@ CycleDlg.cs - + TestMethodCfgCtrl.cs