From abb2375500d625da902f9cc64d813b3dd877b8a2 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Sun, 29 Aug 2021 13:01:34 +0200 Subject: [PATCH] IComponentCfg : GetControl( ) --> GetControl(IList cmpntEntities) --- DeviceTest/DeviceTestDlg.cs | 44 +++++++++---------- ResultsBrowser/Forms/PrinterConfigDlg.cs | 9 ++-- TBF/BenchControl/Ambient/Comet/AmbientCfg.cs | 2 +- TBF/BenchControl/Ambient/Greco/AmbientCfg.cs | 2 +- .../Configs/NameOnly/TestMethodCfg.cs | 3 +- TBF/BenchControl/Danfoss/VLT2800/PumpCfg.cs | 2 +- .../BackupAndSecurityOptions/ComponentCfg.cs | 2 +- .../BenchInfo/Extended/ComponentCfg.cs | 2 +- .../BenchInfo/iPerl/ComponentCfg.cs | 2 +- .../DataContainers/Buoyancy/ComponentCfg.cs | 2 +- .../DataContainers/Density/ComponentCfg.cs | 2 +- .../Evaporation/EvaporationCfg.cs | 2 +- .../DataEntry/Combined/EntryFormCfg.cs | 2 +- .../DataEntry/DataStream/EntryFormCfg.cs | 2 +- .../DataEntry/Fewa/EntryFormCfg.cs | 2 +- .../DataEntry/HeatMeters12/EntryFormCfg.cs | 2 +- .../DataEntry/HeatMeters6/EntryFormCfg.cs | 2 +- .../DataEntry/Munich/EntryFormCfg.cs | 2 +- .../DataEntry/Munich3/EntryFormCfg.cs | 2 +- .../DataEntry/S620/EntryFormCfg.cs | 2 +- .../DataEntry/Single/EntryFormCfg.cs | 2 +- .../DataEntry/Standard12/EntryFormCfg.cs | 2 +- .../DataEntry/Standard24/EntryFormCfg.cs | 2 +- .../DataEntry/Standard48/EntryFormCfg.cs | 2 +- .../DataEntry/Standard6/EntryFormCfg.cs | 2 +- .../DataEntry/StandardCamera/EntryFormCfg.cs | 3 +- .../DataEntry/WMStates/EntryFormCfg.cs | 2 +- .../DataEntry/iPerl/EntryFormCfg.cs | 2 +- .../Dummy/FlowMeter/FlowMeterCfg.cs | 2 +- .../Dummy/RegulValve/RegulValveCfg.cs | 3 +- TBF/BenchControl/Elde/ControlBoardCfg.cs | 2 +- .../Elde/CoverTest/CoverTestCfg.cs | 2 +- TBF/BenchControl/Elde/Diverter/DiverterCfg.cs | 2 +- .../RegisterReaderCfg.cs | 2 +- .../Elde/FlowMeter/FlowMeterCfg.cs | 2 +- .../Elde/FlowMeterDewa/FlowMeterCfg.cs | 2 +- .../Elde/FlowMeterTriplet/FlowMeterCfg.cs | 2 +- .../Elde/FlowMeterTwins/FlowMeterCfg.cs | 2 +- .../Elde/PressureMeter/PressureMeterCfg.cs | 2 +- .../PressureMeterInternal/PressureMeterCfg.cs | 2 +- TBF/BenchControl/Elde/Pump/PumpCfg.cs | 2 +- TBF/BenchControl/Elde/PumpTandem/PumpCfg.cs | 2 +- TBF/BenchControl/Elde/PumpWithFM/PumpCfg.cs | 2 +- .../Elde/RegulValve/RegulValveCfg.cs | 2 +- .../Elde/RegulValveCoax/RegulValveCfg.cs | 2 +- .../Elde/RegulValveMilwaukee/RegulValveCfg.cs | 2 +- .../RegulValveTandem/RegulValveTandemCfg.cs | 2 +- .../Elde/TempMeter/TempMeterCfg.cs | 2 +- .../Elde/TempMeterInternal/TempMeterCfg.cs | 2 +- .../Elde/TempMeterMeret/TempMeterCfg.cs | 2 +- TBF/BenchControl/Elde/Valve/ValveCfg.cs | 2 +- TBF/BenchControl/Elde/ValveEx/ValveCfg.cs | 2 +- TBF/BenchControl/Generic/IComponentCfg.cs | 3 +- TBF/BenchControl/Hart/Common/HartCfg.cs | 2 +- .../Hart/Nivotrack/NivotrackCfg.cs | 2 +- .../Multimeter_2010_RS232/MultimeterCfg.cs | 3 +- .../Keithley/TempMeter/TempMeterCfg.cs | 2 +- .../MettlerToledo/Multi/BalanceCfg.cs | 2 +- .../MettlerToledo/Standard/BalanceCfg.cs | 2 +- .../Modbus/CometAmbient/AmbientCfg.cs | 3 +- TBF/BenchControl/Modbus/Common/ModbusCfg.cs | 2 +- .../Modbus/Easytherm/EasythermCfg.cs | 3 +- TBF/BenchControl/Modbus/Novus/NovusCfg.cs | 3 +- .../PressureMeter/Meret/PressureMeterCfg.cs | 2 +- TBF/BenchControl/Modbus/QuidoRS/QuidoRSCfg.cs | 2 +- .../Modbus/TankSelector/TankSelectorCfg.cs | 3 +- .../UltrasoundLevelMeter/LevelMeterCfg.cs | 2 +- .../Modbus/WaterAnalyzer/AnalyzerCfg.cs | 2 +- .../Modbus/WaterAnalyzer2/AnalyzerCfg.cs | 2 +- .../Network/Adapter/NetadapterCfg.cs | 3 +- .../Network/Camera/CLP1611/CameraCfg.cs | 3 +- .../Network/Camera/Display/DisplayCfg.cs | 3 +- TBF/BenchControl/Network/Camera/Roi/RoiCfg.cs | 3 +- .../Network/Camera/RoiForFixedStart/RoiCfg.cs | 3 +- .../Network/Comet/Ambient/AmbientCfg.cs | 3 +- .../DB/ProductionTracing/MonitoringCfg.cs | 3 +- .../SaveDiverterCorrCfg.cs | 3 +- .../SaveFlowmeterCorrCfg.cs | 3 +- .../Output/DB/SensusOracle/DatabaseCfg.cs | 3 +- .../Output/EventTriggers/Iperl/TriggerCfg.cs | 2 +- .../EventTriggers/Standard/TriggerCfg.cs | 2 +- .../Output/FileWriters/Basic/WriterCfg.cs | 3 +- .../Output/FileWriters/Elde/WriterCfg.cs | 3 +- .../Output/FileWriters/Enhanced/WriterCfg.cs | 3 +- .../FileWriters/ImageArchiver/ArchiverCfg.cs | 2 +- .../FileWriters/IperlLogger/WriterCfg.cs | 2 +- .../FileWriters/OneFilePerMeter/WriterCfg.cs | 3 +- .../Output/FileWriters/Xml/WriterCfg.cs | 2 +- .../Output/FileWriters/XmlBatch/WriterCfg.cs | 2 +- .../Output/FlexFlow/Rest/FlexFlowCfg.cs | 2 +- .../Output/Printers/Enhanced/PrinterCfg.cs | 3 +- .../Output/Printers/Label/PrinterCfg.cs | 2 +- .../Output/Printers/MultiLabel/PrinterCfg.cs | 2 +- .../Output/Printers/Munich/PrinterCfg.cs | 2 +- .../Output/Printers/OnePerBatch/PrinterCfg.cs | 3 +- .../Output/Printers/OnePerMeter/PrinterCfg.cs | 3 +- .../Output/Printers/Zapiska/PrinterCfg.cs | 3 +- .../DataStream/MefImport/MefImportCfg.cs | 2 +- .../DataStream/Reader/ReaderCfg.cs | 2 +- .../KPackE/DataEntryForRadio/EntryFormCfg.cs | 2 +- .../RegisterReaders/KPackE/Radio/RadioCfg.cs | 3 +- .../RegisterReader/RegisterReaderCfg.cs | 2 +- .../PulsesFromEldeCB/RegisterReaderCfg.cs | 3 +- .../SerialStream/SerialStreamCfg.cs | 3 +- .../CombinedWithDetection/TestMethodCfg.cs | 2 +- .../TestMethods/DiverterTest/TestMethodCfg.cs | 2 +- .../TestMethods/Endurance/TestMethodCfg.cs | 2 +- .../FixedStart/HeatMeters/TestMethodCfg.cs | 2 +- .../HeatMeters/TestMethodCfg.cs | 2 +- .../HeatMeters/TestMethodCfg.cs | 2 +- .../HeatMeters/TestMethodCfg.cs | 2 +- .../Compound/TestMethodCfg.cs | 2 +- .../Single/TestMethodCfg.cs | 2 +- .../FlyingStart/Compound/TestMethodCfg.cs | 2 +- .../FlyingStart/HeatMeters/TestMethodCfg.cs | 2 +- .../Compound/TestMethodCfg.cs | 2 +- .../HeatMeters/TestMethodCfg.cs | 2 +- .../Single/TestMethodCfg.cs | 2 +- .../Compound/TestMethodCfg.cs | 2 +- .../HeatMeters/TestMethodCfg.cs | 2 +- .../Single/TestMethodCfg.cs | 2 +- .../Compound/TestMethodCfg.cs | 2 +- .../HeatMeters/TestMethodCfg.cs | 2 +- .../Single/TestMethodCfg.cs | 2 +- .../Compound/TestMethodCfg.cs | 2 +- .../HeatMeters/TestMethodCfg.cs | 2 +- .../Compound/TestMethodCfg.cs | 2 +- .../Single/TestMethodCfg.cs | 2 +- .../TestMethods/GrabImage/GrabImageCfg.cs | 2 +- .../TestMethods/LeakTest/TestMethodCfg.cs | 2 +- .../TestMethods/LiveStream/LiveStreamCfg.cs | 2 +- .../TestMethods/ManualEntry/ManualEntryCfg.cs | 3 +- .../TestMethods/PMaxTest/TestMethodCfg.cs | 2 +- .../TestMethods/PulsesTest/TestMethodCfg.cs | 2 +- .../Q2CorrectionFromHistory/FromHistoryCfg.cs | 3 +- .../RoiDetection/RoiDetectionCfg.cs | 2 +- .../SensitivityTest/TestMethodCfg.cs | 2 +- .../iPerlCommunication/TestMethodCfg.cs | 2 +- .../iPerlHead/IperlHeadCfg.cs | 2 +- .../Various/ErrorFlags/ErrorsCfg.cs | 2 +- .../StatisticsMonitoring/StatisticsCfg.cs | 2 +- .../Various/TankWithLevelMsrmnt/TankCfg.cs | 3 +- .../WaterMeters/Munich/WaterMeterCfg.cs | 2 +- .../WaterMeters/WaterMeter/WaterMeterCfg.cs | 3 +- .../Bench/Components/ComponentsManagerDlg.cs | 29 +++++++----- 145 files changed, 220 insertions(+), 180 deletions(-) diff --git a/DeviceTest/DeviceTestDlg.cs b/DeviceTest/DeviceTestDlg.cs index 8f763830b..572358f1d 100644 --- a/DeviceTest/DeviceTestDlg.cs +++ b/DeviceTest/DeviceTestDlg.cs @@ -422,13 +422,13 @@ namespace DeviceTest { parentCfg = parentFactory.DefaultConfig(); } - IComponentCfgCtrl cfgControl = parentCfg.GetControl(); + ComponentParametersDlg cfgForm = new ComponentParametersDlg(); + cfgForm.CmpntEntities = new List(); + + IComponentCfgCtrl cfgControl = parentCfg.GetControl(cfgForm.CmpntEntities); cfgControl.Config = parentCfg; cfgControl.Config.ItemNr = 0; - ComponentParametersDlg cfgForm = new ComponentParametersDlg(); - cfgForm.CmpntEntities = new List(); - 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 compEntities = new List(); + var compEntities = new List(); 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 compEntities = new List(); + var compEntities = new List(); 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 compEntities = new List(); + var compEntities = new List(); 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; diff --git a/ResultsBrowser/Forms/PrinterConfigDlg.cs b/ResultsBrowser/Forms/PrinterConfigDlg.cs index e52819a6b..4fdbbdf73 100644 --- a/ResultsBrowser/Forms/PrinterConfigDlg.cs +++ b/ResultsBrowser/Forms/PrinterConfigDlg.cs @@ -5,6 +5,7 @@ using System.Windows.Forms; using Config.Entities; using TBF.BenchControl; using TBF.BenchControl.Generic; +using TBF.UI.Bench.Components; namespace ResultsBrowser.Forms { @@ -87,13 +88,13 @@ namespace ResultsBrowser.Forms printerCfg = printerFactory.CmpntCfgFromCmpntEntity(cmpnt); } - IComponentCfgCtrl cfgControl = printerCfg.GetControl(); + ComponentParametersDlg cfgForm = new ComponentParametersDlg(); + cfgForm.CmpntEntities = new List(); + + IComponentCfgCtrl cfgControl = printerCfg.GetControl(cfgForm.CmpntEntities); cfgControl.Config = printerCfg; cfgControl.Config.ItemNr = 0; - TBF.UI.Bench.Components.ComponentParametersDlg cfgForm = new TBF.UI.Bench.Components.ComponentParametersDlg(); - cfgForm.CmpntEntities = new List(); - cfgForm.ComponentCfgCtrl = cfgControl; cfgForm.UnlockAfterStart = true; DialogResult dr = cfgForm.ShowDialog(); diff --git a/TBF/BenchControl/Ambient/Comet/AmbientCfg.cs b/TBF/BenchControl/Ambient/Comet/AmbientCfg.cs index 6102d4439..bf2c7e65b 100644 --- a/TBF/BenchControl/Ambient/Comet/AmbientCfg.cs +++ b/TBF/BenchControl/Ambient/Comet/AmbientCfg.cs @@ -14,7 +14,7 @@ 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 AmbientCfgCtrl(); } + public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new AmbientCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Ambient/Greco/AmbientCfg.cs b/TBF/BenchControl/Ambient/Greco/AmbientCfg.cs index a3a6d94eb..d10771674 100644 --- a/TBF/BenchControl/Ambient/Greco/AmbientCfg.cs +++ b/TBF/BenchControl/Ambient/Greco/AmbientCfg.cs @@ -14,7 +14,7 @@ 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 AmbientCfgCtrl(); } + public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new AmbientCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Configs/NameOnly/TestMethodCfg.cs b/TBF/BenchControl/Configs/NameOnly/TestMethodCfg.cs index a8b7645e0..aa0ae3640 100644 --- a/TBF/BenchControl/Configs/NameOnly/TestMethodCfg.cs +++ b/TBF/BenchControl/Configs/NameOnly/TestMethodCfg.cs @@ -1,6 +1,7 @@ /// /// Copyright (c) 2016 Sensus Metering Systems /// +using System.Collections.Generic; using TBF.BenchControl.Generic; using System.Xml.Serialization; @@ -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 cmpntEntities) { return new TestMethodCfgCtrl(); } /// Private parameterless constructor invoked by all other (public) constructors TestMethodCfg() { } diff --git a/TBF/BenchControl/Danfoss/VLT2800/PumpCfg.cs b/TBF/BenchControl/Danfoss/VLT2800/PumpCfg.cs index 553a3ff11..7c9ce5784 100644 --- a/TBF/BenchControl/Danfoss/VLT2800/PumpCfg.cs +++ b/TBF/BenchControl/Danfoss/VLT2800/PumpCfg.cs @@ -14,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 cmpntEntities) { return new PumpCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/DataContainers/BackupAndSecurityOptions/ComponentCfg.cs b/TBF/BenchControl/DataContainers/BackupAndSecurityOptions/ComponentCfg.cs index e58c57992..0946def52 100644 --- a/TBF/BenchControl/DataContainers/BackupAndSecurityOptions/ComponentCfg.cs +++ b/TBF/BenchControl/DataContainers/BackupAndSecurityOptions/ComponentCfg.cs @@ -17,7 +17,7 @@ namespace TBF.BenchControl.DataContainers.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 cmpntEntities) { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); } /// /// Serialized parameters diff --git a/TBF/BenchControl/DataContainers/BenchInfo/Extended/ComponentCfg.cs b/TBF/BenchControl/DataContainers/BenchInfo/Extended/ComponentCfg.cs index c8407960a..3c658b9c7 100644 --- a/TBF/BenchControl/DataContainers/BenchInfo/Extended/ComponentCfg.cs +++ b/TBF/BenchControl/DataContainers/BenchInfo/Extended/ComponentCfg.cs @@ -17,7 +17,7 @@ namespace TBF.BenchControl.DataContainers.BenchInfo.Extended 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 cmpntEntities) { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); } /// /// Serialized parameters diff --git a/TBF/BenchControl/DataContainers/BenchInfo/iPerl/ComponentCfg.cs b/TBF/BenchControl/DataContainers/BenchInfo/iPerl/ComponentCfg.cs index b16c2d462..873297305 100644 --- a/TBF/BenchControl/DataContainers/BenchInfo/iPerl/ComponentCfg.cs +++ b/TBF/BenchControl/DataContainers/BenchInfo/iPerl/ComponentCfg.cs @@ -18,7 +18,7 @@ namespace TBF.BenchControl.DataContainers.BenchInfo.iPerl 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 cmpntEntities) { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); } /// /// Serialized parameters diff --git a/TBF/BenchControl/DataContainers/Buoyancy/ComponentCfg.cs b/TBF/BenchControl/DataContainers/Buoyancy/ComponentCfg.cs index ad2773904..7fc47cd19 100644 --- a/TBF/BenchControl/DataContainers/Buoyancy/ComponentCfg.cs +++ b/TBF/BenchControl/DataContainers/Buoyancy/ComponentCfg.cs @@ -17,7 +17,7 @@ namespace TBF.BenchControl.DataContainers.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 cmpntEntities) { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); } /// /// Serialized parameters diff --git a/TBF/BenchControl/DataContainers/Density/ComponentCfg.cs b/TBF/BenchControl/DataContainers/Density/ComponentCfg.cs index 5c801cd1e..e0ccdec7b 100644 --- a/TBF/BenchControl/DataContainers/Density/ComponentCfg.cs +++ b/TBF/BenchControl/DataContainers/Density/ComponentCfg.cs @@ -17,7 +17,7 @@ namespace TBF.BenchControl.DataContainers.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 cmpntEntities) { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); } /// /// Serialized parameters diff --git a/TBF/BenchControl/DataContainers/Evaporation/EvaporationCfg.cs b/TBF/BenchControl/DataContainers/Evaporation/EvaporationCfg.cs index d6f117378..2f775fccb 100644 --- a/TBF/BenchControl/DataContainers/Evaporation/EvaporationCfg.cs +++ b/TBF/BenchControl/DataContainers/Evaporation/EvaporationCfg.cs @@ -17,7 +17,7 @@ namespace TBF.BenchControl.DataContainers.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 cmpntEntities) { return new EvaporationCfgCtrl(); } /// Calibration info serialized parameters displayed in Metrology tab page public string CalibCertificateNr { get; set; } diff --git a/TBF/BenchControl/DataEntry/Combined/EntryFormCfg.cs b/TBF/BenchControl/DataEntry/Combined/EntryFormCfg.cs index 4f88c2c57..b467a42bb 100644 --- a/TBF/BenchControl/DataEntry/Combined/EntryFormCfg.cs +++ b/TBF/BenchControl/DataEntry/Combined/EntryFormCfg.cs @@ -14,7 +14,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 cmpntEntities) { return new EntryFormCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/DataEntry/DataStream/EntryFormCfg.cs b/TBF/BenchControl/DataEntry/DataStream/EntryFormCfg.cs index 7a97e4349..5be283884 100644 --- a/TBF/BenchControl/DataEntry/DataStream/EntryFormCfg.cs +++ b/TBF/BenchControl/DataEntry/DataStream/EntryFormCfg.cs @@ -18,7 +18,7 @@ namespace TBF.BenchControl.DataEntry.DataStream public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(EntryFormCfg) })[0]; public override XmlSerializer GetSerializer() { return Serializer; } - public IComponentCfgCtrl GetControl() + public IComponentCfgCtrl GetControl(IList cmpntEntities) { IList parents = new List(); parents.Add("MefImport"); diff --git a/TBF/BenchControl/DataEntry/Fewa/EntryFormCfg.cs b/TBF/BenchControl/DataEntry/Fewa/EntryFormCfg.cs index 3c5f94031..407714f8b 100644 --- a/TBF/BenchControl/DataEntry/Fewa/EntryFormCfg.cs +++ b/TBF/BenchControl/DataEntry/Fewa/EntryFormCfg.cs @@ -14,7 +14,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 cmpntEntities) { return new EntryFormCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/DataEntry/HeatMeters12/EntryFormCfg.cs b/TBF/BenchControl/DataEntry/HeatMeters12/EntryFormCfg.cs index 753a6f4c1..1908c509d 100644 --- a/TBF/BenchControl/DataEntry/HeatMeters12/EntryFormCfg.cs +++ b/TBF/BenchControl/DataEntry/HeatMeters12/EntryFormCfg.cs @@ -14,7 +14,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 cmpntEntities) { return new EntryFormCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/DataEntry/HeatMeters6/EntryFormCfg.cs b/TBF/BenchControl/DataEntry/HeatMeters6/EntryFormCfg.cs index 1aaef19ec..478381793 100644 --- a/TBF/BenchControl/DataEntry/HeatMeters6/EntryFormCfg.cs +++ b/TBF/BenchControl/DataEntry/HeatMeters6/EntryFormCfg.cs @@ -14,7 +14,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 cmpntEntities) { return new EntryFormCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/DataEntry/Munich/EntryFormCfg.cs b/TBF/BenchControl/DataEntry/Munich/EntryFormCfg.cs index 412717c76..0c6c58bb8 100644 --- a/TBF/BenchControl/DataEntry/Munich/EntryFormCfg.cs +++ b/TBF/BenchControl/DataEntry/Munich/EntryFormCfg.cs @@ -14,7 +14,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 cmpntEntities) { return new EntryFormCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/DataEntry/Munich3/EntryFormCfg.cs b/TBF/BenchControl/DataEntry/Munich3/EntryFormCfg.cs index d6879cea5..0eef891f2 100644 --- a/TBF/BenchControl/DataEntry/Munich3/EntryFormCfg.cs +++ b/TBF/BenchControl/DataEntry/Munich3/EntryFormCfg.cs @@ -14,7 +14,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 cmpntEntities) { return new EntryFormCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/DataEntry/S620/EntryFormCfg.cs b/TBF/BenchControl/DataEntry/S620/EntryFormCfg.cs index 557b8735a..9c979f71d 100644 --- a/TBF/BenchControl/DataEntry/S620/EntryFormCfg.cs +++ b/TBF/BenchControl/DataEntry/S620/EntryFormCfg.cs @@ -14,7 +14,7 @@ namespace TBF.BenchControl.DataEntry.S620 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 cmpntEntities) { return new EntryFormCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/DataEntry/Single/EntryFormCfg.cs b/TBF/BenchControl/DataEntry/Single/EntryFormCfg.cs index ac28e1f03..17af86937 100644 --- a/TBF/BenchControl/DataEntry/Single/EntryFormCfg.cs +++ b/TBF/BenchControl/DataEntry/Single/EntryFormCfg.cs @@ -14,7 +14,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 cmpntEntities) { return new EntryFormCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/DataEntry/Standard12/EntryFormCfg.cs b/TBF/BenchControl/DataEntry/Standard12/EntryFormCfg.cs index e0cb92728..09df1913c 100644 --- a/TBF/BenchControl/DataEntry/Standard12/EntryFormCfg.cs +++ b/TBF/BenchControl/DataEntry/Standard12/EntryFormCfg.cs @@ -14,7 +14,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 cmpntEntities) { return new EntryFormCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/DataEntry/Standard24/EntryFormCfg.cs b/TBF/BenchControl/DataEntry/Standard24/EntryFormCfg.cs index 343c173a0..d762dfe0f 100644 --- a/TBF/BenchControl/DataEntry/Standard24/EntryFormCfg.cs +++ b/TBF/BenchControl/DataEntry/Standard24/EntryFormCfg.cs @@ -14,7 +14,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 cmpntEntities) { return new EntryFormCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/DataEntry/Standard48/EntryFormCfg.cs b/TBF/BenchControl/DataEntry/Standard48/EntryFormCfg.cs index 7e6b6e357..ad4192eb6 100644 --- a/TBF/BenchControl/DataEntry/Standard48/EntryFormCfg.cs +++ b/TBF/BenchControl/DataEntry/Standard48/EntryFormCfg.cs @@ -14,7 +14,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 cmpntEntities) { return new EntryFormCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/DataEntry/Standard6/EntryFormCfg.cs b/TBF/BenchControl/DataEntry/Standard6/EntryFormCfg.cs index 21938a5ef..ceed12683 100644 --- a/TBF/BenchControl/DataEntry/Standard6/EntryFormCfg.cs +++ b/TBF/BenchControl/DataEntry/Standard6/EntryFormCfg.cs @@ -14,7 +14,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 cmpntEntities) { return new EntryFormCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/DataEntry/StandardCamera/EntryFormCfg.cs b/TBF/BenchControl/DataEntry/StandardCamera/EntryFormCfg.cs index 74b4bc3ee..92ea6d91c 100644 --- a/TBF/BenchControl/DataEntry/StandardCamera/EntryFormCfg.cs +++ b/TBF/BenchControl/DataEntry/StandardCamera/EntryFormCfg.cs @@ -2,6 +2,7 @@ /// Copyright (c) 2017 Sensus Metering Systems /// using System; +using System.Collections.Generic; using System.Xml.Serialization; using TBF.BenchControl.Generic; @@ -12,7 +13,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 cmpntEntities) { return new EntryFormCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/DataEntry/WMStates/EntryFormCfg.cs b/TBF/BenchControl/DataEntry/WMStates/EntryFormCfg.cs index 99aec5436..b1a77fd78 100644 --- a/TBF/BenchControl/DataEntry/WMStates/EntryFormCfg.cs +++ b/TBF/BenchControl/DataEntry/WMStates/EntryFormCfg.cs @@ -14,7 +14,7 @@ namespace TBF.BenchControl.DataEntry.WMStates 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 cmpntEntities) { return new EntryFormCfgCtrl(); } /// Private parameterless constructor invoked by all other (public) constructors EntryFormCfg() diff --git a/TBF/BenchControl/DataEntry/iPerl/EntryFormCfg.cs b/TBF/BenchControl/DataEntry/iPerl/EntryFormCfg.cs index f6f530760..7219cd38b 100644 --- a/TBF/BenchControl/DataEntry/iPerl/EntryFormCfg.cs +++ b/TBF/BenchControl/DataEntry/iPerl/EntryFormCfg.cs @@ -14,7 +14,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 cmpntEntities) { return new EntryFormCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Dummy/FlowMeter/FlowMeterCfg.cs b/TBF/BenchControl/Dummy/FlowMeter/FlowMeterCfg.cs index 9289f0101..1806090f1 100644 --- a/TBF/BenchControl/Dummy/FlowMeter/FlowMeterCfg.cs +++ b/TBF/BenchControl/Dummy/FlowMeter/FlowMeterCfg.cs @@ -14,7 +14,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 cmpntEntities) { return new FlowMeterCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Dummy/RegulValve/RegulValveCfg.cs b/TBF/BenchControl/Dummy/RegulValve/RegulValveCfg.cs index c1c0faed5..a12599eab 100644 --- a/TBF/BenchControl/Dummy/RegulValve/RegulValveCfg.cs +++ b/TBF/BenchControl/Dummy/RegulValve/RegulValveCfg.cs @@ -1,6 +1,7 @@ /// /// Copyright (c) 2017 Sensus Metering Systems /// +using System.Collections.Generic; using TBF.BenchControl.Generic; using System.Xml.Serialization; @@ -11,7 +12,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 cmpntEntities) { return new RegulValveCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Elde/ControlBoardCfg.cs b/TBF/BenchControl/Elde/ControlBoardCfg.cs index 14ce8c71a..a2b0eb03d 100644 --- a/TBF/BenchControl/Elde/ControlBoardCfg.cs +++ b/TBF/BenchControl/Elde/ControlBoardCfg.cs @@ -13,7 +13,7 @@ namespace TBF.BenchControl.Elde 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 cmpntEntities) { return new ControlBoardCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Elde/CoverTest/CoverTestCfg.cs b/TBF/BenchControl/Elde/CoverTest/CoverTestCfg.cs index 41295a532..640092af2 100644 --- a/TBF/BenchControl/Elde/CoverTest/CoverTestCfg.cs +++ b/TBF/BenchControl/Elde/CoverTest/CoverTestCfg.cs @@ -14,7 +14,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 cmpntEntities) { return new CoverTestCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Elde/Diverter/DiverterCfg.cs b/TBF/BenchControl/Elde/Diverter/DiverterCfg.cs index b3362fb65..9ec95505c 100644 --- a/TBF/BenchControl/Elde/Diverter/DiverterCfg.cs +++ b/TBF/BenchControl/Elde/Diverter/DiverterCfg.cs @@ -14,7 +14,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 cmpntEntities) { return new DiverterCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Elde/FixedStartRegisterReader/RegisterReaderCfg.cs b/TBF/BenchControl/Elde/FixedStartRegisterReader/RegisterReaderCfg.cs index c02480ac6..2d545a9f5 100644 --- a/TBF/BenchControl/Elde/FixedStartRegisterReader/RegisterReaderCfg.cs +++ b/TBF/BenchControl/Elde/FixedStartRegisterReader/RegisterReaderCfg.cs @@ -15,7 +15,7 @@ namespace TBF.BenchControl.Elde.FixedStartRegisterReader public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(RegisterReaderCfg) })[0]; public override XmlSerializer GetSerializer() { return Serializer; } - public IComponentCfgCtrl GetControl() { return new RegisterReaderCfgCtrl(); } + public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new RegisterReaderCfgCtrl(); } /// Procedure parameters [XmlIgnore] diff --git a/TBF/BenchControl/Elde/FlowMeter/FlowMeterCfg.cs b/TBF/BenchControl/Elde/FlowMeter/FlowMeterCfg.cs index 2bbd3cbee..7300d981b 100644 --- a/TBF/BenchControl/Elde/FlowMeter/FlowMeterCfg.cs +++ b/TBF/BenchControl/Elde/FlowMeter/FlowMeterCfg.cs @@ -14,7 +14,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 cmpntEntities) { return new FlowMeterCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Elde/FlowMeterDewa/FlowMeterCfg.cs b/TBF/BenchControl/Elde/FlowMeterDewa/FlowMeterCfg.cs index 43b6414de..d98486ae7 100644 --- a/TBF/BenchControl/Elde/FlowMeterDewa/FlowMeterCfg.cs +++ b/TBF/BenchControl/Elde/FlowMeterDewa/FlowMeterCfg.cs @@ -14,7 +14,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 cmpntEntities) { return new FlowMeterCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Elde/FlowMeterTriplet/FlowMeterCfg.cs b/TBF/BenchControl/Elde/FlowMeterTriplet/FlowMeterCfg.cs index 35cb693fd..af2c3c6aa 100644 --- a/TBF/BenchControl/Elde/FlowMeterTriplet/FlowMeterCfg.cs +++ b/TBF/BenchControl/Elde/FlowMeterTriplet/FlowMeterCfg.cs @@ -14,7 +14,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 cmpntEntities) { return new FlowMeterCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Elde/FlowMeterTwins/FlowMeterCfg.cs b/TBF/BenchControl/Elde/FlowMeterTwins/FlowMeterCfg.cs index 7ea42c60f..5b454a4c9 100644 --- a/TBF/BenchControl/Elde/FlowMeterTwins/FlowMeterCfg.cs +++ b/TBF/BenchControl/Elde/FlowMeterTwins/FlowMeterCfg.cs @@ -14,7 +14,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 cmpntEntities) { return new FlowMeterCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Elde/PressureMeter/PressureMeterCfg.cs b/TBF/BenchControl/Elde/PressureMeter/PressureMeterCfg.cs index 32fe549b5..145e8de93 100644 --- a/TBF/BenchControl/Elde/PressureMeter/PressureMeterCfg.cs +++ b/TBF/BenchControl/Elde/PressureMeter/PressureMeterCfg.cs @@ -15,7 +15,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 cmpntEntities) { return new PressureMeterCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Elde/PressureMeterInternal/PressureMeterCfg.cs b/TBF/BenchControl/Elde/PressureMeterInternal/PressureMeterCfg.cs index 5cec45aea..43e956f99 100644 --- a/TBF/BenchControl/Elde/PressureMeterInternal/PressureMeterCfg.cs +++ b/TBF/BenchControl/Elde/PressureMeterInternal/PressureMeterCfg.cs @@ -14,7 +14,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 cmpntEntities) { return new PressureMeterCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Elde/Pump/PumpCfg.cs b/TBF/BenchControl/Elde/Pump/PumpCfg.cs index 9aa64bf74..fb0c5a5da 100644 --- a/TBF/BenchControl/Elde/Pump/PumpCfg.cs +++ b/TBF/BenchControl/Elde/Pump/PumpCfg.cs @@ -13,7 +13,7 @@ namespace TBF.BenchControl.Elde.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 cmpntEntities) { return new PumpCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Elde/PumpTandem/PumpCfg.cs b/TBF/BenchControl/Elde/PumpTandem/PumpCfg.cs index 58cc202bf..4ec08f4a6 100644 --- a/TBF/BenchControl/Elde/PumpTandem/PumpCfg.cs +++ b/TBF/BenchControl/Elde/PumpTandem/PumpCfg.cs @@ -13,7 +13,7 @@ namespace TBF.BenchControl.Elde.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 cmpntEntities) { return new PumpCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Elde/PumpWithFM/PumpCfg.cs b/TBF/BenchControl/Elde/PumpWithFM/PumpCfg.cs index 70c59281c..c431fe30c 100644 --- a/TBF/BenchControl/Elde/PumpWithFM/PumpCfg.cs +++ b/TBF/BenchControl/Elde/PumpWithFM/PumpCfg.cs @@ -13,7 +13,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 cmpntEntities) { return new PumpCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Elde/RegulValve/RegulValveCfg.cs b/TBF/BenchControl/Elde/RegulValve/RegulValveCfg.cs index 0e8835ba2..f69e68c3e 100644 --- a/TBF/BenchControl/Elde/RegulValve/RegulValveCfg.cs +++ b/TBF/BenchControl/Elde/RegulValve/RegulValveCfg.cs @@ -14,7 +14,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 cmpntEntities) { return new RegulValveCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Elde/RegulValveCoax/RegulValveCfg.cs b/TBF/BenchControl/Elde/RegulValveCoax/RegulValveCfg.cs index c28567b0f..401db9585 100644 --- a/TBF/BenchControl/Elde/RegulValveCoax/RegulValveCfg.cs +++ b/TBF/BenchControl/Elde/RegulValveCoax/RegulValveCfg.cs @@ -14,7 +14,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 cmpntEntities) { return new RegulValveCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Elde/RegulValveMilwaukee/RegulValveCfg.cs b/TBF/BenchControl/Elde/RegulValveMilwaukee/RegulValveCfg.cs index 157ffead7..53d938a0b 100644 --- a/TBF/BenchControl/Elde/RegulValveMilwaukee/RegulValveCfg.cs +++ b/TBF/BenchControl/Elde/RegulValveMilwaukee/RegulValveCfg.cs @@ -14,7 +14,7 @@ namespace TBF.BenchControl.Elde.RegulValveMilwaukee 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 cmpntEntities) { return new RegulValveCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Elde/RegulValveTandem/RegulValveTandemCfg.cs b/TBF/BenchControl/Elde/RegulValveTandem/RegulValveTandemCfg.cs index a32043026..cedd86949 100644 --- a/TBF/BenchControl/Elde/RegulValveTandem/RegulValveTandemCfg.cs +++ b/TBF/BenchControl/Elde/RegulValveTandem/RegulValveTandemCfg.cs @@ -14,7 +14,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 cmpntEntities) { return new RegulValveTandemCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Elde/TempMeter/TempMeterCfg.cs b/TBF/BenchControl/Elde/TempMeter/TempMeterCfg.cs index 4471e8bc8..46f6ae090 100644 --- a/TBF/BenchControl/Elde/TempMeter/TempMeterCfg.cs +++ b/TBF/BenchControl/Elde/TempMeter/TempMeterCfg.cs @@ -14,7 +14,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 cmpntEntities) { return new TempMeterCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Elde/TempMeterInternal/TempMeterCfg.cs b/TBF/BenchControl/Elde/TempMeterInternal/TempMeterCfg.cs index 5e3a7d883..6b6979677 100644 --- a/TBF/BenchControl/Elde/TempMeterInternal/TempMeterCfg.cs +++ b/TBF/BenchControl/Elde/TempMeterInternal/TempMeterCfg.cs @@ -14,7 +14,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 cmpntEntities) { return new TempMeterCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Elde/TempMeterMeret/TempMeterCfg.cs b/TBF/BenchControl/Elde/TempMeterMeret/TempMeterCfg.cs index 68d158419..3cc3ce3a0 100644 --- a/TBF/BenchControl/Elde/TempMeterMeret/TempMeterCfg.cs +++ b/TBF/BenchControl/Elde/TempMeterMeret/TempMeterCfg.cs @@ -15,7 +15,7 @@ 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 cmpntEntities) { IList parents = new List(); parents.Add("CB"); diff --git a/TBF/BenchControl/Elde/Valve/ValveCfg.cs b/TBF/BenchControl/Elde/Valve/ValveCfg.cs index a2b443763..9d1e31d8b 100644 --- a/TBF/BenchControl/Elde/Valve/ValveCfg.cs +++ b/TBF/BenchControl/Elde/Valve/ValveCfg.cs @@ -13,7 +13,7 @@ namespace TBF.BenchControl.Elde.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 cmpntEntities) { return new ValveCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Elde/ValveEx/ValveCfg.cs b/TBF/BenchControl/Elde/ValveEx/ValveCfg.cs index a620c1dfb..731727346 100644 --- a/TBF/BenchControl/Elde/ValveEx/ValveCfg.cs +++ b/TBF/BenchControl/Elde/ValveEx/ValveCfg.cs @@ -13,7 +13,7 @@ namespace TBF.BenchControl.Elde.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 cmpntEntities) { return new ValveCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Generic/IComponentCfg.cs b/TBF/BenchControl/Generic/IComponentCfg.cs index 561819279..601bf132a 100644 --- a/TBF/BenchControl/Generic/IComponentCfg.cs +++ b/TBF/BenchControl/Generic/IComponentCfg.cs @@ -58,7 +58,7 @@ namespace TBF.BenchControl.Generic /// /// Object instance factory-like methods /// - IComponentCfgCtrl GetControl(); + IComponentCfgCtrl GetControl(IList cmpntEntities); /// @@ -105,7 +105,6 @@ namespace TBF.BenchControl.Generic void LoadProcedureParamsFromDB(Procedure procedure); void LoadTestParamsFromDB(Test test); - string ToString(int i); } } diff --git a/TBF/BenchControl/Hart/Common/HartCfg.cs b/TBF/BenchControl/Hart/Common/HartCfg.cs index bc2fec652..c55cf752e 100644 --- a/TBF/BenchControl/Hart/Common/HartCfg.cs +++ b/TBF/BenchControl/Hart/Common/HartCfg.cs @@ -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 cmpntEntities) { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); } diff --git a/TBF/BenchControl/Hart/Nivotrack/NivotrackCfg.cs b/TBF/BenchControl/Hart/Nivotrack/NivotrackCfg.cs index b922647df..0e4f919d4 100644 --- a/TBF/BenchControl/Hart/Nivotrack/NivotrackCfg.cs +++ b/TBF/BenchControl/Hart/Nivotrack/NivotrackCfg.cs @@ -20,7 +20,7 @@ namespace TBF.BenchControl.Hart.Nivotrack static readonly int[] Par2Values = new int[] { 7, 8 }; - public IComponentCfgCtrl GetControl() + public IComponentCfgCtrl GetControl(IList cmpntEntities) { IList parents = new List(); parents.Add("Hart"); diff --git a/TBF/BenchControl/Keithley/Multimeter_2010_RS232/MultimeterCfg.cs b/TBF/BenchControl/Keithley/Multimeter_2010_RS232/MultimeterCfg.cs index 85e08fb00..46a74faa3 100644 --- a/TBF/BenchControl/Keithley/Multimeter_2010_RS232/MultimeterCfg.cs +++ b/TBF/BenchControl/Keithley/Multimeter_2010_RS232/MultimeterCfg.cs @@ -2,6 +2,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 +14,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 cmpntEntities) { return new MultimeterCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Keithley/TempMeter/TempMeterCfg.cs b/TBF/BenchControl/Keithley/TempMeter/TempMeterCfg.cs index 7a4789e8b..9a289ddc4 100644 --- a/TBF/BenchControl/Keithley/TempMeter/TempMeterCfg.cs +++ b/TBF/BenchControl/Keithley/TempMeter/TempMeterCfg.cs @@ -14,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 cmpntEntities) { return new TempMeterCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/MettlerToledo/Multi/BalanceCfg.cs b/TBF/BenchControl/MettlerToledo/Multi/BalanceCfg.cs index 86276aa04..d67cea827 100644 --- a/TBF/BenchControl/MettlerToledo/Multi/BalanceCfg.cs +++ b/TBF/BenchControl/MettlerToledo/Multi/BalanceCfg.cs @@ -15,7 +15,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 cmpntEntities) { return new BalanceCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/MettlerToledo/Standard/BalanceCfg.cs b/TBF/BenchControl/MettlerToledo/Standard/BalanceCfg.cs index ebbe46a1b..3f1c18bfb 100644 --- a/TBF/BenchControl/MettlerToledo/Standard/BalanceCfg.cs +++ b/TBF/BenchControl/MettlerToledo/Standard/BalanceCfg.cs @@ -23,7 +23,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 cmpntEntities) { return new BalanceCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Modbus/CometAmbient/AmbientCfg.cs b/TBF/BenchControl/Modbus/CometAmbient/AmbientCfg.cs index f573c6fc7..2a9bbfa64 100644 --- a/TBF/BenchControl/Modbus/CometAmbient/AmbientCfg.cs +++ b/TBF/BenchControl/Modbus/CometAmbient/AmbientCfg.cs @@ -2,6 +2,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 +14,7 @@ namespace TBF.BenchControl.Modbus.CometAmbient 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 cmpntEntities) { return new AmbientCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Modbus/Common/ModbusCfg.cs b/TBF/BenchControl/Modbus/Common/ModbusCfg.cs index 927822964..b35d6ced4 100644 --- a/TBF/BenchControl/Modbus/Common/ModbusCfg.cs +++ b/TBF/BenchControl/Modbus/Common/ModbusCfg.cs @@ -14,7 +14,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 ModbusCfgCtrl(); } + public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new ModbusCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Modbus/Easytherm/EasythermCfg.cs b/TBF/BenchControl/Modbus/Easytherm/EasythermCfg.cs index 19b447911..aa833e0d9 100644 --- a/TBF/BenchControl/Modbus/Easytherm/EasythermCfg.cs +++ b/TBF/BenchControl/Modbus/Easytherm/EasythermCfg.cs @@ -2,6 +2,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 +14,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 cmpntEntities) { return new EasythermCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Modbus/Novus/NovusCfg.cs b/TBF/BenchControl/Modbus/Novus/NovusCfg.cs index 00086230a..d4527cbf2 100644 --- a/TBF/BenchControl/Modbus/Novus/NovusCfg.cs +++ b/TBF/BenchControl/Modbus/Novus/NovusCfg.cs @@ -2,6 +2,7 @@ /// Copyright (c) 2021 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.Modbus.Novus public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(NovusCfg) })[0]; public override XmlSerializer GetSerializer() { return Serializer; } - public IComponentCfgCtrl GetControl() { return new NovusCfgCtrl(); } + public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new NovusCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Modbus/PressureMeter/Meret/PressureMeterCfg.cs b/TBF/BenchControl/Modbus/PressureMeter/Meret/PressureMeterCfg.cs index 009ee3080..3db3d2b9b 100644 --- a/TBF/BenchControl/Modbus/PressureMeter/Meret/PressureMeterCfg.cs +++ b/TBF/BenchControl/Modbus/PressureMeter/Meret/PressureMeterCfg.cs @@ -14,7 +14,7 @@ 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() { return new PressureMeterCfgCtrl(); } + public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new PressureMeterCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Modbus/QuidoRS/QuidoRSCfg.cs b/TBF/BenchControl/Modbus/QuidoRS/QuidoRSCfg.cs index 6cc7e49f8..c1aa2b019 100644 --- a/TBF/BenchControl/Modbus/QuidoRS/QuidoRSCfg.cs +++ b/TBF/BenchControl/Modbus/QuidoRS/QuidoRSCfg.cs @@ -22,7 +22,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 cmpntEntities) { return new QuidoRSCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Modbus/TankSelector/TankSelectorCfg.cs b/TBF/BenchControl/Modbus/TankSelector/TankSelectorCfg.cs index e1fb63cb7..7f27b2bd2 100644 --- a/TBF/BenchControl/Modbus/TankSelector/TankSelectorCfg.cs +++ b/TBF/BenchControl/Modbus/TankSelector/TankSelectorCfg.cs @@ -1,6 +1,7 @@ /// /// Copyright (c) 2017 Sensus Metering Systems /// +using System.Collections.Generic; using System.Xml.Serialization; using TBF.BenchControl.Generic; @@ -11,7 +12,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 cmpntEntities) { return new TankSelectorCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Modbus/UltrasoundLevelMeter/LevelMeterCfg.cs b/TBF/BenchControl/Modbus/UltrasoundLevelMeter/LevelMeterCfg.cs index 75a42fefc..498228679 100644 --- a/TBF/BenchControl/Modbus/UltrasoundLevelMeter/LevelMeterCfg.cs +++ b/TBF/BenchControl/Modbus/UltrasoundLevelMeter/LevelMeterCfg.cs @@ -15,7 +15,7 @@ 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 cmpntEntities) { IList parents = new List(); // TODO: diff --git a/TBF/BenchControl/Modbus/WaterAnalyzer/AnalyzerCfg.cs b/TBF/BenchControl/Modbus/WaterAnalyzer/AnalyzerCfg.cs index b89dbeb4c..c6129810e 100644 --- a/TBF/BenchControl/Modbus/WaterAnalyzer/AnalyzerCfg.cs +++ b/TBF/BenchControl/Modbus/WaterAnalyzer/AnalyzerCfg.cs @@ -15,7 +15,7 @@ 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 cmpntEntities) { IList parents = new List(); // TODO: diff --git a/TBF/BenchControl/Modbus/WaterAnalyzer2/AnalyzerCfg.cs b/TBF/BenchControl/Modbus/WaterAnalyzer2/AnalyzerCfg.cs index a005ff728..66a9be021 100644 --- a/TBF/BenchControl/Modbus/WaterAnalyzer2/AnalyzerCfg.cs +++ b/TBF/BenchControl/Modbus/WaterAnalyzer2/AnalyzerCfg.cs @@ -15,7 +15,7 @@ namespace TBF.BenchControl.Modbus.WaterAnalyzer2 public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(AnalyzerCfg) })[0]; public override XmlSerializer GetSerializer() { return Serializer; } - public IComponentCfgCtrl GetControl() + public IComponentCfgCtrl GetControl(IList cmpntEntities) { IList parents = new List(); // TODO: diff --git a/TBF/BenchControl/Network/Adapter/NetadapterCfg.cs b/TBF/BenchControl/Network/Adapter/NetadapterCfg.cs index 5121f3157..a76172135 100644 --- a/TBF/BenchControl/Network/Adapter/NetadapterCfg.cs +++ b/TBF/BenchControl/Network/Adapter/NetadapterCfg.cs @@ -1,6 +1,7 @@ /// /// Copyright (c) 2017 Sensus Metering Systems /// +using System.Collections.Generic; using System.Xml.Serialization; using TBF.BenchControl.Generic; @@ -11,7 +12,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 cmpntEntities) { return new NetadapterCfgCtrl(); } public string Description; /// Description string of the selected network adapter diff --git a/TBF/BenchControl/Network/Camera/CLP1611/CameraCfg.cs b/TBF/BenchControl/Network/Camera/CLP1611/CameraCfg.cs index 3cb2bace5..700d67380 100644 --- a/TBF/BenchControl/Network/Camera/CLP1611/CameraCfg.cs +++ b/TBF/BenchControl/Network/Camera/CLP1611/CameraCfg.cs @@ -1,6 +1,7 @@ /// /// Copyright (c) 2017 Sensus Metering Systems /// +using System.Collections.Generic; using System.Net; using System.Net.Sockets; using System.Xml.Serialization; @@ -24,7 +25,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 cmpntEntities) { return new CameraCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Network/Camera/Display/DisplayCfg.cs b/TBF/BenchControl/Network/Camera/Display/DisplayCfg.cs index e25e03728..e0481c697 100644 --- a/TBF/BenchControl/Network/Camera/Display/DisplayCfg.cs +++ b/TBF/BenchControl/Network/Camera/Display/DisplayCfg.cs @@ -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 cmpntEntities) { return new DisplayCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Network/Camera/Roi/RoiCfg.cs b/TBF/BenchControl/Network/Camera/Roi/RoiCfg.cs index e9ee03851..9d42448f6 100644 --- a/TBF/BenchControl/Network/Camera/Roi/RoiCfg.cs +++ b/TBF/BenchControl/Network/Camera/Roi/RoiCfg.cs @@ -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 cmpntEntities) { return new RoiCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Network/Camera/RoiForFixedStart/RoiCfg.cs b/TBF/BenchControl/Network/Camera/RoiForFixedStart/RoiCfg.cs index 8ba7caa2b..32f6c70be 100644 --- a/TBF/BenchControl/Network/Camera/RoiForFixedStart/RoiCfg.cs +++ b/TBF/BenchControl/Network/Camera/RoiForFixedStart/RoiCfg.cs @@ -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 cmpntEntities) { return new RoiCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Network/Comet/Ambient/AmbientCfg.cs b/TBF/BenchControl/Network/Comet/Ambient/AmbientCfg.cs index 58e163060..c95634d2b 100644 --- a/TBF/BenchControl/Network/Comet/Ambient/AmbientCfg.cs +++ b/TBF/BenchControl/Network/Comet/Ambient/AmbientCfg.cs @@ -2,6 +2,7 @@ /// Copyright (c) 2018 Sensus Slovensko a.s. /// using System; +using System.Collections.Generic; using System.Net; using System.Xml.Serialization; using TBF.BenchControl.Generic; @@ -13,7 +14,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 cmpntEntities) { return new AmbientCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Output/DB/ProductionTracing/MonitoringCfg.cs b/TBF/BenchControl/Output/DB/ProductionTracing/MonitoringCfg.cs index a6f238d34..fc4628459 100644 --- a/TBF/BenchControl/Output/DB/ProductionTracing/MonitoringCfg.cs +++ b/TBF/BenchControl/Output/DB/ProductionTracing/MonitoringCfg.cs @@ -1,6 +1,7 @@ /// /// Copyright (c) 2018 Sensus Slovensko a.s. /// +using System.Collections.Generic; using System.Xml.Serialization; using TBF.BenchControl.Generic; @@ -14,7 +15,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 cmpntEntities) { return new TracingCfgCtrl(); } public string ConnStr; diff --git a/TBF/BenchControl/Output/DB/SaveDiverterCorrections/SaveDiverterCorrCfg.cs b/TBF/BenchControl/Output/DB/SaveDiverterCorrections/SaveDiverterCorrCfg.cs index fc1c2cce9..22090d4a2 100644 --- a/TBF/BenchControl/Output/DB/SaveDiverterCorrections/SaveDiverterCorrCfg.cs +++ b/TBF/BenchControl/Output/DB/SaveDiverterCorrections/SaveDiverterCorrCfg.cs @@ -1,6 +1,7 @@ /// /// Copyright (c) 2019 Sensus Slovensko a.s. /// +using System.Collections.Generic; using System.Xml.Serialization; using TBF.BenchControl.Generic; @@ -11,7 +12,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 cmpntEntities) { return new SaveDiverterCorrCfgCtrl(); } public string Diverter1; public string Diverter2; diff --git a/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorrCfg.cs b/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorrCfg.cs index 0bc39038e..5aba61d97 100644 --- a/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorrCfg.cs +++ b/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorrCfg.cs @@ -1,6 +1,7 @@ /// /// Copyright (c) 2018 Sensus Slovensko a.s. /// +using System.Collections.Generic; using System.Xml.Serialization; using TBF.BenchControl.Generic; @@ -11,7 +12,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 cmpntEntities) { return new SaveFlowmeterCorrCfgCtrl(); } public string Flowmeter1; public string Flowmeter2; diff --git a/TBF/BenchControl/Output/DB/SensusOracle/DatabaseCfg.cs b/TBF/BenchControl/Output/DB/SensusOracle/DatabaseCfg.cs index f4daca758..6825264fa 100644 --- a/TBF/BenchControl/Output/DB/SensusOracle/DatabaseCfg.cs +++ b/TBF/BenchControl/Output/DB/SensusOracle/DatabaseCfg.cs @@ -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 cmpntEntities) { return new DatabaseCfgCtrl(); } /// Serialized parameters public bool TestMode; diff --git a/TBF/BenchControl/Output/EventTriggers/Iperl/TriggerCfg.cs b/TBF/BenchControl/Output/EventTriggers/Iperl/TriggerCfg.cs index 4554a5367..5f8cd53bc 100644 --- a/TBF/BenchControl/Output/EventTriggers/Iperl/TriggerCfg.cs +++ b/TBF/BenchControl/Output/EventTriggers/Iperl/TriggerCfg.cs @@ -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 cmpntEntities) { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Output/EventTriggers/Standard/TriggerCfg.cs b/TBF/BenchControl/Output/EventTriggers/Standard/TriggerCfg.cs index 7e279e2b5..89a47f9d0 100644 --- a/TBF/BenchControl/Output/EventTriggers/Standard/TriggerCfg.cs +++ b/TBF/BenchControl/Output/EventTriggers/Standard/TriggerCfg.cs @@ -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 cmpntEntities) { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Output/FileWriters/Basic/WriterCfg.cs b/TBF/BenchControl/Output/FileWriters/Basic/WriterCfg.cs index 053b37ee5..a805a32f2 100644 --- a/TBF/BenchControl/Output/FileWriters/Basic/WriterCfg.cs +++ b/TBF/BenchControl/Output/FileWriters/Basic/WriterCfg.cs @@ -1,6 +1,7 @@ /// /// Copyright (c) 2013-2017 Sensus Metering Systems /// +using System.Collections.Generic; using System.Xml.Serialization; using TBF.BenchControl.Generic; @@ -11,7 +12,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 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 diff --git a/TBF/BenchControl/Output/FileWriters/Elde/WriterCfg.cs b/TBF/BenchControl/Output/FileWriters/Elde/WriterCfg.cs index d46ff0745..35172c9e5 100644 --- a/TBF/BenchControl/Output/FileWriters/Elde/WriterCfg.cs +++ b/TBF/BenchControl/Output/FileWriters/Elde/WriterCfg.cs @@ -1,6 +1,7 @@ /// /// Copyright (c) 2019 Sensus Slovensko a.s. /// +using System.Collections.Generic; using System.Xml.Serialization; using TBF.BenchControl.Generic; @@ -11,7 +12,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 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 diff --git a/TBF/BenchControl/Output/FileWriters/Enhanced/WriterCfg.cs b/TBF/BenchControl/Output/FileWriters/Enhanced/WriterCfg.cs index 31dbbe7d6..72d661a03 100644 --- a/TBF/BenchControl/Output/FileWriters/Enhanced/WriterCfg.cs +++ b/TBF/BenchControl/Output/FileWriters/Enhanced/WriterCfg.cs @@ -1,6 +1,7 @@ /// /// Copyright (c) 2016-2017 Sensus Metering Systems /// +using System.Collections.Generic; using System.Xml.Serialization; using TBF.BenchControl.Generic; @@ -11,7 +12,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 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 diff --git a/TBF/BenchControl/Output/FileWriters/ImageArchiver/ArchiverCfg.cs b/TBF/BenchControl/Output/FileWriters/ImageArchiver/ArchiverCfg.cs index c739df05c..dbad7f5f9 100644 --- a/TBF/BenchControl/Output/FileWriters/ImageArchiver/ArchiverCfg.cs +++ b/TBF/BenchControl/Output/FileWriters/ImageArchiver/ArchiverCfg.cs @@ -14,7 +14,7 @@ namespace TBF.BenchControl.Output.FileWriters.ImageArchiver public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(ArchiverCfg) })[0]; public override XmlSerializer GetSerializer() { return Serializer; } - public IComponentCfgCtrl GetControl() { return new ArchiverCfgCtrl(); } + public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new ArchiverCfgCtrl(); } 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 diff --git a/TBF/BenchControl/Output/FileWriters/IperlLogger/WriterCfg.cs b/TBF/BenchControl/Output/FileWriters/IperlLogger/WriterCfg.cs index ee4044191..a85f3c199 100644 --- a/TBF/BenchControl/Output/FileWriters/IperlLogger/WriterCfg.cs +++ b/TBF/BenchControl/Output/FileWriters/IperlLogger/WriterCfg.cs @@ -15,7 +15,7 @@ namespace TBF.BenchControl.Output.FileWriters.IperlLogger public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(WriterCfg) })[0]; public override XmlSerializer GetSerializer() { return Serializer; } - public IComponentCfgCtrl GetControl() { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); } + public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); } public string DestinationPath; /// Directory path into which the logs will be saved public bool YearFolders; diff --git a/TBF/BenchControl/Output/FileWriters/OneFilePerMeter/WriterCfg.cs b/TBF/BenchControl/Output/FileWriters/OneFilePerMeter/WriterCfg.cs index 384af919c..641008712 100644 --- a/TBF/BenchControl/Output/FileWriters/OneFilePerMeter/WriterCfg.cs +++ b/TBF/BenchControl/Output/FileWriters/OneFilePerMeter/WriterCfg.cs @@ -1,6 +1,7 @@ /// /// Copyright (c) 2017 Sensus Metering Systems /// +using System.Collections.Generic; using System.Xml.Serialization; using TBF.BenchControl.Generic; @@ -11,7 +12,7 @@ namespace TBF.BenchControl.Output.FileWriters.OneFilePerMeter 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 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 diff --git a/TBF/BenchControl/Output/FileWriters/Xml/WriterCfg.cs b/TBF/BenchControl/Output/FileWriters/Xml/WriterCfg.cs index ac0c9ed74..cd05fd528 100644 --- a/TBF/BenchControl/Output/FileWriters/Xml/WriterCfg.cs +++ b/TBF/BenchControl/Output/FileWriters/Xml/WriterCfg.cs @@ -15,7 +15,7 @@ namespace TBF.BenchControl.Output.FileWriters.Xml 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 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 diff --git a/TBF/BenchControl/Output/FileWriters/XmlBatch/WriterCfg.cs b/TBF/BenchControl/Output/FileWriters/XmlBatch/WriterCfg.cs index f5fe7351e..42690711d 100644 --- a/TBF/BenchControl/Output/FileWriters/XmlBatch/WriterCfg.cs +++ b/TBF/BenchControl/Output/FileWriters/XmlBatch/WriterCfg.cs @@ -15,7 +15,7 @@ namespace TBF.BenchControl.Output.FileWriters.XmlBatch 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 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 diff --git a/TBF/BenchControl/Output/FlexFlow/Rest/FlexFlowCfg.cs b/TBF/BenchControl/Output/FlexFlow/Rest/FlexFlowCfg.cs index be4472681..0889b83fd 100644 --- a/TBF/BenchControl/Output/FlexFlow/Rest/FlexFlowCfg.cs +++ b/TBF/BenchControl/Output/FlexFlow/Rest/FlexFlowCfg.cs @@ -18,7 +18,7 @@ namespace TBF.BenchControl.Output.FlexFlow.Rest public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(FlexFlowCfg) })[0]; public override XmlSerializer GetSerializer() { return Serializer; } - public IComponentCfgCtrl GetControl() { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); } + public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Output/Printers/Enhanced/PrinterCfg.cs b/TBF/BenchControl/Output/Printers/Enhanced/PrinterCfg.cs index d1dc8cfb8..525d8f404 100644 --- a/TBF/BenchControl/Output/Printers/Enhanced/PrinterCfg.cs +++ b/TBF/BenchControl/Output/Printers/Enhanced/PrinterCfg.cs @@ -1,6 +1,7 @@ /// /// Copyright (c) 2017-2020 Sensus Slovensko a.s. /// +using System.Collections.Generic; using System.Xml.Serialization; using Config.Entities; using TBF.BenchControl.Generic; @@ -12,7 +13,7 @@ namespace TBF.BenchControl.Output.Printers.Enhanced public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(PrinterCfg) })[0]; public override XmlSerializer GetSerializer() { return Serializer; } - public IComponentCfgCtrl GetControl() { return new PrinterCfgCtrl(); } + public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new PrinterCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Output/Printers/Label/PrinterCfg.cs b/TBF/BenchControl/Output/Printers/Label/PrinterCfg.cs index 315378ef8..1b749d5db 100644 --- a/TBF/BenchControl/Output/Printers/Label/PrinterCfg.cs +++ b/TBF/BenchControl/Output/Printers/Label/PrinterCfg.cs @@ -15,7 +15,7 @@ namespace TBF.BenchControl.Output.Printers.Label public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(PrinterCfg) })[0]; public override XmlSerializer GetSerializer() { return Serializer; } - public IComponentCfgCtrl GetControl() { return new PrinterCfgCtrl(); } + public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new PrinterCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Output/Printers/MultiLabel/PrinterCfg.cs b/TBF/BenchControl/Output/Printers/MultiLabel/PrinterCfg.cs index 358492116..21ca924b2 100644 --- a/TBF/BenchControl/Output/Printers/MultiLabel/PrinterCfg.cs +++ b/TBF/BenchControl/Output/Printers/MultiLabel/PrinterCfg.cs @@ -15,7 +15,7 @@ namespace TBF.BenchControl.Output.Printers.MultiLabel public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(PrinterCfg) })[0]; public override XmlSerializer GetSerializer() { return Serializer; } - public IComponentCfgCtrl GetControl() { return new PrinterCfgCtrl(); } + public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new PrinterCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Output/Printers/Munich/PrinterCfg.cs b/TBF/BenchControl/Output/Printers/Munich/PrinterCfg.cs index 66773c477..fa28fdd2e 100644 --- a/TBF/BenchControl/Output/Printers/Munich/PrinterCfg.cs +++ b/TBF/BenchControl/Output/Printers/Munich/PrinterCfg.cs @@ -15,7 +15,7 @@ namespace TBF.BenchControl.Output.Printers.Munich public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(PrinterCfg) })[0]; public override XmlSerializer GetSerializer() { return Serializer; } - public IComponentCfgCtrl GetControl() { return new PrinterCfgCtrl(); } + public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new PrinterCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Output/Printers/OnePerBatch/PrinterCfg.cs b/TBF/BenchControl/Output/Printers/OnePerBatch/PrinterCfg.cs index 139fecbfc..b85a89df9 100644 --- a/TBF/BenchControl/Output/Printers/OnePerBatch/PrinterCfg.cs +++ b/TBF/BenchControl/Output/Printers/OnePerBatch/PrinterCfg.cs @@ -1,6 +1,7 @@ /// /// Copyright (c) 2020 Sensus Slovensko a.s. /// +using System.Collections.Generic; using System.Xml.Serialization; using Config.Entities; using TBF.BenchControl.Generic; @@ -12,7 +13,7 @@ namespace TBF.BenchControl.Output.Printers.OnePerBatch public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(PrinterCfg) })[0]; public override XmlSerializer GetSerializer() { return Serializer; } - public IComponentCfgCtrl GetControl() { return new PrinterCfgCtrl(); } + public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new PrinterCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Output/Printers/OnePerMeter/PrinterCfg.cs b/TBF/BenchControl/Output/Printers/OnePerMeter/PrinterCfg.cs index 018669de2..5c4764207 100644 --- a/TBF/BenchControl/Output/Printers/OnePerMeter/PrinterCfg.cs +++ b/TBF/BenchControl/Output/Printers/OnePerMeter/PrinterCfg.cs @@ -1,6 +1,7 @@ /// /// Copyright (c) 2017-2020 Sensus Slovensko a.s. /// +using System.Collections.Generic; using System.Xml.Serialization; using Config.Entities; using TBF.BenchControl.Generic; @@ -12,7 +13,7 @@ namespace TBF.BenchControl.Output.Printers.OnePerMeter public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(PrinterCfg) })[0]; public override XmlSerializer GetSerializer() { return Serializer; } - public IComponentCfgCtrl GetControl() { return new PrinterCfgCtrl(); } + public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new PrinterCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Output/Printers/Zapiska/PrinterCfg.cs b/TBF/BenchControl/Output/Printers/Zapiska/PrinterCfg.cs index a08798759..762832884 100644 --- a/TBF/BenchControl/Output/Printers/Zapiska/PrinterCfg.cs +++ b/TBF/BenchControl/Output/Printers/Zapiska/PrinterCfg.cs @@ -1,6 +1,7 @@ /// /// Copyright (c) 2017 Sensus Slovensko a.s. /// +using System.Collections.Generic; using System.Xml.Serialization; using Config.Entities; using TBF.BenchControl.Generic; @@ -12,7 +13,7 @@ namespace TBF.BenchControl.Output.Printers.Zapiska public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(PrinterCfg) })[0]; public override XmlSerializer GetSerializer() { return Serializer; } - public IComponentCfgCtrl GetControl() { return new PrinterCfgCtrl(); } + public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new PrinterCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/RegisterReaders/DataStream/MefImport/MefImportCfg.cs b/TBF/BenchControl/RegisterReaders/DataStream/MefImport/MefImportCfg.cs index 5c8e5b82a..adc08d35a 100644 --- a/TBF/BenchControl/RegisterReaders/DataStream/MefImport/MefImportCfg.cs +++ b/TBF/BenchControl/RegisterReaders/DataStream/MefImport/MefImportCfg.cs @@ -17,7 +17,7 @@ namespace TBF.BenchControl.RegisterReaders.DataStream.MefImport public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(MefImportCfg) })[0]; public override XmlSerializer GetSerializer() { return Serializer; } - public IComponentCfgCtrl GetControl() { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); } + public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); } /// /// Serialized parameters diff --git a/TBF/BenchControl/RegisterReaders/DataStream/Reader/ReaderCfg.cs b/TBF/BenchControl/RegisterReaders/DataStream/Reader/ReaderCfg.cs index 53cc89284..3e7f5efc5 100644 --- a/TBF/BenchControl/RegisterReaders/DataStream/Reader/ReaderCfg.cs +++ b/TBF/BenchControl/RegisterReaders/DataStream/Reader/ReaderCfg.cs @@ -17,7 +17,7 @@ namespace TBF.BenchControl.RegisterReaders.DataStream.Reader public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(ReaderCfg) })[0]; public override XmlSerializer GetSerializer() { return Serializer; } - public IComponentCfgCtrl GetControl() + public IComponentCfgCtrl GetControl(IList cmpntEntities) { IList parents = new List(); parents.Add("MefImport"); diff --git a/TBF/BenchControl/RegisterReaders/KPackE/DataEntryForRadio/EntryFormCfg.cs b/TBF/BenchControl/RegisterReaders/KPackE/DataEntryForRadio/EntryFormCfg.cs index 423c42af2..1ef399527 100644 --- a/TBF/BenchControl/RegisterReaders/KPackE/DataEntryForRadio/EntryFormCfg.cs +++ b/TBF/BenchControl/RegisterReaders/KPackE/DataEntryForRadio/EntryFormCfg.cs @@ -14,7 +14,7 @@ namespace TBF.BenchControl.RegisterReaders.KPackE.DataEntryForRadio 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 cmpntEntities) { return new EntryFormCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/RegisterReaders/KPackE/Radio/RadioCfg.cs b/TBF/BenchControl/RegisterReaders/KPackE/Radio/RadioCfg.cs index 3e35ee4dc..0684ed64f 100644 --- a/TBF/BenchControl/RegisterReaders/KPackE/Radio/RadioCfg.cs +++ b/TBF/BenchControl/RegisterReaders/KPackE/Radio/RadioCfg.cs @@ -2,6 +2,7 @@ /// Copyright (c) 2018 Sensus Slovensko a.s. /// using System; +using System.Collections.Generic; using System.IO.Ports; using System.Xml.Serialization; using TBF.BenchControl.Generic; @@ -13,7 +14,7 @@ namespace TBF.BenchControl.RegisterReaders.KPackE.Radio public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(RadioCfg) })[0]; public override XmlSerializer GetSerializer() { return Serializer; } - public IComponentCfgCtrl GetControl() { return new RadioCfgCtrl(); } + public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new RadioCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/RegisterReaders/KPackE/RegisterReader/RegisterReaderCfg.cs b/TBF/BenchControl/RegisterReaders/KPackE/RegisterReader/RegisterReaderCfg.cs index 1e2edceae..4554d5363 100644 --- a/TBF/BenchControl/RegisterReaders/KPackE/RegisterReader/RegisterReaderCfg.cs +++ b/TBF/BenchControl/RegisterReaders/KPackE/RegisterReader/RegisterReaderCfg.cs @@ -15,7 +15,7 @@ namespace TBF.BenchControl.RegisterReaders.KPackE.RegisterReader public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(RegisterReaderCfg) })[0]; public override XmlSerializer GetSerializer() { return Serializer; } - public IComponentCfgCtrl GetControl() { return new RegisterReaderCfgCtrl(); } + public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new RegisterReaderCfgCtrl(); } /// Procedure parameters [XmlIgnore] diff --git a/TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RegisterReaderCfg.cs b/TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RegisterReaderCfg.cs index 809b33331..91ff22aea 100644 --- a/TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RegisterReaderCfg.cs +++ b/TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RegisterReaderCfg.cs @@ -1,6 +1,7 @@ /// /// Copyright (c) 2013-2020 Sensus Slovensko a.s. /// +using System.Collections.Generic; using System.Xml.Serialization; using Config.Entities; using TBF.BenchControl.Generic; @@ -12,7 +13,7 @@ namespace TBF.BenchControl.RegisterReaders.PulsesFromEldeCB public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(RegisterReaderCfg) })[0]; public override XmlSerializer GetSerializer() { return Serializer; } - public IComponentCfgCtrl GetControl() { return new RegisterReaderCfgCtrl(); } + public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new RegisterReaderCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/RegisterReaders/SerialStream/SerialStreamCfg.cs b/TBF/BenchControl/RegisterReaders/SerialStream/SerialStreamCfg.cs index 8b65c8b63..edeb65716 100644 --- a/TBF/BenchControl/RegisterReaders/SerialStream/SerialStreamCfg.cs +++ b/TBF/BenchControl/RegisterReaders/SerialStream/SerialStreamCfg.cs @@ -2,6 +2,7 @@ /// Copyright (c) 2018 Sensus Slovensko a.s. /// using System; +using System.Collections.Generic; using System.IO.Ports; using System.Xml.Serialization; using Config.Entities; @@ -14,7 +15,7 @@ namespace TBF.BenchControl.RegisterReaders.SerialStream public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(SerialStreamCfg) })[0]; public override XmlSerializer GetSerializer() { return Serializer; } - public IComponentCfgCtrl GetControl() { return new SerialStreamCfgCtrl(); } + public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new SerialStreamCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/TestMethods/CombinedWithDetection/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/CombinedWithDetection/TestMethodCfg.cs index c0e66685f..d19858520 100644 --- a/TBF/BenchControl/TestMethods/CombinedWithDetection/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/CombinedWithDetection/TestMethodCfg.cs @@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection 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 cmpntEntities) { return new TestMethodCfgCtrl(); } /// Test parameters [XmlIgnore] diff --git a/TBF/BenchControl/TestMethods/DiverterTest/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/DiverterTest/TestMethodCfg.cs index bf6e5e720..6270e8550 100644 --- a/TBF/BenchControl/TestMethods/DiverterTest/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/DiverterTest/TestMethodCfg.cs @@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.DiverterTest 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 cmpntEntities) { return new TestMethodCfgCtrl(); } /// Test parameters [XmlIgnore] diff --git a/TBF/BenchControl/TestMethods/Endurance/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/Endurance/TestMethodCfg.cs index 3691cb791..6ccdf7b74 100644 --- a/TBF/BenchControl/TestMethods/Endurance/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/Endurance/TestMethodCfg.cs @@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.Endurance 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 cmpntEntities) { return new TestMethodCfgCtrl(); } public string Cycle; diff --git a/TBF/BenchControl/TestMethods/FixedStart/HeatMeters/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FixedStart/HeatMeters/TestMethodCfg.cs index 501822fb4..f847641c6 100644 --- a/TBF/BenchControl/TestMethods/FixedStart/HeatMeters/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/FixedStart/HeatMeters/TestMethodCfg.cs @@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FixedStart.HeatMeters 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 cmpntEntities) { return new TestMethodCfgCtrl(); } /// Test parameters [XmlIgnore] diff --git a/TBF/BenchControl/TestMethods/FixedStartDeferredEval/HeatMeters/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FixedStartDeferredEval/HeatMeters/TestMethodCfg.cs index 7e4fceb45..91b882afe 100644 --- a/TBF/BenchControl/TestMethods/FixedStartDeferredEval/HeatMeters/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/FixedStartDeferredEval/HeatMeters/TestMethodCfg.cs @@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEval.HeatMeters 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 cmpntEntities) { return new TestMethodCfgCtrl(); } /// Test parameters [XmlIgnore] diff --git a/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/HeatMeters/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/HeatMeters/TestMethodCfg.cs index 657a22457..280a7159e 100644 --- a/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/HeatMeters/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/FixedStartMassCollDeferredEval/HeatMeters/TestMethodCfg.cs @@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollDeferredEval.HeatMeters 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 cmpntEntities) { return new TestMethodCfgCtrl(); } /// Test parameters [XmlIgnore] diff --git a/TBF/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfg.cs index a6c7b5038..385ff1604 100644 --- a/TBF/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestMethodCfg.cs @@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection.HeatMeters 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 cmpntEntities) { return new TestMethodCfgCtrl(); } /// Test parameters [XmlIgnore] diff --git a/TBF/BenchControl/TestMethods/FixedStartTankCollection/Compound/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FixedStartTankCollection/Compound/TestMethodCfg.cs index 1a068e16c..43dbaa2dd 100644 --- a/TBF/BenchControl/TestMethods/FixedStartTankCollection/Compound/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/FixedStartTankCollection/Compound/TestMethodCfg.cs @@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection.Compound 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 cmpntEntities) { return new TestMethodCfgCtrl(); } /// Test parameters [XmlIgnore] diff --git a/TBF/BenchControl/TestMethods/FixedStartTankCollection/Single/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FixedStartTankCollection/Single/TestMethodCfg.cs index b604d7366..f7757c04c 100644 --- a/TBF/BenchControl/TestMethods/FixedStartTankCollection/Single/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/FixedStartTankCollection/Single/TestMethodCfg.cs @@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartTankCollection.Single 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 cmpntEntities) { return new TestMethodCfgCtrl(); } /// Test parameters [XmlIgnore] diff --git a/TBF/BenchControl/TestMethods/FlyingStart/Compound/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FlyingStart/Compound/TestMethodCfg.cs index f7a18b7a0..a0e36b805 100644 --- a/TBF/BenchControl/TestMethods/FlyingStart/Compound/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/FlyingStart/Compound/TestMethodCfg.cs @@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart.Compound 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 cmpntEntities) { return new TestMethodCfgCtrl(); } /// Test parameters [XmlIgnore] diff --git a/TBF/BenchControl/TestMethods/FlyingStart/HeatMeters/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FlyingStart/HeatMeters/TestMethodCfg.cs index c59aa22bf..4df9a7326 100644 --- a/TBF/BenchControl/TestMethods/FlyingStart/HeatMeters/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/FlyingStart/HeatMeters/TestMethodCfg.cs @@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart.HeatMeters 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 cmpntEntities) { return new TestMethodCfgCtrl(); } /// Test parameters [XmlIgnore] diff --git a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/TestMethodCfg.cs index 3741df37b..14f26f25e 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Compound/TestMethodCfg.cs @@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl.Compoun 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 cmpntEntities) { return new TestMethodCfgCtrl(); } /// Test parameters [XmlIgnore] diff --git a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/TestMethodCfg.cs index c71519f4a..8a5cc8810 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/HeatMeters/TestMethodCfg.cs @@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl.HeatMet 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 cmpntEntities) { return new TestMethodCfgCtrl(); } /// Test parameters [XmlIgnore] diff --git a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/TestMethodCfg.cs index 4233a8560..3b5c8a1b1 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/Single/TestMethodCfg.cs @@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl.Single 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 cmpntEntities) { return new TestMethodCfgCtrl(); } /// Test parameters [XmlIgnore] diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/Compound/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/Compound/TestMethodCfg.cs index ea3bb889c..0f592eb90 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/Compound/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/Compound/TestMethodCfg.cs @@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative.Compound 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 cmpntEntities) { return new TestMethodCfgCtrl(); } /// Test parameters [XmlIgnore] diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/HeatMeters/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/HeatMeters/TestMethodCfg.cs index a168b339a..f98ab1002 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/HeatMeters/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/HeatMeters/TestMethodCfg.cs @@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative.HeatMeters 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 cmpntEntities) { return new TestMethodCfgCtrl(); } /// Test parameters [XmlIgnore] diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/Single/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/Single/TestMethodCfg.cs index 34ba15604..3b8aa49b0 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/Single/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollComparative/Single/TestMethodCfg.cs @@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollComparative.Single 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 cmpntEntities) { return new TestMethodCfgCtrl(); } /// Test parameters [XmlIgnore] diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/TestMethodCfg.cs index 23e77dd2f..4cab6ec69 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Compound/TestMethodCfg.cs @@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged.Compound 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 cmpntEntities) { return new TestMethodCfgCtrl(); } /// Test parameters [XmlIgnore] diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/TestMethodCfg.cs index 0af2f0762..269fe95f1 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/HeatMeters/TestMethodCfg.cs @@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged.HeatMeters 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 cmpntEntities) { return new TestMethodCfgCtrl(); } /// Test parameters [XmlIgnore] diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/TestMethodCfg.cs index f42ece1f0..e97ba0561 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/Single/TestMethodCfg.cs @@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged.Single 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 cmpntEntities) { return new TestMethodCfgCtrl(); } /// Test parameters [XmlIgnore] diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollection/Compound/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/Compound/TestMethodCfg.cs index 249a604cf..9839d4d16 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartMassCollection/Compound/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/Compound/TestMethodCfg.cs @@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection.Compound 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 cmpntEntities) { return new TestMethodCfgCtrl(); } /// Test parameters [XmlIgnore] diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestMethodCfg.cs index ecf86a50b..0e6dabe32 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestMethodCfg.cs @@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection.HeatMeters 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 cmpntEntities) { return new TestMethodCfgCtrl(); } /// Test parameters [XmlIgnore] diff --git a/TBF/BenchControl/TestMethods/FlyingStartTankCollection/Compound/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FlyingStartTankCollection/Compound/TestMethodCfg.cs index 3c1b6a5cc..52dec49ec 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartTankCollection/Compound/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartTankCollection/Compound/TestMethodCfg.cs @@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartTankCollection.Compound 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 cmpntEntities) { return new TestMethodCfgCtrl(); } /// Test parameters [XmlIgnore] diff --git a/TBF/BenchControl/TestMethods/FlyingStartTankCollection/Single/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/FlyingStartTankCollection/Single/TestMethodCfg.cs index 1c856fb82..fdaf7922e 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartTankCollection/Single/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartTankCollection/Single/TestMethodCfg.cs @@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartTankCollection.Single 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 cmpntEntities) { return new TestMethodCfgCtrl(); } /// Test parameters [XmlIgnore] diff --git a/TBF/BenchControl/TestMethods/GrabImage/GrabImageCfg.cs b/TBF/BenchControl/TestMethods/GrabImage/GrabImageCfg.cs index f7f29b752..cbe45dcec 100644 --- a/TBF/BenchControl/TestMethods/GrabImage/GrabImageCfg.cs +++ b/TBF/BenchControl/TestMethods/GrabImage/GrabImageCfg.cs @@ -16,7 +16,7 @@ namespace TBF.BenchControl.TestMethods.GrabImage public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(GrabImageCfg) })[0]; public override XmlSerializer GetSerializer() { return Serializer; } - public IComponentCfgCtrl GetControl() { return new GrabImageCfgCtrl(); } + public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new GrabImageCfgCtrl(); } public string ImageFileName; diff --git a/TBF/BenchControl/TestMethods/LeakTest/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/LeakTest/TestMethodCfg.cs index 980f96a13..94a628bc7 100644 --- a/TBF/BenchControl/TestMethods/LeakTest/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/LeakTest/TestMethodCfg.cs @@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.LeakTest 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 cmpntEntities) { return new TestMethodCfgCtrl(); } /// Test parameters [XmlIgnore] diff --git a/TBF/BenchControl/TestMethods/LiveStream/LiveStreamCfg.cs b/TBF/BenchControl/TestMethods/LiveStream/LiveStreamCfg.cs index e7f1900ff..92d27ecd6 100644 --- a/TBF/BenchControl/TestMethods/LiveStream/LiveStreamCfg.cs +++ b/TBF/BenchControl/TestMethods/LiveStream/LiveStreamCfg.cs @@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.LiveStream public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(LiveStreamCfg) })[0]; public override XmlSerializer GetSerializer() { return Serializer; } - public IComponentCfgCtrl GetControl() { return new CfgCtrl(); } + public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new CfgCtrl(); } public bool HiResolution; diff --git a/TBF/BenchControl/TestMethods/ManualEntry/ManualEntryCfg.cs b/TBF/BenchControl/TestMethods/ManualEntry/ManualEntryCfg.cs index 34ede1b41..1cb67ba8d 100644 --- a/TBF/BenchControl/TestMethods/ManualEntry/ManualEntryCfg.cs +++ b/TBF/BenchControl/TestMethods/ManualEntry/ManualEntryCfg.cs @@ -2,6 +2,7 @@ /// Copyright (c) 2019 Sensus Slovensko a.s. /// using System; +using System.Collections.Generic; using System.Xml.Serialization; using TBF.BenchControl.Generic; using TBF.BenchControl.Output; @@ -14,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.ManualEntry public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(ManualEntryCfg) })[0]; public override XmlSerializer GetSerializer() { return Serializer; } - public IComponentCfgCtrl GetControl() { return new ManualEntryCfgCtrl(); } + public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new ManualEntryCfgCtrl(); } public Culture Culture; public string Prompt; diff --git a/TBF/BenchControl/TestMethods/PMaxTest/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/PMaxTest/TestMethodCfg.cs index f27e407d5..d46288ad1 100644 --- a/TBF/BenchControl/TestMethods/PMaxTest/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/PMaxTest/TestMethodCfg.cs @@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.PMaxTest 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 cmpntEntities) { return new TestMethodCfgCtrl(); } /// Test parameters [XmlIgnore] diff --git a/TBF/BenchControl/TestMethods/PulsesTest/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/PulsesTest/TestMethodCfg.cs index 24648db38..35ad2dbd7 100644 --- a/TBF/BenchControl/TestMethods/PulsesTest/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/PulsesTest/TestMethodCfg.cs @@ -16,7 +16,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTest 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 cmpntEntities) { return new TestMethodCfgCtrl(); } /// Test parameters [XmlIgnore] diff --git a/TBF/BenchControl/TestMethods/Q2CorrectionFromHistory/FromHistoryCfg.cs b/TBF/BenchControl/TestMethods/Q2CorrectionFromHistory/FromHistoryCfg.cs index 1776ccd39..305928dc5 100644 --- a/TBF/BenchControl/TestMethods/Q2CorrectionFromHistory/FromHistoryCfg.cs +++ b/TBF/BenchControl/TestMethods/Q2CorrectionFromHistory/FromHistoryCfg.cs @@ -2,6 +2,7 @@ /// Copyright (c) 2019 Sensus Slovensko a.s. /// using System; +using System.Collections.Generic; using System.Xml.Serialization; using TBF.BenchControl.Generic; @@ -12,7 +13,7 @@ namespace TBF.BenchControl.TestMethods.Q2CorrectionFromHistory public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(FromHistoryCfg) })[0]; public override XmlSerializer GetSerializer() { return Serializer; } - public IComponentCfgCtrl GetControl() { return new FromHistoryCfgCtrl(); } + public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new FromHistoryCfgCtrl(); } public bool UseWebService; diff --git a/TBF/BenchControl/TestMethods/RoiDetection/RoiDetectionCfg.cs b/TBF/BenchControl/TestMethods/RoiDetection/RoiDetectionCfg.cs index 43cca89a9..e6e3ae511 100644 --- a/TBF/BenchControl/TestMethods/RoiDetection/RoiDetectionCfg.cs +++ b/TBF/BenchControl/TestMethods/RoiDetection/RoiDetectionCfg.cs @@ -14,7 +14,7 @@ namespace TBF.BenchControl.TestMethods.RoiDetection public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(RoiDetectionCfg) })[0]; public override XmlSerializer GetSerializer() { return Serializer; } - public IComponentCfgCtrl GetControl() { return new RoiDetectionCfgCtrl(); } + public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new RoiDetectionCfgCtrl(); } /// Private parameterless constructor invoked by all other (public) constructors RoiDetectionCfg() diff --git a/TBF/BenchControl/TestMethods/SensitivityTest/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/SensitivityTest/TestMethodCfg.cs index eb8536b2e..8fc6dd0c1 100644 --- a/TBF/BenchControl/TestMethods/SensitivityTest/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/SensitivityTest/TestMethodCfg.cs @@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.SensitivityTest 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 cmpntEntities) { return new TestMethodCfgCtrl(); } /// Test parameters [XmlIgnore] diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/TestMethodCfg.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/TestMethodCfg.cs index 811bd6af6..35df60b8f 100644 --- a/TBF/BenchControl/TestMethods/iPerlCommunication/TestMethodCfg.cs +++ b/TBF/BenchControl/TestMethods/iPerlCommunication/TestMethodCfg.cs @@ -15,7 +15,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication 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 cmpntEntities) { return new TestMethodCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHeadCfg.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHeadCfg.cs index 2fd8a532f..3a16ff96f 100644 --- a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHeadCfg.cs +++ b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlHead/IperlHeadCfg.cs @@ -18,7 +18,7 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication.iPerlHead public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(IperlHeadCfg) })[0]; public override XmlSerializer GetSerializer() { return Serializer; } - public IComponentCfgCtrl GetControl() { return new IperlHeadCfgCtrl(); } + public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new IperlHeadCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Various/ErrorFlags/ErrorsCfg.cs b/TBF/BenchControl/Various/ErrorFlags/ErrorsCfg.cs index bf6926224..63858a28c 100644 --- a/TBF/BenchControl/Various/ErrorFlags/ErrorsCfg.cs +++ b/TBF/BenchControl/Various/ErrorFlags/ErrorsCfg.cs @@ -14,7 +14,7 @@ namespace TBF.BenchControl.Various.ErrorFlags public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(ErrorsCfg) })[0]; public override XmlSerializer GetSerializer() { return Serializer; } - public IComponentCfgCtrl GetControl() { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); } + public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Various/StatisticsMonitoring/StatisticsCfg.cs b/TBF/BenchControl/Various/StatisticsMonitoring/StatisticsCfg.cs index a372b1333..5a23b013c 100644 --- a/TBF/BenchControl/Various/StatisticsMonitoring/StatisticsCfg.cs +++ b/TBF/BenchControl/Various/StatisticsMonitoring/StatisticsCfg.cs @@ -18,7 +18,7 @@ namespace TBF.BenchControl.Various.StatisticsMonitoring public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(StatisticsCfg) })[0]; public override XmlSerializer GetSerializer() { return Serializer; } - public IComponentCfgCtrl GetControl() { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); } + public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new Configs.ParamsProvider.ComponentCfgCtrl(this, null); } /// /// Serialized parameters diff --git a/TBF/BenchControl/Various/TankWithLevelMsrmnt/TankCfg.cs b/TBF/BenchControl/Various/TankWithLevelMsrmnt/TankCfg.cs index 474eb57a1..6a0a0351b 100644 --- a/TBF/BenchControl/Various/TankWithLevelMsrmnt/TankCfg.cs +++ b/TBF/BenchControl/Various/TankWithLevelMsrmnt/TankCfg.cs @@ -2,6 +2,7 @@ /// Copyright (c) 2018 Sensus Slovensko a.s. /// using System; +using System.Collections.Generic; using System.Xml.Serialization; using TBF.BenchControl.Generic; @@ -12,7 +13,7 @@ namespace TBF.BenchControl.Various.TankWithLevelMsrmnt public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(TankCfg) })[0]; public override XmlSerializer GetSerializer() { return Serializer; } - public IComponentCfgCtrl GetControl() { return new TankCfgCtrl(); } + public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new TankCfgCtrl(); } /// /// Serialized parameters diff --git a/TBF/BenchControl/WaterMeters/Munich/WaterMeterCfg.cs b/TBF/BenchControl/WaterMeters/Munich/WaterMeterCfg.cs index 21c064656..f603ba6fe 100644 --- a/TBF/BenchControl/WaterMeters/Munich/WaterMeterCfg.cs +++ b/TBF/BenchControl/WaterMeters/Munich/WaterMeterCfg.cs @@ -16,7 +16,7 @@ namespace TBF.BenchControl.WaterMeters.Munich public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(WaterMeterCfg) })[0]; public override XmlSerializer GetSerializer() { return Serializer; } - public IComponentCfgCtrl GetControl() { return new WaterMeterCfgCtrl(); } + public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new WaterMeterCfgCtrl(); } /// Procedure parameters [XmlIgnore] diff --git a/TBF/BenchControl/WaterMeters/WaterMeter/WaterMeterCfg.cs b/TBF/BenchControl/WaterMeters/WaterMeter/WaterMeterCfg.cs index 51de5ddbc..89d476072 100644 --- a/TBF/BenchControl/WaterMeters/WaterMeter/WaterMeterCfg.cs +++ b/TBF/BenchControl/WaterMeters/WaterMeter/WaterMeterCfg.cs @@ -2,6 +2,7 @@ /// Copyright (c) 2013-2016 Sensus Metering Systems /// using System; +using System.Collections.Generic; using System.Xml.Serialization; using Config.Entities; using TBF.BenchControl.Generic; @@ -13,7 +14,7 @@ namespace TBF.BenchControl.WaterMeters.WaterMeter public static XmlSerializer Serializer = XmlSerializer.FromTypes(new[] { typeof(WaterMeterCfg) })[0]; public override XmlSerializer GetSerializer() { return Serializer; } - public IComponentCfgCtrl GetControl() { return new WaterMeterCfgCtrl(); } + public IComponentCfgCtrl GetControl(IList cmpntEntities) { return new WaterMeterCfgCtrl(); } /// Procedure parameters [XmlIgnore] diff --git a/TBF/UI/Bench/Components/ComponentsManagerDlg.cs b/TBF/UI/Bench/Components/ComponentsManagerDlg.cs index 6f27ce4e1..b87f2ff42 100644 --- a/TBF/UI/Bench/Components/ComponentsManagerDlg.cs +++ b/TBF/UI/Bench/Components/ComponentsManagerDlg.cs @@ -1,6 +1,5 @@ /// -/// Copyright (c) 2013-2017 Sensus Metering Systems -/// Author: Milan Hanajík +/// Copyright (c) 2013-2021 Sensus Slovensko a.s. /// using System; using System.Collections.Generic; @@ -414,12 +413,15 @@ namespace TBF.UI.Bench.Components IComponentCfg cfg = factory.DefaultConfig(); if (selectComponentTypeDlg.SelectedScriptName == null) { - IComponentCfgCtrl cfgControl = cfg.GetControl(); + /// + /// Create a single component of the selected type + /// + IComponentCfgCtrl cfgControl = cfg.GetControl(cmpntEntities); cfgControl.Config = cfg; cfgControl.Config.ItemNr = (cmpntEntities.Count > 0) ? (cmpntEntities[cmpntEntities.Count - 1].ItemNr + 1) : 1; ComponentParametersDlg cfgForm = new ComponentParametersDlg(); - cfgForm.CmpntEntities = cmpntEntities; + cfgForm.CmpntEntities = cmpntEntities; cfgForm.ComponentCfgCtrl = cfgControl; cfgForm.UnlockAfterStart = true; dialogRslt = cfgForm.ShowDialog(); @@ -430,7 +432,10 @@ namespace TBF.UI.Bench.Components } else { - using (TextReader reader = new StreamReader(selectComponentTypeDlg.SelectedScriptName)) + /// + /// Create more components, read their names and other properties from a file + /// + using (TextReader reader = new StreamReader(selectComponentTypeDlg.SelectedScriptName)) { int zeroBasedIdx = 0; string line = reader.ReadLine(); @@ -490,13 +495,15 @@ namespace TBF.UI.Bench.Components { if (listViewEx.SelectedIndices.Count != 1) return; ListViewItem lvi = listViewEx.SelectedItems[0]; + Component component = lvi.Tag as Component; + if (component == null) return; - IComponentCfg cfg = TbfComponents.CmpntCfgFromCmpntEntity((Component)lvi.Tag); + IComponentCfg cfg = TbfComponents.CmpntCfgFromCmpntEntity(component); if (cfg != null) { - ComponentParametersDlg cfgForm = new ComponentParametersDlg(); - cfgForm.CmpntEntities = cmpntEntities; - cfgForm.ComponentCfgCtrl = cfg.GetControl(); + ComponentParametersDlg cfgForm = new ComponentParametersDlg(component.Id); + cfgForm.CmpntEntities = cmpntEntities; + cfgForm.ComponentCfgCtrl = cfg.GetControl(cmpntEntities); cfgForm.ComponentCfgCtrl.Config = cfg; DialogResult dr = cfgForm.ShowDialog(); if (dr != DialogResult.OK) return; @@ -532,7 +539,7 @@ namespace TBF.UI.Bench.Components cfg.Name += Strings.New_name_copy; if (selectComponentTypeDlg.SelectedScriptName == null) { - IComponentCfgCtrl cfgControl = cfg.GetControl(); + IComponentCfgCtrl cfgControl = cfg.GetControl(cmpntEntities); cfgControl.Config = cfg; cfgControl.Config.ItemNr = (cmpntEntities.Count > 0) ? (cmpntEntities[cmpntEntities.Count - 1].ItemNr + 1) : 1; @@ -576,7 +583,7 @@ namespace TBF.UI.Bench.Components IComponentCfg cfg = TbfComponents.CmpntCfgFromCmpntEntity(newComponent); if (cfg != null) { - IComponentCfgCtrl cfgControl = cfg.GetControl(); + IComponentCfgCtrl cfgControl = cfg.GetControl(cmpntEntities); cfgControl.Config = cfg; cfgControl.Config.Name = cfgControl.Config.Name + " imported"; cfgControl.Config.ItemNr = (cmpntEntities.Count > 0) ? (cmpntEntities[cmpntEntities.Count - 1].ItemNr + 1) : 1;