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

IComponentCfg and IComponentFactory interfaces and all derived classes modified.

Browse Source
This commit is contained in:
Milan Hanajik
2016-08-05 14:32:36 +02:00
parent 4d616939ad
commit 8dae45e10e
201 changed files with 491 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/DataEntry/Combined/EntryForm.cs
+5 -4
View File
@@ -67,9 +67,11 @@ namespace TBF.BenchControl.DataEntry.Combined
{
}
public EntryForm(EntryFormCfg cfg)
: base(cfg)
{
public EntryForm(Generic.IComponentCfg cfg)
: base(cfg)
{
entryFormCfg = cfg as EntryFormCfg;
serialNr = new string[Config.Data.CompoundWMsCount * 2];
disabled = new bool[Config.Data.CompoundWMsCount];
wmStartState = new float[Config.Data.CompoundWMsCount * 2];
@@ -77,7 +79,6 @@ namespace TBF.BenchControl.DataEntry.Combined
wmEndState = new float[Config.Data.CompoundWMsCount * 2];
wmCycleEndState = new string[Config.Data.CompoundWMsCount * 2];
entryFormCfg = cfg;
currentOp = CurrentOp.None;
log.Debug(this.ToString());
}
TestBenchFramework/BenchControl/DataEntry/Combined/EntryFormCfg.cs
+1 -2
View File
@@ -1,5 +1,5 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
/// Copyright (c) 2013-2016 Sensus Metering Systems
///
using System;
using System.Collections.Generic;
@@ -11,7 +11,6 @@ namespace TBF.BenchControl.DataEntry.Combined
{
public class EntryFormCfg : ComponentCfgBase, Generic.IComponentCfg
{
public IComponent GetComponent(IList<IComponent> components) { return new EntryForm(this); }
public IComponentCfgCtrl GetControl() { return new EntryFormCfgCtrl(); }
///
TestBenchFramework/BenchControl/DataEntry/Combined/EntryFormFactory.cs
+4 -1
View File
@@ -1,6 +1,7 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
/// Copyright (c) 2013-2016 Sensus Metering Systems
///
using System.Collections.Generic;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.DataEntry.Combined
@@ -13,6 +14,8 @@ namespace TBF.BenchControl.DataEntry.Combined
public IComponent DummyComponent() { return new EntryForm(); }
public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new EntryForm(cfg); }
public IComponentCfg DefaultConfig() { return new EntryFormCfg(this); }
public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
TestBenchFramework/BenchControl/DataEntry/Munich/EntryForm.cs
+6 -5
View File
@@ -58,13 +58,14 @@ namespace TBF.BenchControl.DataEntry.Munich
{
}
public EntryForm(EntryFormCfg cfg)
: base(cfg)
{
serialNr = new string[Config.Data.CompoundWMsCount];
public EntryForm(Generic.IComponentCfg cfg)
: base(cfg)
{
entryFormCfg = cfg as EntryFormCfg;
serialNr = new string[Config.Data.CompoundWMsCount];
wmEndState = new string[Config.Data.CompoundWMsCount];
entryFormCfg = cfg;
currentOp = CurrentOp.None;
log.Debug(this.ToString());
}
TestBenchFramework/BenchControl/DataEntry/Munich/EntryFormCfg.cs
-1
View File
@@ -11,7 +11,6 @@ namespace TBF.BenchControl.DataEntry.Munich
{
public class EntryFormCfg : ComponentCfgBase, Generic.IComponentCfg
{
public IComponent GetComponent(IList<IComponent> components) { return new EntryForm(this); }
public IComponentCfgCtrl GetControl() { return new EntryFormCfgCtrl(); }
///
TestBenchFramework/BenchControl/DataEntry/Munich/EntryFormFactory.cs
+4 -1
View File
@@ -1,6 +1,7 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
/// Copyright (c) 2013-2016 Sensus Metering Systems
///
using System.Collections.Generic;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.DataEntry.Munich
@@ -13,6 +14,8 @@ namespace TBF.BenchControl.DataEntry.Munich
public IComponent DummyComponent() { return new EntryForm(); }
public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new EntryForm(cfg); }
public IComponentCfg DefaultConfig() { return new EntryFormCfg(this); }
public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
TestBenchFramework/BenchControl/DataEntry/Munich3/EntryForm.cs
+4 -3
View File
@@ -58,13 +58,14 @@ namespace TBF.BenchControl.DataEntry.Munich3
{
}
public EntryForm(EntryFormCfg cfg)
: base(cfg)
public EntryForm(Generic.IComponentCfg cfg)
: base(cfg)
{
entryFormCfg = cfg as EntryFormCfg;
serialNr = new string[Config.Data.WMsCount];
wmEndState = new string[Config.Data.WMsCount];
entryFormCfg = cfg;
currentOp = CurrentOp.None;
log.Debug(this.ToString());
}
TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormCfg.cs
-1
View File
@@ -11,7 +11,6 @@ namespace TBF.BenchControl.DataEntry.Munich3
{
public class EntryFormCfg : ComponentCfgBase, Generic.IComponentCfg
{
public IComponent GetComponent(IList<IComponent> components) { return new EntryForm(this); }
public IComponentCfgCtrl GetControl() { return new EntryFormCfgCtrl(); }
///
TestBenchFramework/BenchControl/DataEntry/Munich3/EntryFormFactory.cs
+4 -1
View File
@@ -1,6 +1,7 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
/// Copyright (c) 2013-2016 Sensus Metering Systems
///
using System.Collections.Generic;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.DataEntry.Munich3
@@ -13,6 +14,8 @@ namespace TBF.BenchControl.DataEntry.Munich3
public IComponent DummyComponent() { return new EntryForm(); }
public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new EntryForm(cfg); }
public IComponentCfg DefaultConfig() { return new EntryFormCfg(this); }
public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
TestBenchFramework/BenchControl/DataEntry/Standard12/EntryForm.cs
+4 -3
View File
@@ -67,9 +67,11 @@ namespace TBF.BenchControl.DataEntry.Standard12
{
}
public EntryForm(EntryFormCfg cfg)
: base(cfg)
public EntryForm(Generic.IComponentCfg cfg)
: base(cfg)
{
entryFormCfg = cfg as EntryFormCfg;
serialNr = new string[Config.Data.WMsCount];
disabled = new bool[Config.Data.WMsCount];
wmStartState = new float[Config.Data.WMsCount];
@@ -77,7 +79,6 @@ namespace TBF.BenchControl.DataEntry.Standard12
wmEndState = new float[Config.Data.WMsCount];
wmCycleEndState = new string[Config.Data.WMsCount];
entryFormCfg = cfg;
currentOp = CurrentOp.None;
log.Debug(this.ToString());
}
TestBenchFramework/BenchControl/DataEntry/Standard12/EntryFormCfg.cs
-1
View File
@@ -11,7 +11,6 @@ namespace TBF.BenchControl.DataEntry.Standard12
{
public class EntryFormCfg : ComponentCfgBase, Generic.IComponentCfg
{
public IComponent GetComponent(IList<IComponent> components) { return new EntryForm(this); }
public IComponentCfgCtrl GetControl() { return new EntryFormCfgCtrl(); }
///
TestBenchFramework/BenchControl/DataEntry/Standard12/EntryFormFactory.cs
+4 -1
View File
@@ -1,6 +1,7 @@
///
/// Copyright (c) 2015 Sensus Metering Systems
/// Copyright (c) 2015-2016 Sensus Metering Systems
///
using System.Collections.Generic;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.DataEntry.Standard12
@@ -13,6 +14,8 @@ namespace TBF.BenchControl.DataEntry.Standard12
public IComponent DummyComponent() { return new EntryForm(); }
public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new EntryForm(cfg); }
public IComponentCfg DefaultConfig() { return new EntryFormCfg(this); }
public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
TestBenchFramework/BenchControl/DataEntry/Standard24/EntryForm.cs
+4 -3
View File
@@ -67,9 +67,11 @@ namespace TBF.BenchControl.DataEntry.Standard24
{
}
public EntryForm(EntryFormCfg cfg)
: base(cfg)
public EntryForm(Generic.IComponentCfg cfg)
: base(cfg)
{
entryFormCfg = cfg as EntryFormCfg;
serialNr = new string[Config.Data.WMsCount];
disabled = new bool[Config.Data.WMsCount];
wmStartState = new float[Config.Data.WMsCount];
@@ -77,7 +79,6 @@ namespace TBF.BenchControl.DataEntry.Standard24
wmEndState = new float[Config.Data.WMsCount];
wmCycleEndState = new string[Config.Data.WMsCount];
entryFormCfg = cfg;
currentOp = CurrentOp.None;
log.Debug(this.ToString());
}
TestBenchFramework/BenchControl/DataEntry/Standard24/EntryFormCfg.cs
-1
View File
@@ -11,7 +11,6 @@ namespace TBF.BenchControl.DataEntry.Standard24
{
public class EntryFormCfg : ComponentCfgBase, Generic.IComponentCfg
{
public IComponent GetComponent(IList<IComponent> components) { return new EntryForm(this); }
public IComponentCfgCtrl GetControl() { return new EntryFormCfgCtrl(); }
///
TestBenchFramework/BenchControl/DataEntry/Standard24/EntryFormFactory.cs
+4 -1
View File
@@ -1,6 +1,7 @@
///
/// Copyright (c) 2015 Sensus Metering Systems
/// Copyright (c) 2015-2016 Sensus Metering Systems
///
using System.Collections.Generic;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.DataEntry.Standard24
@@ -13,6 +14,8 @@ namespace TBF.BenchControl.DataEntry.Standard24
public IComponent DummyComponent() { return new EntryForm(); }
public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new EntryForm(cfg); }
public IComponentCfg DefaultConfig() { return new EntryFormCfg(this); }
public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
TestBenchFramework/BenchControl/DataEntry/Standard48/EntryForm.cs
+4 -3
View File
@@ -67,9 +67,11 @@ namespace TBF.BenchControl.DataEntry.Standard48
{
}
public EntryForm(EntryFormCfg cfg)
: base(cfg)
public EntryForm(Generic.IComponentCfg cfg)
: base(cfg)
{
entryFormCfg = cfg as EntryFormCfg;
serialNr = new string[Config.Data.WMsCount];
disabled = new bool[Config.Data.WMsCount];
wmStartState = new float[Config.Data.WMsCount];
@@ -77,7 +79,6 @@ namespace TBF.BenchControl.DataEntry.Standard48
wmEndState = new float[Config.Data.WMsCount];
wmCycleEndState = new string[Config.Data.WMsCount];
entryFormCfg = cfg;
currentOp = CurrentOp.None;
log.Debug(this.ToString());
}
TestBenchFramework/BenchControl/DataEntry/Standard48/EntryFormCfg.cs
-1
View File
@@ -11,7 +11,6 @@ namespace TBF.BenchControl.DataEntry.Standard48
{
public class EntryFormCfg : ComponentCfgBase, Generic.IComponentCfg
{
public IComponent GetComponent(IList<IComponent> components) { return new EntryForm(this); }
public IComponentCfgCtrl GetControl() { return new EntryFormCfgCtrl(); }
///
TestBenchFramework/BenchControl/DataEntry/Standard48/EntryFormFactory.cs
+4 -1
View File
@@ -1,6 +1,7 @@
///
/// Copyright (c) 2015 Sensus Metering Systems
/// Copyright (c) 2015-2016 Sensus Metering Systems
///
using System.Collections.Generic;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.DataEntry.Standard48
@@ -13,6 +14,8 @@ namespace TBF.BenchControl.DataEntry.Standard48
public IComponent DummyComponent() { return new EntryForm(); }
public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new EntryForm(cfg); }
public IComponentCfg DefaultConfig() { return new EntryFormCfg(this); }
public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
TestBenchFramework/BenchControl/DataEntry/Standard6/EntryForm.cs
+4 -3
View File
@@ -67,9 +67,11 @@ namespace TBF.BenchControl.DataEntry.Standard6
{
}
public EntryForm(EntryFormCfg cfg)
: base(cfg)
public EntryForm(Generic.IComponentCfg cfg)
: base(cfg)
{
entryFormCfg = cfg as EntryFormCfg;
serialNr = new string[Config.Data.WMsCount];
disabled = new bool[Config.Data.WMsCount];
wmStartState = new float[Config.Data.WMsCount];
@@ -77,7 +79,6 @@ namespace TBF.BenchControl.DataEntry.Standard6
wmEndState = new float[Config.Data.WMsCount];
wmCycleEndState = new string[Config.Data.WMsCount];
entryFormCfg = cfg;
currentOp = CurrentOp.None;
log.Debug(this.ToString());
}
TestBenchFramework/BenchControl/DataEntry/Standard6/EntryFormCfg.cs
-1
View File
@@ -11,7 +11,6 @@ namespace TBF.BenchControl.DataEntry.Standard6
{
public class EntryFormCfg : ComponentCfgBase, Generic.IComponentCfg
{
public IComponent GetComponent(IList<IComponent> components) { return new EntryForm(this); }
public IComponentCfgCtrl GetControl() { return new EntryFormCfgCtrl(); }
///
TestBenchFramework/BenchControl/DataEntry/Standard6/EntryFormFactory.cs
+3
View File
@@ -1,6 +1,7 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
///
using System.Collections.Generic;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.DataEntry.Standard6
@@ -13,6 +14,8 @@ namespace TBF.BenchControl.DataEntry.Standard6
public IComponent DummyComponent() { return new EntryForm(); }
public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new EntryForm(cfg); }
public IComponentCfg DefaultConfig() { return new EntryFormCfg(this); }
public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
TestBenchFramework/BenchControl/DataEntry/WMStates/EntryForm.cs
+2 -2
View File
@@ -72,10 +72,10 @@ namespace TBF.BenchControl.DataEntry.WMStates
{
}
public EntryForm(EntryFormCfg cfg)
public EntryForm(Generic.IComponentCfg cfg)
: base(cfg)
{
entryFormCfg = cfg;
entryFormCfg = cfg as EntryFormCfg;
serialNr = new string[Config.Data.WMsCount];
wmStartState = new float[Config.Data.WMsCount];
currentOp = CurrentOp.None;
TestBenchFramework/BenchControl/DataEntry/WMStates/EntryFormCfg.cs
+1 -2
View File
@@ -1,5 +1,5 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
/// Copyright (c) 2013-2016 Sensus Metering Systems
///
using System;
using System.Collections.Generic;
@@ -11,7 +11,6 @@ namespace TBF.BenchControl.DataEntry.WMStates
{
public class EntryFormCfg : ComponentCfgBase, Generic.IComponentCfg
{
public IComponent GetComponent(IList<IComponent> components) { return new EntryForm(this); }
public IComponentCfgCtrl GetControl() { return new EntryFormCfgCtrl(); }
/// Private parameterless constructor invoked by all other (public) constructors
TestBenchFramework/BenchControl/DataEntry/WMStates/EntryFormFactory.cs
+4 -1
View File
@@ -1,6 +1,7 @@
///
/// Copyright (c) 2013-2015 Sensus Metering Systems
/// Copyright (c) 2013-2016 Sensus Metering Systems
///
using System.Collections.Generic;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.DataEntry.WMStates
@@ -13,6 +14,8 @@ namespace TBF.BenchControl.DataEntry.WMStates
public IComponent DummyComponent() { return new EntryForm(); }
public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new EntryForm(cfg); }
public IComponentCfg DefaultConfig() { return new EntryFormCfg(this); }
public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)
TestBenchFramework/BenchControl/DataEntry/iPerl/EntryForm.cs
+4 -3
View File
@@ -67,9 +67,11 @@ namespace TBF.BenchControl.DataEntry.iPerl
{
}
public EntryForm(EntryFormCfg cfg)
: base(cfg)
public EntryForm(Generic.IComponentCfg cfg)
: base(cfg)
{
entryFormCfg = cfg as EntryFormCfg;
serialNr = new string[Config.Data.WMsCount];
disabled = new bool[Config.Data.WMsCount];
wmStartState = new float[Config.Data.WMsCount];
@@ -77,7 +79,6 @@ namespace TBF.BenchControl.DataEntry.iPerl
wmEndState = new float[Config.Data.WMsCount];
wmCycleEndState = new string[Config.Data.WMsCount];
entryFormCfg = cfg;
currentOp = CurrentOp.None;
log.Debug(this.ToString());
}
TestBenchFramework/BenchControl/DataEntry/iPerl/EntryFormCfg.cs
+1 -2
View File
@@ -1,5 +1,5 @@
///
/// Copyright (c) 2015 Sensus Metering Systems
/// Copyright (c) 2015-2016 Sensus Metering Systems
///
using System;
using System.Collections.Generic;
@@ -11,7 +11,6 @@ namespace TBF.BenchControl.DataEntry.iPerl
{
public class EntryFormCfg : ComponentCfgBase, Generic.IComponentCfg
{
public IComponent GetComponent(IList<IComponent> components) { return new EntryForm(this); }
public IComponentCfgCtrl GetControl() { return new EntryFormCfgCtrl(); }
///
TestBenchFramework/BenchControl/DataEntry/iPerl/EntryFormFactory.cs
+4 -1
View File
@@ -1,6 +1,7 @@
///
/// Copyright (c) 2015 Sensus Metering Systems
/// Copyright (c) 2015-2016 Sensus Metering Systems
///
using System.Collections.Generic;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.DataEntry.iPerl
@@ -13,6 +14,8 @@ namespace TBF.BenchControl.DataEntry.iPerl
public IComponent DummyComponent() { return new EntryForm(); }
public IComponent GetComponent(IComponentCfg cfg, IList<IComponent> components) { return new EntryForm(cfg); }
public IComponentCfg DefaultConfig() { return new EntryFormCfg(this); }
public IComponentCfg CmpntCfgFromCmpntEntity(Config.Entities.Component component)