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

ParamValues() retval IList->ICollection, GetControl() arg. is a list of components, ver. 3.1.1598

Browse Source
This commit is contained in:
Milan Hanajik 2021-03-01 21:42:16 +01:00
parent 8dc45484b0
commit c950cc231c
182 changed files with 606 additions and 628 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Config/Entities/IParamsProvider.cs
View File

@ -31,7 +31,7 @@ namespace Config.Entities
/// Returns a list of possible values of one parameter (ComboBox when editing) or null (Textbox when editing).
/// </summary>
/// <param name="ix">Zero based index of the parameter</param>
IList<string> ParamValues(int ix);
ICollection<string> ParamValues(int ix);
/// <summary>
/// Returns a parameter value in the string form

44
DeviceTest/DeviceTestDlg.cs
View File

@ -422,13 +422,13 @@ namespace DeviceTest
{
parentCfg = parentFactory.DefaultConfig();
}
IComponentCfgCtrl cfgControl = parentCfg.GetControl();
ComponentParametersDlg cfgForm = new ComponentParametersDlg();
cfgForm.CmpntEntities = new List<Config.Entities.Component>();
IComponentCfgCtrl cfgControl = parentCfg.GetControl(cfgForm.CmpntEntities);
cfgControl.Config = parentCfg;
cfgControl.Config.ItemNr = 0;
ComponentParametersDlg cfgForm = new ComponentParametersDlg();
cfgForm.CmpntEntities = new List<Config.Entities.Component>();
cfgForm.ComponentCfgCtrl = cfgControl;
cfgForm.UnlockAfterStart = true;
DialogResult dr = cfgForm.ShowDialog();
@ -451,17 +451,17 @@ namespace DeviceTest
{
component1Cfg = component1Factory.DefaultConfig();
}
IComponentCfgCtrl cfgControl = component1Cfg.GetControl();
cfgControl.Config = component1Cfg;
cfgControl.Config.ItemNr = 1;
ComponentParametersDlg cfgForm = new ComponentParametersDlg();
///
IList<Config.Entities.Component> compEntities = new List<Config.Entities.Component>();
var compEntities = new List<Config.Entities.Component>();
if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity());
cfgForm.CmpntEntities = compEntities;
cfgForm.ComponentCfgCtrl = cfgControl;
IComponentCfgCtrl cfgControl = component1Cfg.GetControl(compEntities);
cfgControl.Config = component1Cfg;
cfgControl.Config.ItemNr = 1;
cfgForm.ComponentCfgCtrl = cfgControl;
cfgForm.UnlockAfterStart = true;
DialogResult dr = cfgForm.ShowDialog();
if (dr != DialogResult.OK) return;
@ -485,18 +485,18 @@ namespace DeviceTest
{
component2Cfg = component2Factory.DefaultConfig();
}
IComponentCfgCtrl cfgControl = component2Cfg.GetControl();
cfgControl.Config = component2Cfg;
cfgControl.Config.ItemNr = 1;
ComponentParametersDlg cfgForm = new ComponentParametersDlg();
///
IList<Config.Entities.Component> compEntities = new List<Config.Entities.Component>();
var compEntities = new List<Config.Entities.Component>();
if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity());
if (component1Factory != null && component1Cfg != null) compEntities.Add(component1Cfg.CreateDbEntity());
cfgForm.CmpntEntities = compEntities;
cfgForm.ComponentCfgCtrl = cfgControl;
IComponentCfgCtrl cfgControl = component2Cfg.GetControl(compEntities);
cfgControl.Config = component2Cfg;
cfgControl.Config.ItemNr = 1;
cfgForm.ComponentCfgCtrl = cfgControl;
cfgForm.UnlockAfterStart = true;
DialogResult dr = cfgForm.ShowDialog();
if (dr != DialogResult.OK) return;
@ -520,19 +520,19 @@ namespace DeviceTest
{
component3Cfg = component3Factory.DefaultConfig();
}
IComponentCfgCtrl cfgControl = component3Cfg.GetControl();
cfgControl.Config = component3Cfg;
cfgControl.Config.ItemNr = 1;
ComponentParametersDlg cfgForm = new ComponentParametersDlg();
///
IList<Config.Entities.Component> compEntities = new List<Config.Entities.Component>();
var compEntities = new List<Config.Entities.Component>();
if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity());
if (component1Factory != null && component1Cfg != null) compEntities.Add(component1Cfg.CreateDbEntity());
if (component2Factory != null && component2Cfg != null) compEntities.Add(component2Cfg.CreateDbEntity());
cfgForm.CmpntEntities = compEntities;
cfgForm.ComponentCfgCtrl = cfgControl;
IComponentCfgCtrl cfgControl = component3Cfg.GetControl(compEntities);
cfgControl.Config = component3Cfg;
cfgControl.Config.ItemNr = 1;
cfgForm.ComponentCfgCtrl = cfgControl;
cfgForm.UnlockAfterStart = true;
DialogResult dr = cfgForm.ShowDialog();
if (dr != DialogResult.OK) return;

8
ResultsBrowser/Forms/PrinterConfigDlg.cs
View File

@ -88,13 +88,13 @@ namespace ResultsBrowser.Forms
printerCfg = printerFactory.CmpntCfgFromCmpntEntity(cmpnt);
}
IComponentCfgCtrl cfgControl = printerCfg.GetControl();
ComponentParametersDlg cfgForm = new ComponentParametersDlg();
cfgForm.CmpntEntities = new List<Component>();
IComponentCfgCtrl cfgControl = printerCfg.GetControl(cfgForm.CmpntEntities);
cfgControl.Config = printerCfg;
cfgControl.Config.ItemNr = 0;
ComponentParametersDlg cfgForm = new ComponentParametersDlg();
cfgForm.CmpntEntities = new List<Component>();
cfgForm.ComponentCfgCtrl = cfgControl;
cfgForm.UnlockAfterStart = true;
DialogResult dr = cfgForm.ShowDialog();

45
TBF/BenchControl/Ambient/Comet/AmbientCfg.cs
View File

