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

FixedStartMassCollection --> StandingStartMassCollection

Browse Source
This commit is contained in:
Milan Hanajik 2021-04-16 14:16:07 +02:00
parent 847956f708
commit 9d1698b462
14 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
TBF/Rig/TbfComponents.cs
View File

@ -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());

8
TBF/Rig/TestMethods/FixedStartMassCollection/Compound/Component.cs → TBF/Rig/TestMethods/StandingStartMassCollection/Compound/Component.cs
View File

@ -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<Event> 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);
}
}
}

4
TBF/Rig/TestMethods/FixedStartMassCollection/Compound/Factory.cs → TBF/Rig/TestMethods/StandingStartMassCollection/Compound/Factory.cs
View File

@ -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
{

8
TBF/Rig/TestMethods/FixedStartMassCollection/HeatMeters/Component.cs → TBF/Rig/TestMethods/StandingStartMassCollection/HeatMeters/Component.cs
View File

@ -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<Event> 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);
}
}
}

4
TBF/Rig/TestMethods/FixedStartMassCollection/HeatMeters/Factory.cs → TBF/Rig/TestMethods/StandingStartMassCollection/HeatMeters/Factory.cs
View File

@ -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
{

2
TBF/Rig/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfg.cs → TBF/Rig/TestMethods/StandingStartMassCollection/HeatMeters/TestMethodCfg.cs
View File

@ -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
{

2
TBF/Rig/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfgCtrl.cs → TBF/Rig/TestMethods/StandingStartMassCollection/HeatMeters/TestMethodCfgCtrl.cs
View File

@ -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
{

2
TBF/Rig/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfgCtrl.designer.cs → TBF/Rig/TestMethods/StandingStartMassCollection/HeatMeters/TestMethodCfgCtrl.designer.cs generated
View File

@ -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
{

0
TBF/Rig/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfgCtrl.resx → TBF/Rig/TestMethods/StandingStartMassCollection/HeatMeters/TestMethodCfgCtrl.resx
View File

4
TBF/Rig/TestMethods/FixedStartMassCollection/HeatMeters/TestParams.cs → TBF/Rig/TestMethods/StandingStartMassCollection/HeatMeters/TestParams.cs
View File

@ -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
{

8
TBF/Rig/TestMethods/FixedStartMassCollection/Single/Component.cs → TBF/Rig/TestMethods/StandingStartMassCollection/Single/Component.cs
View File

@ -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<Event> 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);
}
}
}

2
TBF/Rig/TestMethods/FixedStartMassCollection/Single/Factory.cs → TBF/Rig/TestMethods/StandingStartMassCollection/Single/Factory.cs
View File

@ -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
{

6
TBF/Rig/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs → TBF/Rig/TestMethods/StandingStartMassCollection/StandingStartMassCollectionSeq.cs
View File

@ -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));
/// <summary>
/// Check capabilities of devces in the output path required for this test method

24
TBF/TBF.csproj
View File

@ -1172,20 +1172,20 @@
<Compile Include="Rig\TestMethods\FixedStartMassCollDeferredEval\IntermediateData.cs" />
<Compile Include="Rig\TestMethods\FixedStartMassCollDeferredEval\Single\Component.cs" />
<Compile Include="Rig\TestMethods\FixedStartMassCollDeferredEval\Single\Factory.cs" />
<Compile Include="Rig\TestMethods\FixedStartMassCollection\Compound\Component.cs" />
<Compile Include="Rig\TestMethods\FixedStartMassCollection\Compound\Factory.cs" />
<Compile Include="Rig\TestMethods\FixedStartMassCollection\HeatMeters\Component.cs" />
<Compile Include="Rig\TestMethods\FixedStartMassCollection\HeatMeters\Factory.cs" />
<Compile Include="Rig\TestMethods\FixedStartMassCollection\HeatMeters\TestMethodCfg.cs" />
<Compile Include="Rig\TestMethods\FixedStartMassCollection\HeatMeters\TestMethodCfgCtrl.cs">
<Compile Include="Rig\TestMethods\StandingStartMassCollection\Compound\Component.cs" />
<Compile Include="Rig\TestMethods\StandingStartMassCollection\Compound\Factory.cs" />
<Compile Include="Rig\TestMethods\StandingStartMassCollection\HeatMeters\Component.cs" />
<Compile Include="Rig\TestMethods\StandingStartMassCollection\HeatMeters\Factory.cs" />
<Compile Include="Rig\TestMethods\StandingStartMassCollection\HeatMeters\TestMethodCfg.cs" />
<Compile Include="Rig\TestMethods\StandingStartMassCollection\HeatMeters\TestMethodCfgCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Rig\TestMethods\FixedStartMassCollection\HeatMeters\TestMethodCfgCtrl.designer.cs">
<Compile Include="Rig\TestMethods\StandingStartMassCollection\HeatMeters\TestMethodCfgCtrl.designer.cs">
<DependentUpon>TestMethodCfgCtrl.cs</DependentUpon>
</Compile>
<Compile Include="Rig\TestMethods\FixedStartMassCollection\HeatMeters\TestParams.cs" />
<Compile Include="Rig\TestMethods\FixedStartMassCollection\Single\Component.cs" />
<Compile Include="Rig\TestMethods\FixedStartMassCollection\Single\Factory.cs" />
<Compile Include="Rig\TestMethods\StandingStartMassCollection\HeatMeters\TestParams.cs" />
<Compile Include="Rig\TestMethods\StandingStartMassCollection\Single\Component.cs" />
<Compile Include="Rig\TestMethods\StandingStartMassCollection\Single\Factory.cs" />
<Compile Include="Rig\TestMethods\FixedStartTankCollection\Compound\Component.cs" />
<Compile Include="Rig\TestMethods\FixedStartTankCollection\Compound\Factory.cs" />
<Compile Include="Rig\TestMethods\FixedStartTankCollection\Compound\TestMethodCfg.cs" />
@ -1764,7 +1764,7 @@
<DependentUpon>TestMethodCfgCtrl.cs</DependentUpon>
</Compile>
<Compile Include="Rig\TestMethods\CombinedWithDetection\TestMethodFactory.cs" />
<Compile Include="Rig\TestMethods\FixedStartMassCollection\FixedStartMassCollectionSeq.cs" />
<Compile Include="Rig\TestMethods\StandingStartMassCollection\StandingStartMassCollectionSeq.cs" />
<Compile Include="Rig\TestMethods\FlyingStartMassCollection\FlyingStartMassCollectionSeq.cs" />
<Compile Include="Rig\TestMethods\RoiDetection\RoiDetectionCfgCtrl.designer.cs" />
<Compile Include="Rig\TestMethods\FlyingStart\FlyingStartSeq.cs" />
@ -2854,7 +2854,7 @@
<EmbeddedResource Include="Rig\TestMethods\Endurance\CycleDlg.resx">
<DependentUpon>CycleDlg.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Rig\TestMethods\FixedStartMassCollection\HeatMeters\TestMethodCfgCtrl.resx">
<EmbeddedResource Include="Rig\TestMethods\StandingStartMassCollection\HeatMeters\TestMethodCfgCtrl.resx">
<DependentUpon>TestMethodCfgCtrl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Rig\TestMethods\FlyingStartMassCollection\Compound\TestMethodCfgCtrl.resx">