@ -18,7 +18,10 @@ namespace TBF.BenchControl.Ambient.Comet
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(AmbientCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); }
public IComponentCfgCtrl GetControl(IList<Component> cmpntEntities)
{
return new Configs.ParamsProvider.ComponentCfgCtrl(this, null);
}
///
/// Serialized parameters
@ -142,41 +145,35 @@ namespace TBF.BenchControl.Ambient.Comet
public string ParamName(int i) { return paramNames[i]; }
public int ParamsCount() { return paramNames.Length; }
public IList<string> ParamValues(int i)
public ICollection<string> ParamValues(int i)
{
IList<string> values = new List<string>();
switch (i)
{
case 1:
return new List<string>(new string[] { "150", "300", "600", "1200", "2400", "4800", "9600",
"19200", "38400", "57600", "76800", "115200"});
return new string[] { "150", "300", "600", "1200", "2400", "4800", "9600",
"19200", "38400", "57600", "76800", "115200"};
case 2:
values.Add(Parity.None.ToString());
values.Add(Parity.Odd.ToString());
values.Add(Parity.Even.ToString());
return values;
return new string[] { Parity.None.ToString(), Parity.Odd.ToString(), Parity.Even.ToString() };
case 3:
return new List<string>(new string[] { "7", "8" });
return new string[] { "7", "8" };
case 4:
values.Add(StopBits.None.ToString());
values.Add(StopBits.One.ToString());
values.Add(StopBits.OnePointFive.ToString());
values.Add(StopBits.Two.ToString());
return values;
return new string[] { StopBits.None.ToString(),
StopBits.One.ToString(),
StopBits.OnePointFive.ToString(),
StopBits.Two.ToString() };
case 5:
values.Add(Handshake.None.ToString());
values.Add(Handshake.XOnXOff.ToString());
values.Add(Handshake.RequestToSend.ToString());
values.Add(Handshake.RequestToSendXOnXOff.ToString());
return values;
return new string[] { Handshake.None.ToString(),
Handshake.XOnXOff.ToString(),
Handshake.RequestToSend.ToString(),
Handshake.RequestToSendXOnXOff.ToString() };
case 6:
return new List<string>(new string[] { Strings.yes, Strings.no });
return new string[] { Strings.yes, Strings.no };
case 7:
return new List<string>(new string[] { "°C", "°F", "K" });
return new string[] { "°C", "°F", "K" };
case 11:
return new List<string>(new string[] { "Pa", "hPa", "mbar", "kPa", "inHg", "psi", "bar", "MPa" });
return new string[] { "Pa", "hPa", "mbar", "kPa", "inHg", "psi", "bar", "MPa" };
case 15:
return new List<string>(new string[] { "R%" });
return new string[] { "R%" };
default:
return null;
}

43
TBF/BenchControl/Ambient/Greco/AmbientCfg.cs
View File

@ -18,7 +18,10 @@ namespace TBF.BenchControl.Ambient.Greco
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(AmbientCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); }
public IComponentCfgCtrl GetControl(IList<Component> cmpntEntities)
{
return new Configs.ParamsProvider.ComponentCfgCtrl(this, null);
}
///
/// Serialized parameters
@ -139,39 +142,33 @@ namespace TBF.BenchControl.Ambient.Greco
public string ParamName(int i) { return paramNames[i]; }
public int ParamsCount() { return paramNames.Length; }
public IList<string> ParamValues(int i)
public ICollection<string> ParamValues(int i)
{
IList<string> values = new List<string>();
switch (i)
{
case 1:
return new List<string>(new string[] { "150", "300", "600", "1200", "2400", "4800", "9600",
"19200", "38400", "57600", "76800", "115200"});
return new string[] { "150", "300", "600", "1200", "2400", "4800", "9600",
"19200", "38400", "57600", "76800", "115200"};
case 2:
values.Add(Parity.None.ToString());
values.Add(Parity.Odd.ToString());
values.Add(Parity.Even.ToString());
return values;
return new string[] { Parity.None.ToString(), Parity.Odd.ToString(), Parity.Even.ToString() };
case 3:
return new List<string>(new string[] { "7", "8" });
return new string[] { "7", "8" };
case 4:
values.Add(StopBits.None.ToString());
values.Add(StopBits.One.ToString());
values.Add(StopBits.OnePointFive.ToString());
values.Add(StopBits.Two.ToString());
return values;
return new string[] { StopBits.None.ToString(),
StopBits.One.ToString(),
StopBits.OnePointFive.ToString(),
StopBits.Two.ToString() };
case 5:
values.Add(Handshake.None.ToString());
values.Add(Handshake.XOnXOff.ToString());
values.Add(Handshake.RequestToSend.ToString());
values.Add(Handshake.RequestToSendXOnXOff.ToString());
return values;
return new string[] { Handshake.None.ToString(),
Handshake.XOnXOff.ToString(),
Handshake.RequestToSend.ToString(),
Handshake.RequestToSendXOnXOff.ToString() };
case 6:
return new List<string>(new string[] { "°C", "°F", "K" });
return new string[] { "°C", "°F", "K" };
case 10:
return new List<string>(new string[] { "Pa", "hPa", "mbar", "kPa", "inHg", "psi", "bar", "MPa" });
return new string[] { "Pa", "hPa", "mbar", "kPa", "inHg", "psi", "bar", "MPa" };
case 14:
return new List<string>(new string[] { "R%" });
return new string[] { "R%" };
default:
return null;
}

3
TBF/BenchControl/BuiltIn/Pump/PumpCfg.cs
View File

@ -1,7 +1,6 @@
///
/// Copyright (c) 2013-2016 Sensus Metering Systems
///
using System.IO;
using System.Collections.Generic;
using System.Xml.Serialization;
using SchematicDrawing;
@ -14,7 +13,7 @@ namespace TBF.BenchControl.BuiltIn.Pump
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(PumpCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new PumpCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new PumpCfgCtrl(); }
///
/// Serialized parameters

3
TBF/BenchControl/BuiltIn/PumpTandem/PumpCfg.cs
View File

@ -1,7 +1,6 @@
///
/// Copyright (c) 2013-2016 Sensus Metering Systems
///
using System.IO;
using System.Collections.Generic;
using System.Xml.Serialization;
using TBF.BenchControl.Generic;
@ -13,7 +12,7 @@ namespace TBF.BenchControl.BuiltIn.PumpTandem
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(PumpCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new PumpCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new PumpCfgCtrl(); }
///
/// Serialized parameters

3
TBF/BenchControl/BuiltIn/Valve/ValveCfg.cs
View File

@ -1,7 +1,6 @@
///
/// Copyright (c) 2013-2016 Sensus Metering Systems
///
using System.IO;
using System.Collections.Generic;
using System.Xml.Serialization;
using SchematicDrawing;
@ -14,7 +13,7 @@ namespace TBF.BenchControl.BuiltIn.Valve
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(ValveCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new ValveCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new ValveCfgCtrl(); }
///
/// Serialized parameters

3
TBF/BenchControl/BuiltIn/ValveEx/ValveCfg.cs
View File

@ -1,7 +1,6 @@
///
/// Copyright (c) 2015-2016 Sensus Metering Systems
///
using System.IO;
using System.Collections.Generic;
using System.Xml.Serialization;
using TBF.BenchControl.Generic;
@ -13,7 +12,7 @@ namespace TBF.BenchControl.BuiltIn.ValveEx
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(ValveCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new ValveCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new ValveCfgCtrl(); }
///
/// Serialized parameters

5
TBF/BenchControl/Configs/NameOnly/TestMethodCfg.cs
View File

@ -1,8 +1,9 @@
///
/// Copyright (c) 2016 Sensus Metering Systems
///
using TBF.BenchControl.Generic;
using System.Collections.Generic;
using System.Xml.Serialization;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.Configs.NameOnly
{
@ -11,7 +12,7 @@ namespace TBF.BenchControl.Configs.NameOnly
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TestMethodCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new TestMethodCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new TestMethodCfgCtrl(); }
/// Private parameterless constructor invoked by all other (public) constructors
TestMethodCfg() { }

35
TBF/BenchControl/Configs/ParamsProvider/ComponentCfgCtrl.cs
View File

@ -33,7 +33,6 @@ namespace TBF.BenchControl.Configs.ParamsProvider
}
}
IList<string> parents;
Control[] editors;
CfgUpdateFlags flags;
@ -47,22 +46,25 @@ namespace TBF.BenchControl.Configs.ParamsProvider
/// </summary>
/// <param name="paramsProvider">Parameters provider implementing IComponentCfg and IParamsProvider</param>
/// <param name="parents">A list of parents or null, null hides parentComboBox</param>
public ComponentCfgCtrl(IParamsProvider paramsProvider, IList<string> parents)
public ComponentCfgCtrl(IParamsProvider paramsProvider, IEnumerable<Component> parents)
: this()
{
this.paramsProvider = paramsProvider;
this.parents = parents;
if (parents == null)
{
parentLabel.Visible = false;
parentComboBox.Visible = false;
}
else
{
foreach (var p in parents) parentComboBox.Items.Add(p.Name);
}
editors = new Control[paramsProvider.ParamsCount()];
for (int i = 0; i < paramsProvider.ParamsCount(); i++)
{
IList<string> values = paramsProvider.ParamValues(i);
ICollection<string> values = paramsProvider.ParamValues(i);
if (values == null)
{
editors[i] = new TextBox();
@ -95,10 +97,6 @@ namespace TBF.BenchControl.Configs.ParamsProvider
Localize();
paramsListViewEx.Columns.Add(Strings.Parameter, 210);
paramsListViewEx.Columns.Add(Strings.Value, 210);
if (parents != null)
{
foreach (var p in parents) parentComboBox.Items.Add(p);
}
Redraw();
}
@ -114,7 +112,7 @@ namespace TBF.BenchControl.Configs.ParamsProvider
componentClassTextBox.Text = Config.Factory.ClassName;
nameTextBox.Text = Config.Name;
if (parents != null) parentComboBox.Text = Config.ParentName;
if (parentComboBox.Visible) parentComboBox.Text = Config.ParentName;
paramsListViewEx.Items.Clear();
for (int i = 0; i < paramsProvider.ParamsCount(); i++)
@ -129,18 +127,16 @@ namespace TBF.BenchControl.Configs.ParamsProvider
public void Unlock()
{
nameTextBox.Enabled = true;
if (parents != null) parentComboBox.Enabled = true;
parentComboBox.Enabled = true; /// It still may be invisible
paramsListViewEx.Enabled = true;
}
public CfgUpdateFlags VerifyCfg(ref string message)
{
if (parents == null) return CfgUpdateFlags.None;
/// Verify the parent
foreach (var item in parentComboBox.Items)
/// Verify the parent (if parent combo box is visible)
if (!parentComboBox.Visible || parentComboBox.Items.Contains(parentComboBox.Text))
{
if (parentComboBox.Text == item.ToString()) return CfgUpdateFlags.None;
return CfgUpdateFlags.None;
}
message += Environment.NewLine + string.Format(Strings.Invalid_0, parentLabel.Text);
@ -159,13 +155,10 @@ namespace TBF.BenchControl.Configs.ParamsProvider
f |= CfgUpdateFlags.RestartRqrd;
}
if (parents != null)
if (parentComboBox.Visible && Config.ParentName != parentComboBox.Text)
{
if (Config.ParentName != parentComboBox.Text)
{
Config.ParentName = parentComboBox.Text;
f |= CfgUpdateFlags.RestartRqrd;
}
Config.ParentName = parentComboBox.Text;
f |= CfgUpdateFlags.RestartRqrd;
}
return f;

3
TBF/BenchControl/ControlBoard/Legacy/ControlBoardCfg.cs
View File

@ -1,7 +1,6 @@
///
/// Copyright (c) 2013-2016 Sensus Metering Systems
///
using System.IO;
using System.Collections.Generic;
using System.Xml.Serialization;
using TBF.BenchControl.Generic;
@ -13,7 +12,7 @@ namespace TBF.BenchControl.ControlBoard.Legacy
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(ControlBoardCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new ControlBoardCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new ControlBoardCfgCtrl(); }
///
/// Serialized parameters

6
TBF/BenchControl/ControlBoard/Legacy/ControlBoardFactory.cs → TBF/BenchControl/ControlBoard/Legacy/Factory.cs
View File

@ -1,14 +1,14 @@
///
/// Copyright (c) 2013-2020 Sensus Slovensko a.s.
/// Copyright (c) 2013-2021 Sensus Slovensko a.s.
///
using System.Collections.Generic;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.ControlBoard.Legacy
{
public class ControlBoardFactory : IComponentFactory
public class Factory : IComponentFactory
{
public string ClassName { get { return "ControlBoard"; } }
public string ClassName { get { return GetType().Namespace.Substring(17); } }
public override string ToString() { return ClassName; }
/// <summary>Max. number of components of this class in the system</summary>

3
TBF/BenchControl/ControlBoard/Papouch/CBoardCfg.cs
View File

@ -1,7 +1,6 @@
///
/// Copyright (c) 2020 Sensus Slovensko a.s.
///
using System.IO;
using System.Collections.Generic;
using System.Xml.Serialization;
using TBF.BenchControl.Generic;
@ -22,7 +21,7 @@ namespace TBF.BenchControl.ControlBoard.Papouch
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(CBoardCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new CBoardCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new CBoardCfgCtrl(); }
///
/// Serialized parameters

4
TBF/BenchControl/ControlBoard/Uni/CBoardCfg.cs
View File

@ -18,7 +18,7 @@ namespace TBF.BenchControl.ControlBoard.Uni
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(CBoardCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); }
///
/// Serialized parameters
@ -87,7 +87,7 @@ namespace TBF.BenchControl.ControlBoard.Uni
public string ParamName(int i) { return paramNames[i]; }
public int ParamsCount() { return paramNames.Length; }
public IList<string> ParamValues(int i)
public ICollection<string> ParamValues(int i)
{
return null;
}

3
TBF/BenchControl/Danfoss/VLT2800/PumpCfg.cs
View File

@ -1,7 +1,6 @@
///
/// Copyright (c) 2013-2016 Sensus Metering Systems
///
using System.IO;
using System.Collections.Generic;
using System.IO.Ports;
using System.Xml.Serialization;
@ -15,7 +14,7 @@ namespace TBF.BenchControl.Danfoss.VLT2800
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(PumpCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new PumpCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new PumpCfgCtrl(); }
///
/// Serialized parameters

8
TBF/BenchControl/DataContainer/BackupAndSecurityOptions/ComponentCfg.cs
View File

@ -17,7 +17,7 @@ namespace TBF.BenchControl.DataContainer.BackupAndSecurityOptions
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(ComponentCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); }
///
/// Serialized parameters
@ -52,11 +52,7 @@ namespace TBF.BenchControl.DataContainer.BackupAndSecurityOptions
};
public string ParamName(int i) { return paramNames[i]; }
public int ParamsCount() { return paramNames.Length; }
public IList<string> ParamValues(int i)
{
return null;
}
public ICollection<string> ParamValues(int i) { return null; }
public string ToString(int i)
{

17
TBF/BenchControl/DataContainer/BenchInfo/ComponentCfg.cs
View File

@ -17,7 +17,7 @@ namespace TBF.BenchControl.DataContainer.BenchInfo
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(ComponentCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); }
///
/// Serialized parameters
@ -83,18 +83,17 @@ namespace TBF.BenchControl.DataContainer.BenchInfo
public string ParamName(int i) { return paramNames[i]; }
public int ParamsCount() { return paramNames.Length; }
public IList<string> ParamValues(int i)
public ICollection<string> ParamValues(int i)
{
if (i == 10)
{
IList<string> list = new List<string>();
for (RemoteDBUse rdbu = 0; rdbu < RemoteDBUse.Count; rdbu++) list.Add(rdbu.ToDescription());
return list;
}
else
{
return null;
return new string[] { RemoteDBUse.LocalDBOnly.ToString(),
RemoteDBUse.RemoteDBOnly.ToString(),
RemoteDBUse.BothDBsLocalFirst.ToString(),
RemoteDBUse.BothDBsRemoteFirst.ToString() };
}
return null;
}
public string ToString(int i)

8
TBF/BenchControl/DataContainer/Buoyancy/ComponentCfg.cs
View File

@ -17,7 +17,7 @@ namespace TBF.BenchControl.DataContainer.Buoyancy
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(ComponentCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); }
///
/// Serialized parameters
@ -55,11 +55,7 @@ namespace TBF.BenchControl.DataContainer.Buoyancy
};
public string ParamName(int i) { return paramNames[i]; }
public int ParamsCount() { return paramNames.Length; }
public IList<string> ParamValues(int i)
{
return null;
}
public ICollection<string> ParamValues(int i) { return null; }
public string ToString(int i)
{

8
TBF/BenchControl/DataContainer/Density/ComponentCfg.cs
View File

@ -17,7 +17,7 @@ namespace TBF.BenchControl.DataContainer.Density
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(ComponentCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); }
///
/// Serialized parameters
@ -58,11 +58,7 @@ namespace TBF.BenchControl.DataContainer.Density
};
public string ParamName(int i) { return paramNames[i]; }
public int ParamsCount() { return paramNames.Length; }
public IList<string> ParamValues(int i)
{
return null;
}
public ICollection<string> ParamValues(int i) { return null; }
public string ToString(int i)
{

2
TBF/BenchControl/DataContainer/Evaporation/EvaporationCfg.cs
View File

@ -17,7 +17,7 @@ namespace TBF.BenchControl.DataContainer.Evaporation
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(EvaporationCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new EvaporationCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new EvaporationCfgCtrl(); }
/// Calibration info serialized parameters displayed in Metrology tab page
string calibCertificateNr;

11
TBF/BenchControl/DataContainer/iPerlBenchInfo/ComponentCfg.cs
View File

@ -18,7 +18,7 @@ namespace TBF.BenchControl.DataContainer.iPerlBenchInfo
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(ComponentCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); }
///
/// Serialized parameters
@ -111,13 +111,14 @@ namespace TBF.BenchControl.DataContainer.iPerlBenchInfo
public string ParamName(int i) { return paramNames[i]; }
public int ParamsCount() { return paramNames.Length; }
public IList<string> ParamValues(int i)
public ICollection<string> ParamValues(int i)
{
if (i == 10)
{
IList<string> list = new List<string>();
for (RemoteDBUse rdbu = 0; rdbu < RemoteDBUse.Count; rdbu++) list.Add(rdbu.ToDescription());
return list;
return new string[] { RemoteDBUse.LocalDBOnly.ToString(),
RemoteDBUse.RemoteDBOnly.ToString(),
RemoteDBUse.BothDBsLocalFirst.ToString(),
RemoteDBUse.BothDBsRemoteFirst.ToString() };
}
else if (i == 11)
{

4
TBF/BenchControl/DataEntry/Combined/EntryFormCfg.cs
View File

@ -1,9 +1,7 @@
///
/// Copyright (c) 2013-2016 Sensus Metering Systems
///
using System;
using System.Collections.Generic;
using System.IO;
using System.Xml.Serialization;
using TBF.BenchControl.Generic;
@ -14,7 +12,7 @@ namespace TBF.BenchControl.DataEntry.Combined
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(EntryFormCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new EntryFormCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new EntryFormCfgCtrl(); }
///
/// Serialized parameters

4
TBF/BenchControl/DataEntry/Fewa/EntryFormCfg.cs
View File

@ -1,9 +1,7 @@
///
/// Copyright (c) 2019 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
using System.IO;
using System.Xml.Serialization;
using TBF.BenchControl.Generic;
@ -14,7 +12,7 @@ namespace TBF.BenchControl.DataEntry.Fewa
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(EntryFormCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new EntryFormCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new EntryFormCfgCtrl(); }
///
/// Serialized parameters

4
TBF/BenchControl/DataEntry/HeatMeters12/EntryFormCfg.cs
View File

@ -1,9 +1,7 @@
///
/// Copyright (c) 2016 Sensus Metering Systems
///
using System;
using System.Collections.Generic;
using System.IO;
using System.Xml.Serialization;
using TBF.BenchControl.Generic;
@ -14,7 +12,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters12
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(EntryFormCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new EntryFormCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new EntryFormCfgCtrl(); }
///
/// Serialized parameters

4
TBF/BenchControl/DataEntry/HeatMeters6/EntryFormCfg.cs
View File

@ -1,9 +1,7 @@
///
/// Copyright (c) 2016 Sensus Metering Systems
///
using System;
using System.Collections.Generic;
using System.IO;
using System.Xml.Serialization;
using TBF.BenchControl.Generic;
@ -14,7 +12,7 @@ namespace TBF.BenchControl.DataEntry.HeatMeters6
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(EntryFormCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new EntryFormCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new EntryFormCfgCtrl(); }
///
/// Serialized parameters

4
TBF/BenchControl/DataEntry/Munich/EntryFormCfg.cs
View File

@ -1,9 +1,7 @@
///
/// Copyright (c) 2013-2016 Sensus Metering Systems
///
using System;
using System.Collections.Generic;
using System.IO;
using System.Xml.Serialization;
using TBF.BenchControl.Generic;
@ -14,7 +12,7 @@ namespace TBF.BenchControl.DataEntry.Munich
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(EntryFormCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new EntryFormCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new EntryFormCfgCtrl(); }
///
/// Serialized parameters

4
TBF/BenchControl/DataEntry/Munich3/EntryFormCfg.cs
View File

@ -1,9 +1,7 @@
///
/// Copyright (c) 2013-2016 Sensus Metering Systems
///
using System;
using System.Collections.Generic;
using System.IO;
using System.Xml.Serialization;
using TBF.BenchControl.Generic;
@ -14,7 +12,7 @@ namespace TBF.BenchControl.DataEntry.Munich3
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(EntryFormCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new EntryFormCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new EntryFormCfgCtrl(); }
///
/// Serialized parameters

4
TBF/BenchControl/DataEntry/Single/EntryFormCfg.cs
View File

@ -1,9 +1,7 @@
///
/// Copyright (c) 2018 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
using System.IO;
using System.Xml.Serialization;
using TBF.BenchControl.Generic;
@ -14,7 +12,7 @@ namespace TBF.BenchControl.DataEntry.Single
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(EntryFormCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new EntryFormCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new EntryFormCfgCtrl(); }
///
/// Serialized parameters

4
TBF/BenchControl/DataEntry/Standard12/EntryFormCfg.cs
View File

@ -1,9 +1,7 @@
///
/// Copyright (c) 2013-2016 Sensus Metering Systems
///
using System;
using System.Collections.Generic;
using System.IO;
using System.Xml.Serialization;
using TBF.BenchControl.Generic;
@ -14,7 +12,7 @@ namespace TBF.BenchControl.DataEntry.Standard12
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(EntryFormCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new EntryFormCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new EntryFormCfgCtrl(); }
///
/// Serialized parameters

4
TBF/BenchControl/DataEntry/Standard24/EntryFormCfg.cs
View File

@ -1,9 +1,7 @@
///
/// Copyright (c) 2015-2016 Sensus Metering Systems
///
using System;
using System.Collections.Generic;
using System.IO;
using System.Xml.Serialization;
using TBF.BenchControl.Generic;
@ -14,7 +12,7 @@ namespace TBF.BenchControl.DataEntry.Standard24
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(EntryFormCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new EntryFormCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new EntryFormCfgCtrl(); }
///
/// Serialized parameters

4
TBF/BenchControl/DataEntry/Standard48/EntryFormCfg.cs
View File

@ -1,9 +1,7 @@
///
/// Copyright (c) 2013-2016 Sensus Metering Systems
///
using System;
using System.Collections.Generic;
using System.IO;
using System.Xml.Serialization;
using TBF.BenchControl.Generic;
@ -14,7 +12,7 @@ namespace TBF.BenchControl.DataEntry.Standard48
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(EntryFormCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new EntryFormCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new EntryFormCfgCtrl(); }
///
/// Serialized parameters

4
TBF/BenchControl/DataEntry/Standard6/EntryFormCfg.cs
View File

@ -1,9 +1,7 @@
///
/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
using System.IO;
using System.Xml.Serialization;
using TBF.BenchControl.Generic;
@ -14,7 +12,7 @@ namespace TBF.BenchControl.DataEntry.Standard6
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(EntryFormCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new EntryFormCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new EntryFormCfgCtrl(); }
///
/// Serialized parameters

4
TBF/BenchControl/DataEntry/StandardCamera/EntryFormCfg.cs
View File

@ -1,7 +1,7 @@
///
/// Copyright (c) 2017 Sensus Metering Systems
///
using System;
using System.Collections.Generic;
using System.Xml.Serialization;
using TBF.BenchControl.Generic;
@ -12,7 +12,7 @@ namespace TBF.BenchControl.DataEntry.StandardCamera
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(EntryFormCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new EntryFormCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new EntryFormCfgCtrl(); }
///
/// Serialized parameters

4
TBF/BenchControl/DataEntry/iPerl/EntryFormCfg.cs
View File

@ -1,9 +1,7 @@
///
/// Copyright (c) 2015-2018 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
using System.IO;
using System.Xml.Serialization;
using TBF.BenchControl.Generic;
@ -14,7 +12,7 @@ namespace TBF.BenchControl.DataEntry.iPerl
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(EntryFormCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new EntryFormCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new EntryFormCfgCtrl(); }
///
/// Serialized parameters

4
TBF/BenchControl/Dummy/FlowMeter/FlowMeterCfg.cs
View File

@ -1,9 +1,7 @@
///
/// Copyright (c) 2017 Sensus Metering Systems
///
using System;
using System.Collections.Generic;
using System.IO;
using System.Xml.Serialization;
using SchematicDrawing;
using TBF.BenchControl.Generic;
@ -15,7 +13,7 @@ namespace TBF.BenchControl.Dummy.FlowMeter
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(FlowMeterCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new FlowMeterCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new FlowMeterCfgCtrl(); }
///
/// Serialized parameters

4
TBF/BenchControl/Dummy/RegulValve/RegulValveCfg.cs
View File

@ -1,10 +1,10 @@
///
/// Copyright (c) 2017-2020 Sensus Slovensko a.s.
///
using System.Collections.Generic;
using System.Xml.Serialization;
using SchematicDrawing;
using TBF.BenchControl.Generic;
using System.Collections.Generic;
namespace TBF.BenchControl.Dummy.RegulValve
{
@ -13,7 +13,7 @@ namespace TBF.BenchControl.Dummy.RegulValve
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(RegulValveCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new RegulValveCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new RegulValveCfgCtrl(); }
///
/// Serialized parameters

3
TBF/BenchControl/Elde/CoverTest/CoverTestCfg.cs
View File

@ -4,6 +4,7 @@
using System.IO;
using System.Collections.Generic;
using System.Xml.Serialization;
using Config.Entities;
using TBF.BenchControl.Generic;
using TBF.Resources;
@ -14,7 +15,7 @@ namespace TBF.BenchControl.Elde.CoverTest
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(CoverTestCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new CoverTestCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new CoverTestCfgCtrl(); }
///
/// Serialized parameters

2
TBF/BenchControl/Elde/CoverTest/CoverTestCfgCtrl.cs
View File

@ -40,7 +40,7 @@ namespace TBF.BenchControl.Elde.CoverTest
{
foreach (var cmpnt in parent.CmpntEntities)
{
if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is ControlBoard.Legacy.ControlBoardFactory)
if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is ControlBoard.Legacy.Factory)
{
parentNameComboBox.Items.Add(cmpnt.Name);
}

3
TBF/BenchControl/Elde/Diverter/DiverterCfg.cs
View File

@ -5,6 +5,7 @@ using System;
using System.IO;
using System.Collections.Generic;
using System.Xml.Serialization;
using Config.Entities;
using SchematicDrawing;
using TBF.BenchControl.Generic;
@ -15,7 +16,7 @@ namespace TBF.BenchControl.Elde.Diverter
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(DiverterCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new DiverterCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new DiverterCfgCtrl(); }
///
/// Serialized parameters

2
TBF/BenchControl/Elde/Diverter/DiverterCfgCtrl.cs
View File

@ -43,7 +43,7 @@ namespace TBF.BenchControl.Elde.Diverter
{
foreach (var cmpnt in parent.CmpntEntities)
{
if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is ControlBoard.Legacy.ControlBoardFactory)
if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is ControlBoard.Legacy.Factory)
{
parentNameComboBox.Items.Add(cmpnt.Name);
}

3
TBF/BenchControl/Elde/FlowMeter/FlowMeterCfg.cs
View File

@ -5,6 +5,7 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Xml.Serialization;
using Config.Entities;
using SchematicDrawing;
using TBF.BenchControl.Generic;
@ -15,7 +16,7 @@ namespace TBF.BenchControl.Elde.FlowMeter
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(FlowMeterCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new FlowMeterCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new FlowMeterCfgCtrl(); }
///
/// Serialized parameters

2
TBF/BenchControl/Elde/FlowMeter/FlowMeterCfgCtrl.cs
View File

@ -41,7 +41,7 @@ namespace TBF.BenchControl.Elde.FlowMeter
{
foreach (var cmpnt in parent.CmpntEntities)
{
if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is ControlBoard.Legacy.ControlBoardFactory)
if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is ControlBoard.Legacy.Factory)
{
parentNameComboBox.Items.Add(cmpnt.Name);
}

3
TBF/BenchControl/Elde/FlowMeterDewa/FlowMeterCfg.cs
View File

@ -5,6 +5,7 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Xml.Serialization;
using Config.Entities;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.Elde.FlowMeterDewa
@ -14,7 +15,7 @@ namespace TBF.BenchControl.Elde.FlowMeterDewa
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(FlowMeterCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new FlowMeterCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new FlowMeterCfgCtrl(); }
///
/// Serialized parameters

2
TBF/BenchControl/Elde/FlowMeterDewa/FlowMeterCfgCtrl.cs
View File

@ -45,7 +45,7 @@ namespace TBF.BenchControl.Elde.FlowMeterDewa
{
foreach (var cmpnt in parent.CmpntEntities)
{
if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is ControlBoard.Legacy.ControlBoardFactory)
if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is ControlBoard.Legacy.Factory)
{
parentNameComboBox.Items.Add(cmpnt.Name);
}

3
TBF/BenchControl/Elde/FlowMeterTriplet/FlowMeterCfg.cs
View File

@ -5,6 +5,7 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Xml.Serialization;
using Config.Entities;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.Elde.FlowMeterTriplet
@ -14,7 +15,7 @@ namespace TBF.BenchControl.Elde.FlowMeterTriplet
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(FlowMeterCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new FlowMeterCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new FlowMeterCfgCtrl(); }
///
/// Serialized parameters

2
TBF/BenchControl/Elde/FlowMeterTriplet/FlowMeterCfgCtrl.cs
View File

@ -40,7 +40,7 @@ namespace TBF.BenchControl.Elde.FlowMeterTriplet
{
foreach (var cmpnt in parent.CmpntEntities)
{
if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is ControlBoard.Legacy.ControlBoardFactory)
if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is ControlBoard.Legacy.Factory)
{
parentNameComboBox.Items.Add(cmpnt.Name);
}

3
TBF/BenchControl/Elde/FlowMeterTwins/FlowMeterCfg.cs
View File

@ -5,6 +5,7 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Xml.Serialization;
using Config.Entities;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.Elde.FlowMeterTwins
@ -14,7 +15,7 @@ namespace TBF.BenchControl.Elde.FlowMeterTwins
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(FlowMeterCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new FlowMeterCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new FlowMeterCfgCtrl(); }
///
/// Serialized parameters

2
TBF/BenchControl/Elde/FlowMeterTwins/FlowMeterCfgCtrl.cs
View File

@ -40,7 +40,7 @@ namespace TBF.BenchControl.Elde.FlowMeterTwins
{
foreach (var cmpnt in parentDlg.CmpntEntities)
{
if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is ControlBoard.Legacy.ControlBoardFactory)
if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is ControlBoard.Legacy.Factory)
{
parentNameComboBox.Items.Add(cmpnt.Name);
}

2
TBF/BenchControl/Elde/PressureMeter/PressureMeterCfg.cs
View File

@ -16,7 +16,7 @@ namespace TBF.BenchControl.Elde.PressureMeter
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(PressureMeterCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new PressureMeterCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new PressureMeterCfgCtrl(); }
///
/// Serialized parameters

2
TBF/BenchControl/Elde/PressureMeter/PressureMeterCfgCtrl.cs
View File

@ -40,7 +40,7 @@ namespace TBF.BenchControl.Elde.PressureMeter
{
foreach (var cmpnt in parent.CmpntEntities)
{
if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is ControlBoard.Legacy.ControlBoardFactory)
if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is ControlBoard.Legacy.Factory)
{
parentNameComboBox.Items.Add(cmpnt.Name);
}

3
TBF/BenchControl/Elde/PressureMeterInternal/PressureMeterCfg.cs
View File

@ -5,6 +5,7 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Xml.Serialization;
using Config.Entities;
using SchematicDrawing;
using TBF.BenchControl.Generic;
@ -15,7 +16,7 @@ namespace TBF.BenchControl.Elde.PressureMeterInternal
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(PressureMeterCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new PressureMeterCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new PressureMeterCfgCtrl(); }
///
/// Serialized parameters

2
TBF/BenchControl/Elde/PressureMeterInternal/PressureMeterCfgCtrl.cs
View File

@ -40,7 +40,7 @@ namespace TBF.BenchControl.Elde.PressureMeterInternal
{
foreach (var cmpnt in parent.CmpntEntities)
{
if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is ControlBoard.Legacy.ControlBoardFactory)
if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is ControlBoard.Legacy.Factory)
{
parentNameComboBox.Items.Add(cmpnt.Name);
}

3
TBF/BenchControl/Elde/PumpWithFM/PumpCfg.cs
View File

@ -4,6 +4,7 @@
using System.IO;
using System.Collections.Generic;
using System.Xml.Serialization;
using Config.Entities;
using SchematicDrawing;
using TBF.BenchControl.Generic;
@ -14,7 +15,7 @@ namespace TBF.BenchControl.Elde.PumpWithFM
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(PumpCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new PumpCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new PumpCfgCtrl(); }
///
/// Serialized parameters

2
TBF/BenchControl/Elde/PumpWithFM/PumpCfgCtrl.cs
View File

@ -40,7 +40,7 @@ namespace TBF.BenchControl.Elde.PumpWithFM
{
foreach (var cmpnt in parent.CmpntEntities)
{
if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is ControlBoard.Legacy.ControlBoardFactory)
if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is ControlBoard.Legacy.Factory)
{
parentNameComboBox.Items.Add(cmpnt.Name);
}

3
TBF/BenchControl/Elde/RegulValve/RegulValveCfg.cs
View File

@ -5,6 +5,7 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Xml.Serialization;
using Config.Entities;
using SchematicDrawing;
using TBF.BenchControl.Generic;
@ -15,7 +16,7 @@ namespace TBF.BenchControl.Elde.RegulValve
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(RegulValveCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new RegulValveCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new RegulValveCfgCtrl(); }
///
/// Serialized parameters

2
TBF/BenchControl/Elde/RegulValve/RegulValveCfgCtrl.cs
View File

@ -43,7 +43,7 @@ namespace TBF.BenchControl.Elde.RegulValve
{
foreach (var cmpnt in parent.CmpntEntities)
{
if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is ControlBoard.Legacy.ControlBoardFactory)
if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is ControlBoard.Legacy.Factory)
{
parentNameComboBox.Items.Add(cmpnt.Name);
}

3
TBF/BenchControl/Elde/RegulValveCoax/RegulValveCfg.cs
View File

@ -5,6 +5,7 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Xml.Serialization;
using Config.Entities;
using SchematicDrawing;
using TBF.BenchControl.Generic;
@ -15,7 +16,7 @@ namespace TBF.BenchControl.Elde.RegulValveCoax
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(RegulValveCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new RegulValveCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new RegulValveCfgCtrl(); }
///
/// Serialized parameters

2
TBF/BenchControl/Elde/RegulValveCoax/RegulValveCfgCtrl.cs
View File

@ -40,7 +40,7 @@ namespace TBF.BenchControl.Elde.RegulValveCoax
{
foreach (var cmpnt in parent.CmpntEntities)
{
if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is ControlBoard.Legacy.ControlBoardFactory)
if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is ControlBoard.Legacy.Factory)
{
parentNameComboBox.Items.Add(cmpnt.Name);
}

3
TBF/BenchControl/Elde/RegulValveTandem/RegulValveTandemCfg.cs
View File

@ -5,6 +5,7 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Xml.Serialization;
using Config.Entities;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.Elde.RegulValveTandem
@ -14,7 +15,7 @@ namespace TBF.BenchControl.Elde.RegulValveTandem
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(RegulValveTandemCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new RegulValveTandemCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new RegulValveTandemCfgCtrl(); }
///
/// Serialized parameters

3
TBF/BenchControl/Elde/TempMeter/TempMeterCfg.cs
View File

@ -5,6 +5,7 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Xml.Serialization;
using Config.Entities;
using SchematicDrawing;
using TBF.BenchControl.Generic;
@ -15,7 +16,7 @@ namespace TBF.BenchControl.Elde.TempMeter
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TempMeterCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new TempMeterCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new TempMeterCfgCtrl(); }
///
/// Serialized parameters

2
TBF/BenchControl/Elde/TempMeter/TempMeterCfgCtrl.cs
View File

@ -43,7 +43,7 @@ namespace TBF.BenchControl.Elde.TempMeter
{
foreach (var cmpnt in parent.CmpntEntities)
{
if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is ControlBoard.Legacy.ControlBoardFactory)
if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is ControlBoard.Legacy.Factory)
{
parentNameComboBox.Items.Add(cmpnt.Name);
}

3
TBF/BenchControl/Elde/TempMeterInternal/TempMeterCfg.cs
View File

@ -6,6 +6,7 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Xml.Serialization;
using Config.Entities;
using SchematicDrawing;
using TBF.BenchControl.Generic;
@ -16,7 +17,7 @@ namespace TBF.BenchControl.Elde.TempMeterInternal
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TempMeterCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new TempMeterCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new TempMeterCfgCtrl(); }
///
/// Serialized parameters

2
TBF/BenchControl/Elde/TempMeterInternal/TempMeterCfgCtrl.cs
View File

@ -40,7 +40,7 @@ namespace TBF.BenchControl.Elde.TempMeterInternal
{
foreach (var cmpnt in parent.CmpntEntities)
{
if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is ControlBoard.Legacy.ControlBoardFactory)
if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is ControlBoard.Legacy.Factory)
{
parentNameComboBox.Items.Add(cmpnt.Name);
}

20
TBF/BenchControl/Elde/TempMeterMeret/TempMeterCfg.cs
View File

@ -4,6 +4,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Xml.Serialization;
using Config.Entities;
using SchematicDrawing;
@ -16,22 +17,9 @@ namespace TBF.BenchControl.Elde.TempMeterMeret
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TempMeterCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl()
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities)
{
IList<string> parents = new List<string>();
parents.Add("CB");
// TODO:
//if (StateMachine.Components != null)
//{
// foreach (var cmpnt in StateMachine.Components)
// {
// if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is TBF.BenchControl.Modbus.Common.Factory)
// {
// parents.Add(cmpnt.Name);
// }
// }
//}
var parents = cmpntEntities.Where(x => x.ClassName == "ControlBoard.Legacy");
return new Configs.ParamsProvider.ComponentCfgCtrl(this, parents);
}
@ -108,7 +96,7 @@ namespace TBF.BenchControl.Elde.TempMeterMeret
};
public string ParamName(int i) { return paramNames[i]; }
public int ParamsCount() { return paramNames.Length; }
public IList<string> ParamValues(int i) { return null; }
public ICollection<string> ParamValues(int i) { return null; }
public string ToString(int i)
{

2
TBF/BenchControl/Generic/IComponentCfg.cs
View File

@ -56,7 +56,7 @@ namespace TBF.BenchControl.Generic
///
/// Object instance factory-like methods
///
IComponentCfgCtrl GetControl();
IComponentCfgCtrl GetControl(IList<Component> cmpntEntities);
/// <summary>

2
TBF/BenchControl/Hart/Common/Factory.cs
View File

@ -8,7 +8,7 @@ namespace TBF.BenchControl.Hart.Common
{
public class Factory : IComponentFactory
{
public string ClassName { get { return this.GetType().Namespace.Substring(17); } }
public string ClassName { get { return GetType().Namespace.Substring(17); } }
public override string ToString() { return ClassName; }
public void ResetStaticProperties() { Hart.ResetStaticProperties(); }

4
TBF/BenchControl/Hart/Common/HartCfg.cs
View File

@ -22,7 +22,7 @@ namespace TBF.BenchControl.Hart.Common
static readonly Handshake[] AllHandshakes = new Handshake[] { Handshake.None, Handshake.XOnXOff, Handshake.RequestToSend, Handshake.RequestToSendXOnXOff };
public IComponentCfgCtrl GetControl()
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities)
{
return new Configs.ParamsProvider.ComponentCfgCtrl(this, null);
}
@ -74,7 +74,7 @@ namespace TBF.BenchControl.Hart.Common
public string ParamName(int i) { return paramNames[i]; }
public int ParamsCount() { return paramNames.Length; }
public IList<string> ParamValues(int i)
public ICollection<string> ParamValues(int i)
{
IList<string> list = new List<string>();
switch (i)

11
TBF/BenchControl/Hart/Nivotrack/NivotrackCfg.cs
View File

@ -5,6 +5,7 @@ using System;
using System.IO;
using System.Collections.Generic;
using System.IO.Ports;
using System.Linq;
using System.Xml.Serialization;
using Config.Entities;
using TBF.BenchControl.Generic;
@ -20,12 +21,10 @@ namespace TBF.BenchControl.Hart.Nivotrack
static readonly int[] Par2Values = new int[] { 7, 8 };
public IComponentCfgCtrl GetControl()
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities)
{
IList<string> parents = new List<string>();
parents.Add("Hart");
return new Configs.ParamsProvider.ComponentCfgCtrl(this, parents);
var parents = cmpntEntities.Where(x => x.ClassName == "Hart.Common");
return new Configs.ParamsProvider.ComponentCfgCtrl(this, parents);
}
///
@ -86,7 +85,7 @@ namespace TBF.BenchControl.Hart.Nivotrack
public string ParamName(int i) { return paramNames[i]; }
public int ParamsCount() { return paramNames.Length; }
public IList<string> ParamValues(int i)
public ICollection<string> ParamValues(int i)
{
IList<string> list = new List<string>();
switch (i)

4
TBF/BenchControl/Keithley/Multimeter_2010_RS232/MultimeterCfg.cs
View File

@ -1,7 +1,7 @@
///
/// Copyright (c) 2016 Sensus Metering Systems
///
using System;
using System.Collections.Generic;
using System.IO.Ports;
using System.Xml.Serialization;
using TBF.BenchControl.Generic;
@ -13,7 +13,7 @@ namespace TBF.BenchControl.Keithley.Multimeter_2010_RS232
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(MultimeterCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new MultimeterCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new MultimeterCfgCtrl(); }
///
/// Serialized parameters

3
TBF/BenchControl/Keithley/TempMeter/TempMeterCfg.cs
View File

@ -3,7 +3,6 @@
///
using System;
using System.Collections.Generic;
using System.IO;
using System.Xml.Serialization;
using SchematicDrawing;
using TBF.BenchControl.Generic;
@ -15,7 +14,7 @@ namespace TBF.BenchControl.Keithley.TempMeter
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TempMeterCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new TempMeterCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new TempMeterCfgCtrl(); }
///
/// Serialized parameters

3
TBF/BenchControl/MettlerToledo/Multi/BalanceCfg.cs
View File

@ -6,6 +6,7 @@ using System.IO;
using System.Collections.Generic;
using System.IO.Ports;
using System.Xml.Serialization;
using Config.Entities;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.MettlerToledo.Multi
@ -15,7 +16,7 @@ namespace TBF.BenchControl.MettlerToledo.Multi
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(BalanceCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new BalanceCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new BalanceCfgCtrl(); }
///
/// Serialized parameters

3
TBF/BenchControl/MettlerToledo/Standard/BalanceCfg.cs
View File

@ -6,6 +6,7 @@ using System.IO;
using System.Collections.Generic;
using System.IO.Ports;
using System.Xml.Serialization;
using Config.Entities;
using SchematicDrawing;
using TBF.BenchControl.Generic;
@ -24,7 +25,7 @@ namespace TBF.BenchControl.MettlerToledo.Standard
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(BalanceCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new BalanceCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new BalanceCfgCtrl(); }
///
/// Serialized parameters

14
TBF/BenchControl/Modbus/Ambient/Comet/AmbientCfg.cs
View File

@ -3,6 +3,7 @@
///
using System;
using System.Collections.Generic;
using System.Linq;
using System.Xml.Serialization;
using Config;
using Config.Entities;
@ -17,9 +18,10 @@ namespace TBF.BenchControl.Modbus.Ambient.Comet
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl()
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities)
{
return new Configs.ParamsProvider.ComponentCfgCtrl(this, new List<string>(new string[] { "Modbus" }));
var parents = cmpntEntities.Where(x => x.ClassName == "Modbus.Common");
return new Configs.ParamsProvider.ComponentCfgCtrl(this, parents);
}
///
@ -126,16 +128,16 @@ namespace TBF.BenchControl.Modbus.Ambient.Comet
public string ParamName(int i) { return paramNames[i]; }
public int ParamsCount() { return paramNames.Length; }
public IList<string> ParamValues(int i)
public ICollection<string> ParamValues(int i)
{
switch (i)
{
case 1:
return new List<string>(new string[] { "°C", "°F", "K" });
return new string[] { "°C", "°F", "K" };
case 5:
return new List<string>(new string[] { "Pa", "hPa", "mbar", "kPa", "inHg", "psi", "bar", "MPa" });
return new string[] { "Pa", "hPa", "mbar", "kPa", "inHg", "psi", "bar", "MPa" };
case 9:
return new List<string>(new string[] { "R%" });
return new string[] { "R%" };
default:
return null;
}

36
TBF/BenchControl/Modbus/Common/ModbusCfg.cs
View File

@ -15,7 +15,7 @@ namespace TBF.BenchControl.Modbus.Common
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(ModbusCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); }
///
/// Serialized parameters
@ -62,35 +62,27 @@ namespace TBF.BenchControl.Modbus.Common
public string ParamName(int i) { return paramNames[i]; }
public int ParamsCount() { return paramNames.Length; }
public IList<string> ParamValues(int i)
public ICollection<string> ParamValues(int i)
{
IList<string> values = new List<string>();
switch (i)
{
case 1:
return new List<string>(new string[] { "150", "300", "600", "1200", "2400", "4800", "9600",
"19200", "38400", "57600", "76800", "115200"});
return new string[] { "150", "300", "600", "1200", "2400", "4800", "9600",
"19200", "38400", "57600", "76800", "115200"};
case 2:
values.Add(Parity.None.ToString());
values.Add(Parity.Odd.ToString());
values.Add(Parity.Even.ToString());
return values;
return new string[] { Parity.None.ToString(), Parity.Odd.ToString(), Parity.Even.ToString() };
case 3:
values.Add(7.ToString());
values.Add(8.ToString());
return values;
return new string[] { "7", "8" };
case 4:
values.Add(StopBits.None.ToString());
values.Add(StopBits.One.ToString());
values.Add(StopBits.OnePointFive.ToString());
values.Add(StopBits.Two.ToString());
return values;
return new string[] { StopBits.None.ToString(),
StopBits.One.ToString(),
StopBits.OnePointFive.ToString(),
StopBits.Two.ToString() };
case 5:
values.Add(Handshake.None.ToString());
values.Add(Handshake.XOnXOff.ToString());
values.Add(Handshake.RequestToSend.ToString());
values.Add(Handshake.RequestToSendXOnXOff.ToString());
return values;
return new string[] { Handshake.None.ToString(),
Handshake.XOnXOff.ToString(),
Handshake.RequestToSend.ToString(),
Handshake.RequestToSendXOnXOff.ToString() };
default:
return null;
}

4
TBF/BenchControl/Modbus/Easytherm/EasythermCfg.cs
View File

@ -1,7 +1,7 @@
///
/// Copyright (c) 2017 Sensus Metering Systems
///
using System;
using System.Collections.Generic;
using System.Xml.Serialization;
using Config.Entities;
using TBF.BenchControl.Generic;
@ -13,7 +13,7 @@ namespace TBF.BenchControl.Modbus.Easytherm
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(EasythermCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new EasythermCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new EasythermCfgCtrl(); }
///
/// Serialized parameters

10
TBF/BenchControl/Modbus/PressureMeter/Meret/PressureMeterCfg.cs
View File

@ -3,6 +3,7 @@
///
using System;
using System.Collections.Generic;
using System.Linq;
using System.Xml.Serialization;
using Config;
using Config.Entities;
@ -17,9 +18,10 @@ namespace TBF.BenchControl.Modbus.PressureMeter.Meret
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(PressureMeterCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl()
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities)
{
return new Configs.ParamsProvider.ComponentCfgCtrl(this, new List<string>(new string[] { "Modbus" }));
var parents = cmpntEntities.Where(x => x.ClassName == "Modbus.Common");
return new Configs.ParamsProvider.ComponentCfgCtrl(this, parents);
}
///
@ -97,12 +99,12 @@ namespace TBF.BenchControl.Modbus.PressureMeter.Meret
public string ParamName(int i) { return paramNames[i]; }
public int ParamsCount() { return paramNames.Length; }
public IList<string> ParamValues(int i)
public ICollection<string> ParamValues(int i)
{
switch (i)
{
case 3:
return new List<string>(new string[] { "Pa", "hPa", "mbar", "kPa", "inHg", "psi", "bar", "MPa" });
return new string[] { "Pa", "hPa", "mbar", "kPa", "inHg", "psi", "bar", "MPa" };
default:
return null;
}

5
TBF/BenchControl/Modbus/PumpFM/DanfossVLT/PumpCfg.cs
View File

@ -2,10 +2,11 @@
/// Copyright (c) 2020 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
using System.Xml.Serialization;
using Config.Entities;
using SchematicDrawing;
using TBF.BenchControl.Generic;
using System.Collections.Generic;
namespace TBF.BenchControl.Modbus.PumpFM.DanfossVLT
{
@ -14,7 +15,7 @@ namespace TBF.BenchControl.Modbus.PumpFM.DanfossVLT
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(PumpCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new PumpCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new PumpCfgCtrl(); }
///
/// Serialized parameters

3
TBF/BenchControl/Modbus/QuidoRS/QuidoRSCfg.cs
View File

@ -5,6 +5,7 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Xml.Serialization;
using Config.Entities;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.Modbus.QuidoRS
@ -23,7 +24,7 @@ namespace TBF.BenchControl.Modbus.QuidoRS
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(QuidoRSCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new QuidoRSCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new QuidoRSCfgCtrl(); }
///
/// Serialized parameters

5
TBF/BenchControl/Modbus/TankSelector/TankSelectorCfg.cs
View File

@ -1,7 +1,10 @@
///
/// Copyright (c) 2017 Sensus Metering Systems
///
using System;
using System.Collections.Generic;
using System.Xml.Serialization;
using Config.Entities;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.Modbus.TankSelector
@ -11,7 +14,7 @@ namespace TBF.BenchControl.Modbus.TankSelector
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TankSelectorCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new TankSelectorCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new TankSelectorCfgCtrl(); }
///
/// Serialized parameters

10
TBF/BenchControl/Modbus/TempMeter/Groch/TempMeterCfg.cs
View File

@ -3,6 +3,7 @@
///
using System;
using System.Collections.Generic;
using System.Linq;
using System.Xml.Serialization;
using Config;
using Config.Entities;
@ -17,9 +18,10 @@ namespace TBF.BenchControl.Modbus.TempMeter.Groch
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TempMeterCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl()
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities)
{
return new Configs.ParamsProvider.ComponentCfgCtrl(this, new List<string>(new string[]{ "Modbus" }));
var parents = cmpntEntities.Where(x => x.ClassName == "Modbus.Common");
return new Configs.ParamsProvider.ComponentCfgCtrl(this, parents);
}
///
@ -112,7 +114,7 @@ namespace TBF.BenchControl.Modbus.TempMeter.Groch
public string ParamName(int i) { return paramNames[i]; }
public int ParamsCount() { return paramNames.Length; }
public IList<string> ParamValues(int i)
public ICollection<string> ParamValues(int i)
{
switch (i)
{
@ -121,7 +123,7 @@ namespace TBF.BenchControl.Modbus.TempMeter.Groch
for (int j = 0; j < 16; j++) values.Add(j.ToString());
return values;
case 8:
return new List<string>(new string[] { "°C", "°F", "K" });
return new string[] { "°C", "°F", "K" };
default:
return null;
}

10
TBF/BenchControl/Modbus/TempMeter/Meret/TempMeterCfg.cs
View File

@ -3,6 +3,7 @@
///
using System;
using System.Collections.Generic;
using System.Linq;
using System.Xml.Serialization;
using Config;
using Config.Entities;
@ -17,9 +18,10 @@ namespace TBF.BenchControl.Modbus.TempMeter.Meret
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TempMeterCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl()
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities)
{
return new Configs.ParamsProvider.ComponentCfgCtrl(this, new List<string>(new string[] { "Modbus" }));
var parents = cmpntEntities.Where(x => x.ClassName == "Modbus.Common");
return new Configs.ParamsProvider.ComponentCfgCtrl(this, parents);
}
///
@ -98,12 +100,12 @@ namespace TBF.BenchControl.Modbus.TempMeter.Meret
public string ParamName(int i) { return paramNames[i]; }
public int ParamsCount() { return paramNames.Length; }
public IList<string> ParamValues(int i)
public ICollection<string> ParamValues(int i)
{
switch (i)
{
case 3:
return new List<string>(new string[] { "°C", "°F", "K" });
return new string[] { "°C", "°F", "K" };
default:
return null;
}

20
TBF/BenchControl/Modbus/UltrasoundLevelMeter/LevelMeterCfg.cs
View File

@ -4,6 +4,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Xml.Serialization;
using Config.Entities;
using TBF.BenchControl.Generic;
@ -15,22 +16,9 @@ namespace TBF.BenchControl.Modbus.UltrasoundLevelMeter
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(LevelMeterCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl()
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities)
{
IList<string> parents = new List<string>();
// TODO:
//if (StateMachine.Components != null)
//{
// foreach (var cmpnt in StateMachine.Components)
// {
// if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is TBF.BenchControl.Modbus.Common.Factory)
// {
// parents.Add(cmpnt.Name);
// }
// }
//}
parents.Add("Modbus");
var parents = cmpntEntities.Where(x => x.ClassName == "Modbus.Common");
return new Configs.ParamsProvider.ComponentCfgCtrl(this, parents);
}
@ -65,7 +53,7 @@ namespace TBF.BenchControl.Modbus.UltrasoundLevelMeter
};
public string ParamName(int i) { return paramNames[i]; }
public int ParamsCount() { return paramNames.Length; }
public IList<string> ParamValues(int i) { return null; }
public ICollection<string> ParamValues(int i) { return null; }
public string ToString(int i)
{

21
TBF/BenchControl/Modbus/WaterAnalyzer/AnalyzerCfg.cs
View File

@ -4,6 +4,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Xml.Serialization;
using Config.Entities;
using TBF.BenchControl.Generic;
@ -15,23 +16,9 @@ namespace TBF.BenchControl.Modbus.WaterAnalyzer
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(AnalyzerCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl()
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities)
{
IList<string> parents = new List<string>();
// TODO:
//if (StateMachine.Components != null)
//{
// foreach (var cmpnt in StateMachine.Components)
// {
// if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is TBF.BenchControl.Modbus.Common.Factory)
// {
// parents.Add(cmpnt.Name);
// }
// }
//}
parents.Add("Modbus");
parents.Add("ModbusUSB");
var parents = cmpntEntities.Where(x => x.ClassName == "Modbus.Common");
return new Configs.ParamsProvider.ComponentCfgCtrl(this, parents);
}
@ -66,7 +53,7 @@ namespace TBF.BenchControl.Modbus.WaterAnalyzer
};
public string ParamName(int i) { return paramNames[i]; }
public int ParamsCount() { return paramNames.Length; }
public IList<string> ParamValues(int i) { return null; }
public ICollection<string> ParamValues(int i) { return null; }
public string ToString(int i)
{

5
TBF/BenchControl/Network/Adapter/NetadapterCfg.cs
View File

@ -1,7 +1,10 @@
///
/// Copyright (c) 2017 Sensus Metering Systems
///
using System;
using System.Collections.Generic;
using System.Xml.Serialization;
using Config.Entities;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.Network.Adapter
@ -11,7 +14,7 @@ namespace TBF.BenchControl.Network.Adapter
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(NetadapterCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new NetadapterCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new NetadapterCfgCtrl(); }
public string Description; /// Description string of the selected network adapter

4
TBF/BenchControl/Network/Camera/CLP1611/CameraCfg.cs
View File

@ -1,9 +1,11 @@
///
/// Copyright (c) 2017 Sensus Metering Systems
///
using System.Collections.Generic;
using System.Net;
using System.Net.Sockets;
using System.Xml.Serialization;
using Config.Entities;
using TBF.BenchControl.Generic;
using TBF.Resources;
@ -24,7 +26,7 @@ namespace TBF.BenchControl.Network.Camera.CLP1611
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(CameraCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new CameraCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new CameraCfgCtrl(); }
///
/// Serialized parameters

3
TBF/BenchControl/Network/Camera/Display/DisplayCfg.cs
View File

@ -1,6 +1,7 @@
///
/// Copyright (c) 2017 Sensus Metering Systems
///
using System.Collections.Generic;
using System.Xml.Serialization;
using Config.Entities;
using TBF.BenchControl.Generic;
@ -12,7 +13,7 @@ namespace TBF.BenchControl.Network.Camera.Display
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(DisplayCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new DisplayCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new DisplayCfgCtrl(); }
///
/// Serialized parameters

3
TBF/BenchControl/Network/Camera/Roi/RoiCfg.cs
View File

@ -1,6 +1,7 @@
///
/// Copyright (c) 2017 Sensus Metering Systems
///
using System.Collections.Generic;
using System.Xml.Serialization;
using Config.Entities;
using TBF.BenchControl.Generic;
@ -12,7 +13,7 @@ namespace TBF.BenchControl.Network.Camera.Roi
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(RoiCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new RoiCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new RoiCfgCtrl(); }
///
/// Serialized parameters

3
TBF/BenchControl/Network/Camera/RoiForFixedStart/RoiCfg.cs
View File

@ -1,6 +1,7 @@
///
/// Copyright (c) 2017 Sensus Metering Systems
///
using System.Collections.Generic;
using System.Xml.Serialization;
using Config.Entities;
using TBF.BenchControl.Generic;
@ -12,7 +13,7 @@ namespace TBF.BenchControl.Network.Camera.RoiForFixedStart
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(RoiCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new RoiCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new RoiCfgCtrl(); }
///
/// Serialized parameters

4
TBF/BenchControl/Network/Comet/Ambient/AmbientCfg.cs
View File

@ -3,7 +3,9 @@
///
using System;
using System.Net;
using System.Collections.Generic;
using System.Xml.Serialization;
using Config.Entities;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.Network.Comet.Ambient
@ -13,7 +15,7 @@ namespace TBF.BenchControl.Network.Comet.Ambient
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(AmbientCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new AmbientCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new AmbientCfgCtrl(); }
///
/// Serialized parameters

5
TBF/BenchControl/Output/DB/ProductionTracing/MonitoringCfg.cs
View File

@ -1,7 +1,10 @@
///
/// Copyright (c) 2018 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
using System.Xml.Serialization;
using Config.Entities;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.Output.DB.ProductionTracing
@ -14,7 +17,7 @@ namespace TBF.BenchControl.Output.DB.ProductionTracing
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(MonitoringCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new TracingCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new TracingCfgCtrl(); }
public string ConnStr;

5
TBF/BenchControl/Output/DB/SaveDiverterCorrections/SaveDiverterCorrCfg.cs
View File

@ -1,7 +1,10 @@
///
/// Copyright (c) 2019 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
using System.Xml.Serialization;
using Config.Entities;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.Output.DB.SaveDiverterCorrections
@ -11,7 +14,7 @@ namespace TBF.BenchControl.Output.DB.SaveDiverterCorrections
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(SaveDiverterCorrCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new SaveDiverterCorrCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new SaveDiverterCorrCfgCtrl(); }
public string Diverter1;
public string Diverter2;

5
TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorrCfg.cs
View File

@ -1,7 +1,10 @@
///
/// Copyright (c) 2018 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
using System.Xml.Serialization;
using Config.Entities;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections
@ -11,7 +14,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(SaveFlowmeterCorrCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new SaveFlowmeterCorrCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new SaveFlowmeterCorrCfgCtrl(); }
public string Flowmeter1;
public string Flowmeter2;

3
TBF/BenchControl/Output/DB/SensusOracle/DatabaseCfg.cs
View File

@ -2,6 +2,7 @@
/// Copyright (c) 2015-2019 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
using System.Xml.Serialization;
using Config.Entities;
using TBF.BenchControl.Generic;
@ -13,7 +14,7 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(DatabaseCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new DatabaseCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new DatabaseCfgCtrl(); }
/// <summary> Serialized parameters </summary>
public bool TestMode;

12
TBF/BenchControl/Output/DB/SensusOracle/ProcedureParams.cs
View File

@ -60,7 +60,7 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
public override string ParamName(int i) { return paramNames[i]; }
public override int ParamsCount() { return paramNames.Length; }
public override IList<string> ParamValues(int i)
public override ICollection<string> ParamValues(int i)
{
IList<string> retVal = new List<string>();
@ -80,17 +80,11 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
case 3:
int year = DateTime.Now.Year;
retVal.Add(year.ToString());
retVal.Add((year + 1).ToString());
return retVal;
return new string[] { year.ToString(), (year + 1).ToString() };
case 4:
case 5:
case 6:
retVal.Add(Strings.yes);
retVal.Add(Strings.no);
return retVal;
return new string[] { Strings.yes, Strings.no };
case 7:
for (DesigMode md = 0; md < DesigMode.Count; md++) retVal.Add(md.ToString());
return retVal;

27
TBF/BenchControl/Output/EventTriggers/Iperl/TriggerCfg.cs
View File

@ -18,7 +18,7 @@ namespace TBF.BenchControl.Output.EventTriggers.Iperl
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TriggerCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); }
///
/// Serialized parameters
@ -60,23 +60,18 @@ namespace TBF.BenchControl.Output.EventTriggers.Iperl
public string ParamName(int i) { return paramNames[i]; }
public int ParamsCount() { return paramNames.Length; }
public IList<string> ParamValues(int i)
public ICollection<string> ParamValues(int i)
{
IList<string> listOfValues = new List<string>();
if (i == 1)
switch (i)
{
for (Culture cu = 0; cu < Culture.Count; cu++) listOfValues.Add(cu.ToString());
return listOfValues;
}
else if (i == 2)
{
listOfValues.Add(Strings.yes);
listOfValues.Add(Strings.no);
return listOfValues;
}
else
{
return null;
case 1:
IList<string> listOfValues = new List<string>();
for (Culture cu = 0; cu < Culture.Count; cu++) listOfValues.Add(cu.ToString());
return listOfValues;
case 2:
return new string[] { Strings.yes, Strings.no };
default:
return null;
}
}

20
TBF/BenchControl/Output/EventTriggers/Standard/TriggerCfg.cs
View File

@ -18,7 +18,7 @@ namespace TBF.BenchControl.Output.EventTriggers.Standard
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TriggerCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); }
///
/// Serialized parameters
@ -168,26 +168,19 @@ namespace TBF.BenchControl.Output.EventTriggers.Standard
public string ParamName(int i) { return paramNames[i]; }
public int ParamsCount() { return paramNames.Length; }
public IList<string> ParamValues(int i)
public ICollection<string> ParamValues(int i)
{
IList<string> listOfValues = new List<string>();
if (i >= 12)
if (i >= 17)
{
listOfValues.Add(Strings.yes);
listOfValues.Add(Strings.no);
return listOfValues;
}
else
{
return null;
return new string[] { Strings.yes, Strings.no };
}
return null;
}
public string ToString(int i)
{
switch (i)
{
case -1: return string.Format("Name={0}, EventSource={1}, FailedWMsPct={2}, ...", Name, EventSource, FailedWMsPct);
case 0: return EventSource;
case 1: return FailedWMsPct.ToString();
case 2: return Mid1Name;
@ -230,7 +223,8 @@ namespace TBF.BenchControl.Output.EventTriggers.Standard
#else
case 34: return E36 ? Strings.yes : Strings.no;
#endif
default: return string.Empty;
default:
return string.Format("Name={0}, EventSource={1}, FailedWMsPct={2}, ...", Name, EventSource, FailedWMsPct);
}
}

5
TBF/BenchControl/Output/FileWriters/Basic/WriterCfg.cs
View File

@ -1,7 +1,10 @@
///
/// Copyright (c) 2013-2017 Sensus Metering Systems
///
using System;
using System.Collections.Generic;
using System.Xml.Serialization;
using Config.Entities;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.Output.FileWriters.Basic
@ -11,7 +14,7 @@ namespace TBF.BenchControl.Output.FileWriters.Basic
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(WriterCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new WriterCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new WriterCfgCtrl(); }
public string DestinationPath; /// Directory path into which the results will be saved
public string DestinationPath2; /// Directory path into which the 2nd copy of results will be saved

5
TBF/BenchControl/Output/FileWriters/Elde/WriterCfg.cs
View File

@ -1,7 +1,10 @@
///
/// Copyright (c) 2019 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
using System.Xml.Serialization;
using Config.Entities;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.Output.FileWriters.Elde
@ -11,7 +14,7 @@ namespace TBF.BenchControl.Output.FileWriters.Elde
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(WriterCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new WriterCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new WriterCfgCtrl(); }
public string DestinationPath; /// Directory path into which the results will be saved
public string DestinationPath2; /// Directory path into which the 2nd copy of results will be saved

5
TBF/BenchControl/Output/FileWriters/Enhanced/WriterCfg.cs
View File

@ -1,7 +1,10 @@
///
/// Copyright (c) 2016-2017 Sensus Metering Systems
///
using System;
using System.Collections.Generic;
using System.Xml.Serialization;
using Config.Entities;
using TBF.BenchControl.Generic;
namespace TBF.BenchControl.Output.FileWriters.Enhanced
@ -11,7 +14,7 @@ namespace TBF.BenchControl.Output.FileWriters.Enhanced
public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(WriterCfg) })[0];
public override XmlSerializer GetSerializer() { return Serializer; }
public IComponentCfgCtrl GetControl() { return new WriterCfgCtrl(); }
public IComponentCfgCtrl GetControl(IList<Config.Entities.Component> cmpntEntities) { return new WriterCfgCtrl(); }
public string DestinationPath; /// Directory path into which the results will be saved
public string DestinationPath2; /// Directory path into which the 2nd copy of results will be saved

Some files were not shown because too many files have changed in this diff Show More