diff --git a/DeviceTest/DeviceTestDlg.cs b/DeviceTest/DeviceTestDlg.cs index 423678ba9..8f763830b 100644 --- a/DeviceTest/DeviceTestDlg.cs +++ b/DeviceTest/DeviceTestDlg.cs @@ -7,6 +7,7 @@ using System.Threading; using System.Windows.Forms; using TBF.BenchControl; using TBF.BenchControl.Generic; +using TBF.UI.Bench.Components; using System.Xml.Serialization; @@ -383,7 +384,7 @@ namespace DeviceTest /// true when factory changed bool FactoryFromClassName(string className, ref IComponentFactory factory) { - foreach (var fac in TbfComponents.Factories) + foreach (var fac in TbfComponents.Factories) { if (className == fac.ClassName) { @@ -426,7 +427,7 @@ namespace DeviceTest cfgControl.Config.ItemNr = 0; ComponentParametersDlg cfgForm = new ComponentParametersDlg(); - cfgForm.TbfComponents = new List(); + cfgForm.CmpntEntities = new List(); cfgForm.ComponentCfgCtrl = cfgControl; cfgForm.UnlockAfterStart = true; @@ -458,7 +459,7 @@ namespace DeviceTest /// IList compEntities = new List(); if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity()); - cfgForm.TbfComponents = compEntities; + cfgForm.CmpntEntities = compEntities; cfgForm.ComponentCfgCtrl = cfgControl; cfgForm.UnlockAfterStart = true; @@ -493,7 +494,7 @@ namespace DeviceTest IList compEntities = new List(); if (parentFactory != null && parentCfg != null) compEntities.Add(parentCfg.CreateDbEntity()); if (component1Factory != null && component1Cfg != null) compEntities.Add(component1Cfg.CreateDbEntity()); - cfgForm.TbfComponents = compEntities; + cfgForm.CmpntEntities = compEntities; cfgForm.ComponentCfgCtrl = cfgControl; cfgForm.UnlockAfterStart = true; @@ -529,7 +530,7 @@ namespace DeviceTest 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.TbfComponents = compEntities; + cfgForm.CmpntEntities = compEntities; cfgForm.ComponentCfgCtrl = cfgControl; cfgForm.UnlockAfterStart = true; diff --git a/ResultsBrowser/Forms/PrinterConfigDlg.cs b/ResultsBrowser/Forms/PrinterConfigDlg.cs index d0a82487d..e52819a6b 100644 --- a/ResultsBrowser/Forms/PrinterConfigDlg.cs +++ b/ResultsBrowser/Forms/PrinterConfigDlg.cs @@ -91,8 +91,8 @@ namespace ResultsBrowser.Forms cfgControl.Config = printerCfg; cfgControl.Config.ItemNr = 0; - TBF.BenchControl.ComponentParametersDlg cfgForm = new TBF.BenchControl.ComponentParametersDlg(); - cfgForm.TbfComponents = new List(); + TBF.UI.Bench.Components.ComponentParametersDlg cfgForm = new TBF.UI.Bench.Components.ComponentParametersDlg(); + cfgForm.CmpntEntities = new List(); cfgForm.ComponentCfgCtrl = cfgControl; cfgForm.UnlockAfterStart = true; diff --git a/TBF/BenchControl/DataEntry/S620/EntryFormCfgCtrl.cs b/TBF/BenchControl/DataEntry/S620/EntryFormCfgCtrl.cs index b21b98eda..2cc13837c 100644 --- a/TBF/BenchControl/DataEntry/S620/EntryFormCfgCtrl.cs +++ b/TBF/BenchControl/DataEntry/S620/EntryFormCfgCtrl.cs @@ -6,6 +6,7 @@ using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Generic; using TBF.Resources; +using TBF.UI.Bench.Components; namespace TBF.BenchControl.DataEntry.S620 { @@ -38,9 +39,9 @@ namespace TBF.BenchControl.DataEntry.S620 parent = ParentForm as ComponentParametersDlg; if (parent == null) return; - if (parent.TbfComponents != null) + if (parent.CmpntEntities != null) { - foreach (var cmpnt in parent.TbfComponents) + foreach (var cmpnt in parent.CmpntEntities) { if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Output.DB.ProductionTracing.Factory) { diff --git a/TBF/BenchControl/Dummy/FlowMeter/FlowMeterCfgCtrl.cs b/TBF/BenchControl/Dummy/FlowMeter/FlowMeterCfgCtrl.cs index 8fdd37dd1..20b891a31 100644 --- a/TBF/BenchControl/Dummy/FlowMeter/FlowMeterCfgCtrl.cs +++ b/TBF/BenchControl/Dummy/FlowMeter/FlowMeterCfgCtrl.cs @@ -5,7 +5,7 @@ using System; using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Generic; - +using TBF.UI.Bench.Components; namespace TBF.BenchControl.Dummy.FlowMeter { diff --git a/TBF/BenchControl/Dummy/RegulValve/RegulValveCfgCtrl.cs b/TBF/BenchControl/Dummy/RegulValve/RegulValveCfgCtrl.cs index f6dc707b9..16ee50f28 100644 --- a/TBF/BenchControl/Dummy/RegulValve/RegulValveCfgCtrl.cs +++ b/TBF/BenchControl/Dummy/RegulValve/RegulValveCfgCtrl.cs @@ -5,6 +5,7 @@ using System; using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Generic; +using TBF.UI.Bench.Components; namespace TBF.BenchControl.Dummy.RegulValve { diff --git a/TBF/BenchControl/Elde/CoverTest/CoverTestCfgCtrl.cs b/TBF/BenchControl/Elde/CoverTest/CoverTestCfgCtrl.cs index 37ad93a0b..2e5b32c1b 100644 --- a/TBF/BenchControl/Elde/CoverTest/CoverTestCfgCtrl.cs +++ b/TBF/BenchControl/Elde/CoverTest/CoverTestCfgCtrl.cs @@ -5,6 +5,7 @@ using System; using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Generic; +using TBF.UI.Bench.Components; namespace TBF.BenchControl.Elde.CoverTest { @@ -35,9 +36,9 @@ namespace TBF.BenchControl.Elde.CoverTest parent = ParentForm as ComponentParametersDlg; if (parent == null) return; - if (parent.TbfComponents != null) + if (parent.CmpntEntities != null) { - foreach (var cmpnt in parent.TbfComponents) + foreach (var cmpnt in parent.CmpntEntities) { if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Elde.ControlBoardFactory) { diff --git a/TBF/BenchControl/Elde/Diverter/DiverterCfgCtrl.cs b/TBF/BenchControl/Elde/Diverter/DiverterCfgCtrl.cs index 7044ac78a..a21238983 100644 --- a/TBF/BenchControl/Elde/Diverter/DiverterCfgCtrl.cs +++ b/TBF/BenchControl/Elde/Diverter/DiverterCfgCtrl.cs @@ -6,6 +6,7 @@ using System.Windows.Forms; using log4net; using Config.Entities; using TBF.BenchControl.Generic; +using TBF.UI.Bench.Components; namespace TBF.BenchControl.Elde.Diverter { @@ -38,9 +39,9 @@ namespace TBF.BenchControl.Elde.Diverter parent = ParentForm as ComponentParametersDlg; if (parent == null) return; - if (parent.TbfComponents != null) + if (parent.CmpntEntities != null) { - foreach (var cmpnt in parent.TbfComponents) + foreach (var cmpnt in parent.CmpntEntities) { if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Elde.ControlBoardFactory) { diff --git a/TBF/BenchControl/Elde/FixedStartRegisterReader/RegisterReaderCfgCtrl.cs b/TBF/BenchControl/Elde/FixedStartRegisterReader/RegisterReaderCfgCtrl.cs index d1160c691..aaa2f0534 100644 --- a/TBF/BenchControl/Elde/FixedStartRegisterReader/RegisterReaderCfgCtrl.cs +++ b/TBF/BenchControl/Elde/FixedStartRegisterReader/RegisterReaderCfgCtrl.cs @@ -5,6 +5,7 @@ using System; using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Generic; +using TBF.UI.Bench.Components; namespace TBF.BenchControl.Elde.FixedStartRegisterReader { @@ -35,9 +36,9 @@ namespace TBF.BenchControl.Elde.FixedStartRegisterReader parent = ParentForm as ComponentParametersDlg; if (parent == null) return; - if (parent.TbfComponents != null) + if (parent.CmpntEntities != null) { - foreach (var cmpnt in parent.TbfComponents) + foreach (var cmpnt in parent.CmpntEntities) { if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Elde.ControlBoardFactory) { diff --git a/TBF/BenchControl/Elde/FlowMeter/FlowMeterCfgCtrl.cs b/TBF/BenchControl/Elde/FlowMeter/FlowMeterCfgCtrl.cs index e0fede5fd..9887359a6 100644 --- a/TBF/BenchControl/Elde/FlowMeter/FlowMeterCfgCtrl.cs +++ b/TBF/BenchControl/Elde/FlowMeter/FlowMeterCfgCtrl.cs @@ -5,6 +5,7 @@ using System; using Config.Entities; using TBF.BenchControl.Configs; using TBF.BenchControl.Generic; +using TBF.UI.Bench.Components; namespace TBF.BenchControl.Elde.FlowMeter { @@ -36,9 +37,9 @@ namespace TBF.BenchControl.Elde.FlowMeter parent = ParentForm as ComponentParametersDlg; if (parent == null) return; - if (parent.TbfComponents != null) + if (parent.CmpntEntities != null) { - foreach (var cmpnt in parent.TbfComponents) + foreach (var cmpnt in parent.CmpntEntities) { if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Elde.ControlBoardFactory) { diff --git a/TBF/BenchControl/Elde/FlowMeterDewa/FlowMeterCfgCtrl.cs b/TBF/BenchControl/Elde/FlowMeterDewa/FlowMeterCfgCtrl.cs index 0801c325f..debfcfd53 100644 --- a/TBF/BenchControl/Elde/FlowMeterDewa/FlowMeterCfgCtrl.cs +++ b/TBF/BenchControl/Elde/FlowMeterDewa/FlowMeterCfgCtrl.cs @@ -5,6 +5,7 @@ using System; using Config.Entities; using TBF.BenchControl.Configs; using TBF.BenchControl.Generic; +using TBF.UI.Bench.Components; namespace TBF.BenchControl.Elde.FlowMeterDewa { @@ -40,9 +41,9 @@ namespace TBF.BenchControl.Elde.FlowMeterDewa flowmeterComboBox2.Items.Add("---"); flowmeterComboBox3.Items.Add("---"); - if (parent.TbfComponents != null) + if (parent.CmpntEntities != null) { - foreach (var cmpnt in parent.TbfComponents) + foreach (var cmpnt in parent.CmpntEntities) { if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Elde.ControlBoardFactory) { diff --git a/TBF/BenchControl/Elde/FlowMeterTriplet/FlowMeterCfgCtrl.cs b/TBF/BenchControl/Elde/FlowMeterTriplet/FlowMeterCfgCtrl.cs index 8075b6a16..0c3fe7da3 100644 --- a/TBF/BenchControl/Elde/FlowMeterTriplet/FlowMeterCfgCtrl.cs +++ b/TBF/BenchControl/Elde/FlowMeterTriplet/FlowMeterCfgCtrl.cs @@ -5,6 +5,7 @@ using System; using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Generic; +using TBF.UI.Bench.Components; namespace TBF.BenchControl.Elde.FlowMeterTriplet { @@ -35,9 +36,9 @@ namespace TBF.BenchControl.Elde.FlowMeterTriplet parent = ParentForm as ComponentParametersDlg; if (parent == null) return; - if (parent.TbfComponents != null) + if (parent.CmpntEntities != null) { - foreach (var cmpnt in parent.TbfComponents) + foreach (var cmpnt in parent.CmpntEntities) { if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Elde.ControlBoardFactory) { diff --git a/TBF/BenchControl/Elde/FlowMeterTwins/FlowMeterCfgCtrl.cs b/TBF/BenchControl/Elde/FlowMeterTwins/FlowMeterCfgCtrl.cs index ba041c74e..e6f5e1d68 100644 --- a/TBF/BenchControl/Elde/FlowMeterTwins/FlowMeterCfgCtrl.cs +++ b/TBF/BenchControl/Elde/FlowMeterTwins/FlowMeterCfgCtrl.cs @@ -5,6 +5,7 @@ using System; using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Generic; +using TBF.UI.Bench.Components; namespace TBF.BenchControl.Elde.FlowMeterTwins { @@ -35,9 +36,9 @@ namespace TBF.BenchControl.Elde.FlowMeterTwins parentDlg = ParentForm as ComponentParametersDlg; if (parentDlg == null) return; - if (parentDlg.TbfComponents != null) + if (parentDlg.CmpntEntities != null) { - foreach (var cmpnt in parentDlg.TbfComponents) + foreach (var cmpnt in parentDlg.CmpntEntities) { if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Elde.ControlBoardFactory) { diff --git a/TBF/BenchControl/Elde/PressureMeter/PressureMeterCfgCtrl.cs b/TBF/BenchControl/Elde/PressureMeter/PressureMeterCfgCtrl.cs index ce14412c4..671459a9c 100644 --- a/TBF/BenchControl/Elde/PressureMeter/PressureMeterCfgCtrl.cs +++ b/TBF/BenchControl/Elde/PressureMeter/PressureMeterCfgCtrl.cs @@ -5,6 +5,7 @@ using System; using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Generic; +using TBF.UI.Bench.Components; namespace TBF.BenchControl.Elde.PressureMeter { @@ -35,9 +36,9 @@ namespace TBF.BenchControl.Elde.PressureMeter parent = ParentForm as ComponentParametersDlg; if (parent == null) return; - if (parent.TbfComponents != null) + if (parent.CmpntEntities != null) { - foreach (var cmpnt in parent.TbfComponents) + foreach (var cmpnt in parent.CmpntEntities) { if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Elde.ControlBoardFactory) { diff --git a/TBF/BenchControl/Elde/PressureMeterInternal/PressureMeterCfgCtrl.cs b/TBF/BenchControl/Elde/PressureMeterInternal/PressureMeterCfgCtrl.cs index 53833a471..25b101d2b 100644 --- a/TBF/BenchControl/Elde/PressureMeterInternal/PressureMeterCfgCtrl.cs +++ b/TBF/BenchControl/Elde/PressureMeterInternal/PressureMeterCfgCtrl.cs @@ -5,6 +5,7 @@ using System; using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Generic; +using TBF.UI.Bench.Components; namespace TBF.BenchControl.Elde.PressureMeterInternal { @@ -35,9 +36,9 @@ namespace TBF.BenchControl.Elde.PressureMeterInternal parent = ParentForm as ComponentParametersDlg; if (parent == null) return; - if (parent.TbfComponents != null) + if (parent.CmpntEntities != null) { - foreach (var cmpnt in parent.TbfComponents) + foreach (var cmpnt in parent.CmpntEntities) { if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Elde.ControlBoardFactory) { diff --git a/TBF/BenchControl/Elde/Pump/PumpCfgCtrl.cs b/TBF/BenchControl/Elde/Pump/PumpCfgCtrl.cs index b003c4018..f6e93616e 100644 --- a/TBF/BenchControl/Elde/Pump/PumpCfgCtrl.cs +++ b/TBF/BenchControl/Elde/Pump/PumpCfgCtrl.cs @@ -5,6 +5,7 @@ using System; using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Generic; +using TBF.UI.Bench.Components; namespace TBF.BenchControl.Elde.Pump { @@ -35,9 +36,9 @@ namespace TBF.BenchControl.Elde.Pump parent = ParentForm as ComponentParametersDlg; if (parent == null) return; - if (parent.TbfComponents != null) + if (parent.CmpntEntities != null) { - foreach (var cmpnt in parent.TbfComponents) + foreach (var cmpnt in parent.CmpntEntities) { if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Elde.ControlBoardFactory) { diff --git a/TBF/BenchControl/Elde/PumpTandem/PumpCfgCtrl.cs b/TBF/BenchControl/Elde/PumpTandem/PumpCfgCtrl.cs index d780f0d75..b388ff708 100644 --- a/TBF/BenchControl/Elde/PumpTandem/PumpCfgCtrl.cs +++ b/TBF/BenchControl/Elde/PumpTandem/PumpCfgCtrl.cs @@ -5,6 +5,7 @@ using System; using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Generic; +using TBF.UI.Bench.Components; namespace TBF.BenchControl.Elde.PumpTandem { @@ -35,9 +36,9 @@ namespace TBF.BenchControl.Elde.PumpTandem parentDlg = ParentForm as ComponentParametersDlg; if (parentDlg == null) return; - if (parentDlg.TbfComponents != null) + if (parentDlg.CmpntEntities != null) { - foreach (var cmpnt in parentDlg.TbfComponents) + foreach (var cmpnt in parentDlg.CmpntEntities) { if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Elde.Pump.PumpFactory || TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Elde.PumpWithFM.PumpFactory || diff --git a/TBF/BenchControl/Elde/PumpWithFM/PumpCfgCtrl.cs b/TBF/BenchControl/Elde/PumpWithFM/PumpCfgCtrl.cs index 493de0b78..0aab0fae4 100644 --- a/TBF/BenchControl/Elde/PumpWithFM/PumpCfgCtrl.cs +++ b/TBF/BenchControl/Elde/PumpWithFM/PumpCfgCtrl.cs @@ -5,6 +5,7 @@ using System; using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Generic; +using TBF.UI.Bench.Components; namespace TBF.BenchControl.Elde.PumpWithFM { @@ -35,9 +36,9 @@ namespace TBF.BenchControl.Elde.PumpWithFM parent = ParentForm as ComponentParametersDlg; if (parent == null) return; - if (parent.TbfComponents != null) + if (parent.CmpntEntities != null) { - foreach (var cmpnt in parent.TbfComponents) + foreach (var cmpnt in parent.CmpntEntities) { if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Elde.ControlBoardFactory) { diff --git a/TBF/BenchControl/Elde/RegulValve/RegulValveCfgCtrl.cs b/TBF/BenchControl/Elde/RegulValve/RegulValveCfgCtrl.cs index 5f3fe3f5f..86d693a1e 100644 --- a/TBF/BenchControl/Elde/RegulValve/RegulValveCfgCtrl.cs +++ b/TBF/BenchControl/Elde/RegulValve/RegulValveCfgCtrl.cs @@ -6,6 +6,7 @@ using System.Windows.Forms; using log4net; using Config.Entities; using TBF.BenchControl.Generic; +using TBF.UI.Bench.Components; namespace TBF.BenchControl.Elde.RegulValve { @@ -38,9 +39,9 @@ namespace TBF.BenchControl.Elde.RegulValve parent = ParentForm as ComponentParametersDlg; if (parent == null) return; - if (parent.TbfComponents != null) + if (parent.CmpntEntities != null) { - foreach (var cmpnt in parent.TbfComponents) + foreach (var cmpnt in parent.CmpntEntities) { if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Elde.ControlBoardFactory) { diff --git a/TBF/BenchControl/Elde/RegulValveCoax/RegulValveCfgCtrl.cs b/TBF/BenchControl/Elde/RegulValveCoax/RegulValveCfgCtrl.cs index 664dfa117..30ac9e536 100644 --- a/TBF/BenchControl/Elde/RegulValveCoax/RegulValveCfgCtrl.cs +++ b/TBF/BenchControl/Elde/RegulValveCoax/RegulValveCfgCtrl.cs @@ -5,6 +5,7 @@ using System; using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Generic; +using TBF.UI.Bench.Components; namespace TBF.BenchControl.Elde.RegulValveCoax { @@ -35,9 +36,9 @@ namespace TBF.BenchControl.Elde.RegulValveCoax parent = ParentForm as ComponentParametersDlg; if (parent == null) return; - if (parent.TbfComponents != null) + if (parent.CmpntEntities != null) { - foreach (var cmpnt in parent.TbfComponents) + foreach (var cmpnt in parent.CmpntEntities) { if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Elde.ControlBoardFactory) { diff --git a/TBF/BenchControl/Elde/RegulValveMilwaukee/RegulValveCfgCtrl.cs b/TBF/BenchControl/Elde/RegulValveMilwaukee/RegulValveCfgCtrl.cs index c4e5b00ad..9ad646289 100644 --- a/TBF/BenchControl/Elde/RegulValveMilwaukee/RegulValveCfgCtrl.cs +++ b/TBF/BenchControl/Elde/RegulValveMilwaukee/RegulValveCfgCtrl.cs @@ -6,6 +6,7 @@ using System.Windows.Forms; using log4net; using Config.Entities; using TBF.BenchControl.Generic; +using TBF.UI.Bench.Components; namespace TBF.BenchControl.Elde.RegulValveMilwaukee { @@ -38,9 +39,9 @@ namespace TBF.BenchControl.Elde.RegulValveMilwaukee parent = ParentForm as ComponentParametersDlg; if (parent == null) return; - if (parent.TbfComponents != null) + if (parent.CmpntEntities != null) { - foreach (var cmpnt in parent.TbfComponents) + foreach (var cmpnt in parent.CmpntEntities) { if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Elde.ControlBoardFactory) { diff --git a/TBF/BenchControl/Elde/RegulValveTandem/RegulValveTandemCfgCtrl.cs b/TBF/BenchControl/Elde/RegulValveTandem/RegulValveTandemCfgCtrl.cs index 0afddf6c8..1c5b01c15 100644 --- a/TBF/BenchControl/Elde/RegulValveTandem/RegulValveTandemCfgCtrl.cs +++ b/TBF/BenchControl/Elde/RegulValveTandem/RegulValveTandemCfgCtrl.cs @@ -5,6 +5,7 @@ using System; using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Generic; +using TBF.UI.Bench.Components; namespace TBF.BenchControl.Elde.RegulValveTandem { @@ -35,9 +36,9 @@ namespace TBF.BenchControl.Elde.RegulValveTandem parent = ParentForm as ComponentParametersDlg; if (parent == null) return; - if (parent.TbfComponents != null) + if (parent.CmpntEntities != null) { - foreach (var cmpnt in parent.TbfComponents) + foreach (var cmpnt in parent.CmpntEntities) { if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Elde.RegulValve.RegulValveFactory) { diff --git a/TBF/BenchControl/Elde/TempMeter/TempMeterCfgCtrl.cs b/TBF/BenchControl/Elde/TempMeter/TempMeterCfgCtrl.cs index e683b4260..8acd22229 100644 --- a/TBF/BenchControl/Elde/TempMeter/TempMeterCfgCtrl.cs +++ b/TBF/BenchControl/Elde/TempMeter/TempMeterCfgCtrl.cs @@ -6,6 +6,7 @@ using System.IO; using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Generic; +using TBF.UI.Bench.Components; namespace TBF.BenchControl.Elde.TempMeter { @@ -38,9 +39,9 @@ namespace TBF.BenchControl.Elde.TempMeter parent = ParentForm as ComponentParametersDlg; if (parent == null) return; - if (parent.TbfComponents != null) + if (parent.CmpntEntities != null) { - foreach (var cmpnt in parent.TbfComponents) + foreach (var cmpnt in parent.CmpntEntities) { if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Elde.ControlBoardFactory) { diff --git a/TBF/BenchControl/Elde/TempMeterInternal/TempMeterCfgCtrl.cs b/TBF/BenchControl/Elde/TempMeterInternal/TempMeterCfgCtrl.cs index bd5fcefa7..fd97e829c 100644 --- a/TBF/BenchControl/Elde/TempMeterInternal/TempMeterCfgCtrl.cs +++ b/TBF/BenchControl/Elde/TempMeterInternal/TempMeterCfgCtrl.cs @@ -5,6 +5,7 @@ using System; using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Generic; +using TBF.UI.Bench.Components; namespace TBF.BenchControl.Elde.TempMeterInternal { @@ -35,9 +36,9 @@ namespace TBF.BenchControl.Elde.TempMeterInternal parent = ParentForm as ComponentParametersDlg; if (parent == null) return; - if (parent.TbfComponents != null) + if (parent.CmpntEntities != null) { - foreach (var cmpnt in parent.TbfComponents) + foreach (var cmpnt in parent.CmpntEntities) { if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Elde.ControlBoardFactory) { diff --git a/TBF/BenchControl/Elde/Valve/ValveCfgCtrl.cs b/TBF/BenchControl/Elde/Valve/ValveCfgCtrl.cs index 8e7c8666a..e661f8cdd 100644 --- a/TBF/BenchControl/Elde/Valve/ValveCfgCtrl.cs +++ b/TBF/BenchControl/Elde/Valve/ValveCfgCtrl.cs @@ -5,6 +5,7 @@ using System; using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Generic; +using TBF.UI.Bench.Components; namespace TBF.BenchControl.Elde.Valve { @@ -40,11 +41,11 @@ namespace TBF.BenchControl.Elde.Valve categoryComboBox.Items.Add(ValveCategory.Output.ToString()); categoryComboBox.Items.Add(ValveCategory.None.ToString()); - if (parent.TbfComponents != null) + if (parent.CmpntEntities != null) { parentNameComboBox.Items.Add("---"); coupledToComboBox.Items.Add("---"); - foreach (var cmpnt in parent.TbfComponents) + foreach (var cmpnt in parent.CmpntEntities) { if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Elde.ControlBoardFactory) { diff --git a/TBF/BenchControl/Elde/ValveEx/ValveCfgCtrl.cs b/TBF/BenchControl/Elde/ValveEx/ValveCfgCtrl.cs index 106c9d355..8cc764c8a 100644 --- a/TBF/BenchControl/Elde/ValveEx/ValveCfgCtrl.cs +++ b/TBF/BenchControl/Elde/ValveEx/ValveCfgCtrl.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Generic; +using TBF.UI.Bench.Components; namespace TBF.BenchControl.Elde.ValveEx { @@ -39,13 +40,13 @@ namespace TBF.BenchControl.Elde.ValveEx logicalOpComboBox.Items.Add("AND"); logicalOpComboBox.Items.Add("OR"); - if (parent.TbfComponents != null) + if (parent.CmpntEntities != null) { - AddValvePumpItemsToCombo(input1ComboBox, parent.TbfComponents); - AddValvePumpItemsToCombo(input2ComboBox, parent.TbfComponents); - AddValvePumpItemsToCombo(input3ComboBox, parent.TbfComponents); - AddValvePumpItemsToCombo(input4ComboBox, parent.TbfComponents); - AddValvePumpItemsToCombo(input5ComboBox, parent.TbfComponents); + AddValvePumpItemsToCombo(input1ComboBox, parent.CmpntEntities); + AddValvePumpItemsToCombo(input2ComboBox, parent.CmpntEntities); + AddValvePumpItemsToCombo(input3ComboBox, parent.CmpntEntities); + AddValvePumpItemsToCombo(input4ComboBox, parent.CmpntEntities); + AddValvePumpItemsToCombo(input5ComboBox, parent.CmpntEntities); } Redraw(); diff --git a/TBF/BenchControl/Keithley/TempMeter/TempMeterCfgCtrl.cs b/TBF/BenchControl/Keithley/TempMeter/TempMeterCfgCtrl.cs index b13f3982b..8a27319f0 100644 --- a/TBF/BenchControl/Keithley/TempMeter/TempMeterCfgCtrl.cs +++ b/TBF/BenchControl/Keithley/TempMeter/TempMeterCfgCtrl.cs @@ -6,6 +6,7 @@ using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Generic; using TBF.Resources; +using TBF.UI.Bench.Components; namespace TBF.BenchControl.Keithley.TempMeter { @@ -38,9 +39,9 @@ namespace TBF.BenchControl.Keithley.TempMeter parent = ParentForm as ComponentParametersDlg; if (parent == null) return; - if (parent.TbfComponents != null) + if (parent.CmpntEntities != null) { - foreach (var cmpnt in parent.TbfComponents) + foreach (var cmpnt in parent.CmpntEntities) { if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Keithley.Multimeter_2010_RS232.Factory) { diff --git a/TBF/BenchControl/MettlerToledo/Multi/BalanceCfgCtrl.cs b/TBF/BenchControl/MettlerToledo/Multi/BalanceCfgCtrl.cs index 8697f25f3..1503dda33 100644 --- a/TBF/BenchControl/MettlerToledo/Multi/BalanceCfgCtrl.cs +++ b/TBF/BenchControl/MettlerToledo/Multi/BalanceCfgCtrl.cs @@ -7,6 +7,7 @@ using System.Windows.Forms; using System.IO.Ports; using Config.Entities; using TBF.BenchControl.Generic; +using TBF.UI.Bench.Components; namespace TBF.BenchControl.MettlerToledo.Multi { @@ -97,10 +98,10 @@ namespace TBF.BenchControl.MettlerToledo.Multi parent = ParentForm as ComponentParametersDlg; if (parent == null) return; - if (parent.TbfComponents != null) + if (parent.CmpntEntities != null) { drainValveComboBox.Items.Add("---"); - foreach (var cmpnt in parent.TbfComponents) + foreach (var cmpnt in parent.CmpntEntities) { if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Elde.Valve.ValveFactory) { diff --git a/TBF/BenchControl/MettlerToledo/Standard/BalanceCfgCtrl.cs b/TBF/BenchControl/MettlerToledo/Standard/BalanceCfgCtrl.cs index ef6f8aa46..0686a0c9b 100644 --- a/TBF/BenchControl/MettlerToledo/Standard/BalanceCfgCtrl.cs +++ b/TBF/BenchControl/MettlerToledo/Standard/BalanceCfgCtrl.cs @@ -6,6 +6,7 @@ using System.Windows.Forms; using System.IO.Ports; using Config.Entities; using TBF.BenchControl.Generic; +using TBF.UI.Bench.Components; namespace TBF.BenchControl.MettlerToledo.Standard { @@ -103,11 +104,11 @@ namespace TBF.BenchControl.MettlerToledo.Standard parent = ParentForm as ComponentParametersDlg; if (parent == null) return; - if (parent.TbfComponents != null) + if (parent.CmpntEntities != null) { evaporationComboBox.Items.Add("---"); drainValveComboBox.Items.Add("---"); - foreach (var cmpnt in parent.TbfComponents) + foreach (var cmpnt in parent.CmpntEntities) { if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Elde.Valve.ValveFactory) { diff --git a/TBF/BenchControl/Modbus/CometAmbient/AmbientCfgCtrl.cs b/TBF/BenchControl/Modbus/CometAmbient/AmbientCfgCtrl.cs index 0a77120a8..87078c5f5 100644 --- a/TBF/BenchControl/Modbus/CometAmbient/AmbientCfgCtrl.cs +++ b/TBF/BenchControl/Modbus/CometAmbient/AmbientCfgCtrl.cs @@ -5,6 +5,7 @@ using System; using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Generic; +using TBF.UI.Bench.Components; namespace TBF.BenchControl.Modbus.CometAmbient { @@ -35,9 +36,9 @@ namespace TBF.BenchControl.Modbus.CometAmbient parent = ParentForm as ComponentParametersDlg; if (parent == null) return; - if (parent.TbfComponents != null) + if (parent.CmpntEntities != null) { - foreach (var cmpnt in parent.TbfComponents) + foreach (var cmpnt in parent.CmpntEntities) { if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Modbus.Common.Factory) { diff --git a/TBF/BenchControl/Modbus/Easytherm/EasythermCfgCtrl.cs b/TBF/BenchControl/Modbus/Easytherm/EasythermCfgCtrl.cs index 0c168456f..d290c894d 100644 --- a/TBF/BenchControl/Modbus/Easytherm/EasythermCfgCtrl.cs +++ b/TBF/BenchControl/Modbus/Easytherm/EasythermCfgCtrl.cs @@ -5,6 +5,7 @@ using System; using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Generic; +using TBF.UI.Bench.Components; namespace TBF.BenchControl.Modbus.Easytherm { @@ -35,9 +36,9 @@ namespace TBF.BenchControl.Modbus.Easytherm parent = ParentForm as ComponentParametersDlg; if (parent == null) return; - if (parent.TbfComponents != null) + if (parent.CmpntEntities != null) { - foreach (var cmpnt in parent.TbfComponents) + foreach (var cmpnt in parent.CmpntEntities) { if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Modbus.Common.Factory) { diff --git a/TBF/BenchControl/Modbus/Novus/NovusCfgCtrl.cs b/TBF/BenchControl/Modbus/Novus/NovusCfgCtrl.cs index 608e5f59c..c92ddb3f3 100644 --- a/TBF/BenchControl/Modbus/Novus/NovusCfgCtrl.cs +++ b/TBF/BenchControl/Modbus/Novus/NovusCfgCtrl.cs @@ -5,6 +5,7 @@ using System; using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Generic; +using TBF.UI.Bench.Components; namespace TBF.BenchControl.Modbus.Novus { @@ -35,9 +36,9 @@ namespace TBF.BenchControl.Modbus.Novus parent = ParentForm as ComponentParametersDlg; if (parent == null) return; - if (parent.TbfComponents != null) + if (parent.CmpntEntities != null) { - foreach (var cmpnt in parent.TbfComponents) + foreach (var cmpnt in parent.CmpntEntities) { if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Modbus.Common.Factory) { diff --git a/TBF/BenchControl/Modbus/PressureMeter/Meret/PressureMeterCfgCtrl.cs b/TBF/BenchControl/Modbus/PressureMeter/Meret/PressureMeterCfgCtrl.cs index aa04b4296..0f28d5c9a 100644 --- a/TBF/BenchControl/Modbus/PressureMeter/Meret/PressureMeterCfgCtrl.cs +++ b/TBF/BenchControl/Modbus/PressureMeter/Meret/PressureMeterCfgCtrl.cs @@ -5,6 +5,7 @@ using System; using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Generic; +using TBF.UI.Bench.Components; namespace TBF.BenchControl.Modbus.PressureMeter.Meret { @@ -35,9 +36,9 @@ namespace TBF.BenchControl.Modbus.PressureMeter.Meret parent = ParentForm as ComponentParametersDlg; if (parent == null) return; - if (parent.TbfComponents != null) + if (parent.CmpntEntities != null) { - foreach (var cmpnt in parent.TbfComponents) + foreach (var cmpnt in parent.CmpntEntities) { if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Modbus.Common.Factory) { diff --git a/TBF/BenchControl/Modbus/QuidoRS/QuidoRSCfgCtrl.cs b/TBF/BenchControl/Modbus/QuidoRS/QuidoRSCfgCtrl.cs index 20026329b..8926dde94 100644 --- a/TBF/BenchControl/Modbus/QuidoRS/QuidoRSCfgCtrl.cs +++ b/TBF/BenchControl/Modbus/QuidoRS/QuidoRSCfgCtrl.cs @@ -5,6 +5,7 @@ using System; using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Generic; +using TBF.UI.Bench.Components; namespace TBF.BenchControl.Modbus.QuidoRS { @@ -35,9 +36,9 @@ namespace TBF.BenchControl.Modbus.QuidoRS parent = ParentForm as ComponentParametersDlg; if (parent == null) return; - if (parent.TbfComponents != null) + if (parent.CmpntEntities != null) { - foreach (var cmpnt in parent.TbfComponents) + foreach (var cmpnt in parent.CmpntEntities) { if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Modbus.Common.Factory) { diff --git a/TBF/BenchControl/Modbus/TankSelector/TankSelectorCfgCtrl.cs b/TBF/BenchControl/Modbus/TankSelector/TankSelectorCfgCtrl.cs index dc479e648..1e3b678e7 100644 --- a/TBF/BenchControl/Modbus/TankSelector/TankSelectorCfgCtrl.cs +++ b/TBF/BenchControl/Modbus/TankSelector/TankSelectorCfgCtrl.cs @@ -5,6 +5,7 @@ using System; using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Generic; +using TBF.UI.Bench.Components; namespace TBF.BenchControl.Modbus.TankSelector { @@ -39,9 +40,9 @@ namespace TBF.BenchControl.Modbus.TankSelector warmHeatingComboBox.Items.Add("---"); warmCoolingComboBox.Items.Add("---"); coldCoolingComboBox.Items.Add("---"); - if (parent.TbfComponents != null) + if (parent.CmpntEntities != null) { - foreach (var cmpnt in parent.TbfComponents) + foreach (var cmpnt in parent.CmpntEntities) { if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Modbus.QuidoRS.Factory) { diff --git a/TBF/BenchControl/Network/Camera/CLP1611/CameraCfgCtrl.cs b/TBF/BenchControl/Network/Camera/CLP1611/CameraCfgCtrl.cs index e4358d42b..473f14628 100644 --- a/TBF/BenchControl/Network/Camera/CLP1611/CameraCfgCtrl.cs +++ b/TBF/BenchControl/Network/Camera/CLP1611/CameraCfgCtrl.cs @@ -6,6 +6,7 @@ using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Generic; using TBF.Resources; +using TBF.UI.Bench.Components; namespace TBF.BenchControl.Network.Camera.CLP1611 { @@ -38,9 +39,9 @@ namespace TBF.BenchControl.Network.Camera.CLP1611 parent = ParentForm as ComponentParametersDlg; if (parent == null) return; - if (parent.TbfComponents != null) + if (parent.CmpntEntities != null) { - foreach (var cmpnt in parent.TbfComponents) + foreach (var cmpnt in parent.CmpntEntities) { if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is TBF.BenchControl.Network.Adapter.Factory) { diff --git a/TBF/BenchControl/Network/Camera/Display/DisplayCfgCtrl.cs b/TBF/BenchControl/Network/Camera/Display/DisplayCfgCtrl.cs index 75220a8db..b568132b4 100644 --- a/TBF/BenchControl/Network/Camera/Display/DisplayCfgCtrl.cs +++ b/TBF/BenchControl/Network/Camera/Display/DisplayCfgCtrl.cs @@ -5,6 +5,7 @@ using System; using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Generic; +using TBF.UI.Bench.Components; namespace TBF.BenchControl.Network.Camera.Display { diff --git a/TBF/BenchControl/Network/Camera/Roi/RoiCfgCtrl.cs b/TBF/BenchControl/Network/Camera/Roi/RoiCfgCtrl.cs index eea72b0f5..5048b0802 100644 --- a/TBF/BenchControl/Network/Camera/Roi/RoiCfgCtrl.cs +++ b/TBF/BenchControl/Network/Camera/Roi/RoiCfgCtrl.cs @@ -5,6 +5,7 @@ using System; using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Generic; +using TBF.UI.Bench.Components; namespace TBF.BenchControl.Network.Camera.Roi { @@ -36,9 +37,9 @@ namespace TBF.BenchControl.Network.Camera.Roi if (parent == null) return; previousRoiComboBox.Items.Add("---"); - if (parent.TbfComponents != null) + if (parent.CmpntEntities != null) { - foreach (var cmpnt in parent.TbfComponents) + foreach (var cmpnt in parent.CmpntEntities) { if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is TBF.BenchControl.Network.Camera.CLP1611.Factory) { diff --git a/TBF/BenchControl/Network/Camera/RoiForFixedStart/RoiCfgCtrl.cs b/TBF/BenchControl/Network/Camera/RoiForFixedStart/RoiCfgCtrl.cs index ecc45d5f6..5b08f38d4 100644 --- a/TBF/BenchControl/Network/Camera/RoiForFixedStart/RoiCfgCtrl.cs +++ b/TBF/BenchControl/Network/Camera/RoiForFixedStart/RoiCfgCtrl.cs @@ -7,6 +7,7 @@ using log4net; using Config.Entities; using TBF.BenchControl.Generic; using TBF.Resources; +using TBF.UI.Bench.Components; namespace TBF.BenchControl.Network.Camera.RoiForFixedStart { @@ -39,9 +40,9 @@ namespace TBF.BenchControl.Network.Camera.RoiForFixedStart parent = ParentForm as ComponentParametersDlg; if (parent == null) return; - if (parent.TbfComponents != null) + if (parent.CmpntEntities != null) { - foreach (var cmpnt in parent.TbfComponents) + foreach (var cmpnt in parent.CmpntEntities) { if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is TBF.BenchControl.Network.Camera.CLP1611.Factory) { diff --git a/TBF/BenchControl/Output/DB/SaveDiverterCorrections/SaveDiverterCorrCfgCtrl.cs b/TBF/BenchControl/Output/DB/SaveDiverterCorrections/SaveDiverterCorrCfgCtrl.cs index 775a7d86a..a739a1815 100644 --- a/TBF/BenchControl/Output/DB/SaveDiverterCorrections/SaveDiverterCorrCfgCtrl.cs +++ b/TBF/BenchControl/Output/DB/SaveDiverterCorrections/SaveDiverterCorrCfgCtrl.cs @@ -4,6 +4,7 @@ using System; using Config.Entities; using TBF.BenchControl.Generic; +using TBF.UI.Bench.Components; namespace TBF.BenchControl.Output.DB.SaveDiverterCorrections { @@ -36,7 +37,7 @@ namespace TBF.BenchControl.Output.DB.SaveDiverterCorrections parent = ParentForm as ComponentParametersDlg; if (parent == null) return; - if (parent.TbfComponents != null) + if (parent.CmpntEntities != null) { diverter1ComboBox.Items.Add("---"); diverter2ComboBox.Items.Add("---"); @@ -45,7 +46,7 @@ namespace TBF.BenchControl.Output.DB.SaveDiverterCorrections diverter5ComboBox.Items.Add("---"); diverter6ComboBox.Items.Add("---"); /// - foreach (var cmpnt in parent.TbfComponents) + foreach (var cmpnt in parent.CmpntEntities) { if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is TBF.BenchControl.Elde.Diverter.DiverterFactory) { diff --git a/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorrCfgCtrl.cs b/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorrCfgCtrl.cs index c1de248d1..2842cdfe9 100644 --- a/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorrCfgCtrl.cs +++ b/TBF/BenchControl/Output/DB/SaveFlowmeterCorrections/SaveFlowmeterCorrCfgCtrl.cs @@ -4,6 +4,7 @@ using System; using Config.Entities; using TBF.BenchControl.Generic; +using TBF.UI.Bench.Components; namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections { @@ -36,7 +37,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections parent = ParentForm as ComponentParametersDlg; if (parent == null) return; - if (parent.TbfComponents != null) + if (parent.CmpntEntities != null) { flowmeter1ComboBox.Items.Add("---"); flowmeter2ComboBox.Items.Add("---"); @@ -46,7 +47,7 @@ namespace TBF.BenchControl.Output.DB.SaveFlowmeterCorrections flowmeter6ComboBox.Items.Add("---"); flowmeter7ComboBox.Items.Add("---"); /// - foreach (var cmpnt in parent.TbfComponents) + foreach (var cmpnt in parent.CmpntEntities) { if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is TBF.BenchControl.Elde.FlowMeter.FlowMeterFactory) { diff --git a/TBF/BenchControl/RegisterReaders/KPackE/DataEntryForRadio/EntryFormCfgCtrl.cs b/TBF/BenchControl/RegisterReaders/KPackE/DataEntryForRadio/EntryFormCfgCtrl.cs index 31bde524b..5c386333c 100644 --- a/TBF/BenchControl/RegisterReaders/KPackE/DataEntryForRadio/EntryFormCfgCtrl.cs +++ b/TBF/BenchControl/RegisterReaders/KPackE/DataEntryForRadio/EntryFormCfgCtrl.cs @@ -5,6 +5,7 @@ using System; using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Generic; +using TBF.UI.Bench.Components; namespace TBF.BenchControl.RegisterReaders.KPackE.DataEntryForRadio { @@ -37,9 +38,9 @@ namespace TBF.BenchControl.RegisterReaders.KPackE.DataEntryForRadio parent = ParentForm as ComponentParametersDlg; if (parent == null) return; - if (parent.TbfComponents != null) + if (parent.CmpntEntities != null) { - foreach (var cmpnt in parent.TbfComponents) + foreach (var cmpnt in parent.CmpntEntities) { if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Radio.Factory) { diff --git a/TBF/BenchControl/RegisterReaders/KPackE/RegisterReader/RegisterReaderCfgCtrl.cs b/TBF/BenchControl/RegisterReaders/KPackE/RegisterReader/RegisterReaderCfgCtrl.cs index 091cc1a8b..9b287a3ae 100644 --- a/TBF/BenchControl/RegisterReaders/KPackE/RegisterReader/RegisterReaderCfgCtrl.cs +++ b/TBF/BenchControl/RegisterReaders/KPackE/RegisterReader/RegisterReaderCfgCtrl.cs @@ -5,6 +5,7 @@ using System; using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Generic; +using TBF.UI.Bench.Components; namespace TBF.BenchControl.RegisterReaders.KPackE.RegisterReader { @@ -35,9 +36,9 @@ namespace TBF.BenchControl.RegisterReaders.KPackE.RegisterReader parent = ParentForm as ComponentParametersDlg; if (parent == null) return; - if (parent.TbfComponents != null) + if (parent.CmpntEntities != null) { - foreach (var cmpnt in parent.TbfComponents) + foreach (var cmpnt in parent.CmpntEntities) { if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Radio.Factory) { diff --git a/TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RegisterReaderCfgCtrl.cs b/TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RegisterReaderCfgCtrl.cs index 74f35c222..ce72098e1 100644 --- a/TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RegisterReaderCfgCtrl.cs +++ b/TBF/BenchControl/RegisterReaders/PulsesFromEldeCB/RegisterReaderCfgCtrl.cs @@ -5,6 +5,7 @@ using System; using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Generic; +using TBF.UI.Bench.Components; namespace TBF.BenchControl.RegisterReaders.PulsesFromEldeCB { @@ -35,9 +36,9 @@ namespace TBF.BenchControl.RegisterReaders.PulsesFromEldeCB parent = ParentForm as ComponentParametersDlg; if (parent == null) return; - if (parent.TbfComponents != null) + if (parent.CmpntEntities != null) { - foreach (var cmpnt in parent.TbfComponents) + foreach (var cmpnt in parent.CmpntEntities) { if (TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName) is Elde.ControlBoardFactory) { diff --git a/TBF/BenchControl/Various/TankWithLevelMsrmnt/TankCfgCtrl.cs b/TBF/BenchControl/Various/TankWithLevelMsrmnt/TankCfgCtrl.cs index b134f5175..b9c552d75 100644 --- a/TBF/BenchControl/Various/TankWithLevelMsrmnt/TankCfgCtrl.cs +++ b/TBF/BenchControl/Various/TankWithLevelMsrmnt/TankCfgCtrl.cs @@ -6,6 +6,7 @@ using System.Windows.Forms; using Config.Entities; using TBF.BenchControl.Generic; using TBF.Resources; +using TBF.UI.Bench.Components; namespace TBF.BenchControl.Various.TankWithLevelMsrmnt { @@ -37,13 +38,13 @@ namespace TBF.BenchControl.Various.TankWithLevelMsrmnt parent = ParentForm as ComponentParametersDlg; if (parent == null) return; - if (parent.TbfComponents != null) + if (parent.CmpntEntities != null) { drainValveComboBox.Items.Add("---"); drainValve2ComboBox.Items.Add("---"); levelMeasurementComboBox.Items.Add("---"); - foreach (var cmpnt in parent.TbfComponents) + foreach (var cmpnt in parent.CmpntEntities) { IComponentFactory cmpntFact = TbfComponents.CmpntFactoryFromClassName(cmpnt.ClassName); diff --git a/TBF/TBF.csproj b/TBF/TBF.csproj index f392ccacc..25b83955c 100644 --- a/TBF/TBF.csproj +++ b/TBF/TBF.csproj @@ -163,12 +163,6 @@ AmbientCfgCtrl.cs - - Form - - - ComponentParametersDlg.cs - UserControl @@ -2171,6 +2165,12 @@ + + Form + + + ComponentParametersDlg.cs + Form @@ -2704,9 +2704,6 @@ AmbientCfgCtrl.cs - - ComponentParametersDlg.cs - TestMethodCfgCtrl.cs @@ -3382,6 +3379,9 @@ Strings.Designer.cs Designer + + ComponentParametersDlg.cs + ComponentsManagerDlg.cs diff --git a/TBF/BenchControl/ComponentParametersDlg.Designer.cs b/TBF/UI/Bench/Components/ComponentParametersDlg.Designer.cs similarity index 97% rename from TBF/BenchControl/ComponentParametersDlg.Designer.cs rename to TBF/UI/Bench/Components/ComponentParametersDlg.Designer.cs index f20617327..085ca71a2 100644 --- a/TBF/BenchControl/ComponentParametersDlg.Designer.cs +++ b/TBF/UI/Bench/Components/ComponentParametersDlg.Designer.cs @@ -1,7 +1,7 @@ /// -/// Copyright (c) 2013-2015 Sensus Slovensko a.s. +/// Copyright (c) 2013-2020 Sensus Slovensko a.s. /// -namespace TBF.BenchControl +namespace TBF.UI.Bench.Components { partial class ComponentParametersDlg { diff --git a/TBF/BenchControl/ComponentParametersDlg.cs b/TBF/UI/Bench/Components/ComponentParametersDlg.cs similarity index 67% rename from TBF/BenchControl/ComponentParametersDlg.cs rename to TBF/UI/Bench/Components/ComponentParametersDlg.cs index 18451e747..e47175daf 100644 --- a/TBF/BenchControl/ComponentParametersDlg.cs +++ b/TBF/UI/Bench/Components/ComponentParametersDlg.cs @@ -1,16 +1,16 @@ /// -/// Copyright (c) 2013-2015 Sensus Slovensko a.s. +/// Copyright (c) 2013-2020 Sensus Slovensko a.s. /// using System; using System.Collections.Generic; using System.Windows.Forms; using Config.Entities; -using TBF.BenchControl; using TBF.BenchControl.Generic; using TBF.Resources; using TBF.UI.Shared; +using Users.Entities; -namespace TBF.BenchControl +namespace TBF.UI.Bench.Components { public partial class ComponentParametersDlg : Form { @@ -33,16 +33,23 @@ namespace TBF.BenchControl /// /// List of components (=component configuration instances) /// - public IList TbfComponents; + public IList CmpntEntities; - public ComponentParametersDlg() + int cmpntEntityId; + + /// + /// Create a window to edit component configuration + /// + /// Config.Entities.Component.Id or 0 when this is a new/copied/immported component + public ComponentParametersDlg(int cmpntEntityId = 0) { InitializeComponent(); + this.cmpntEntityId = cmpntEntityId; Flags = CfgUpdateFlags.None; /// SharedDlgButtons configuration - sharedButtons.RequiredGroupMembership = new Users.Entities.GID[] { global::Users.Entities.GID.Metrologists }; + sharedButtons.RequiredGroupMembership = new GID[] { GID.Metrologists }; sharedButtons.MoreButtonTop = ComponentCfgCtrlHeight - 45; sharedButtons.OptionalButtons = SharedButtons.Buttons.None; sharedButtons.Unlocked += Unlock; @@ -58,17 +65,17 @@ namespace TBF.BenchControl if (ComponentCfgCtrl != null) { splitContainer.Panel1.Controls.Add((UserControl)ComponentCfgCtrl); - } - if ((ComponentCfgCtrl != null) && ComponentCfgCtrl.ShowMore) - { - sharedButtons.OptionalButtons = SharedButtons.Buttons.More; - } + if (ComponentCfgCtrl.ShowMore) + { + sharedButtons.OptionalButtons = SharedButtons.Buttons.More; + } - if (UnlockAfterStart) - { - sharedButtons.UnlockButtons(); - ComponentCfgCtrl.Unlock(); + if (UnlockAfterStart) + { + sharedButtons.UnlockButtons(); + ComponentCfgCtrl.Unlock(); + } } } @@ -101,6 +108,19 @@ namespace TBF.BenchControl { flags = ComponentCfgCtrl.UpdateCfg(); + /// Prevent component name duplicity + if (CmpntEntities != null) + { + foreach (var cmpnt in CmpntEntities) + { + if (ComponentCfgCtrl.Config.Name == cmpnt.Name && cmpntEntityId != cmpnt.Id) + { + MessageBox.Show("Component with the same name already exists"); + return; + } + } + } + if ((flags & CfgUpdateFlags.RestartRqrd) == CfgUpdateFlags.RestartRqrd) { MessageBox.Show(Strings.Program_restart_is_required_to_apply_some_settings, diff --git a/TBF/BenchControl/ComponentParametersDlg.resx b/TBF/UI/Bench/Components/ComponentParametersDlg.resx similarity index 100% rename from TBF/BenchControl/ComponentParametersDlg.resx rename to TBF/UI/Bench/Components/ComponentParametersDlg.resx diff --git a/TBF/UI/Bench/Components/ComponentsManagerDlg.cs b/TBF/UI/Bench/Components/ComponentsManagerDlg.cs index 05bdf009f..6f27ce4e1 100644 --- a/TBF/UI/Bench/Components/ComponentsManagerDlg.cs +++ b/TBF/UI/Bench/Components/ComponentsManagerDlg.cs @@ -419,7 +419,7 @@ namespace TBF.UI.Bench.Components cfgControl.Config.ItemNr = (cmpntEntities.Count > 0) ? (cmpntEntities[cmpntEntities.Count - 1].ItemNr + 1) : 1; ComponentParametersDlg cfgForm = new ComponentParametersDlg(); - cfgForm.TbfComponents = cmpntEntities; + cfgForm.CmpntEntities = cmpntEntities; cfgForm.ComponentCfgCtrl = cfgControl; cfgForm.UnlockAfterStart = true; dialogRslt = cfgForm.ShowDialog(); @@ -495,7 +495,7 @@ namespace TBF.UI.Bench.Components if (cfg != null) { ComponentParametersDlg cfgForm = new ComponentParametersDlg(); - cfgForm.TbfComponents = cmpntEntities; + cfgForm.CmpntEntities = cmpntEntities; cfgForm.ComponentCfgCtrl = cfg.GetControl(); cfgForm.ComponentCfgCtrl.Config = cfg; DialogResult dr = cfgForm.ShowDialog(); @@ -537,7 +537,7 @@ namespace TBF.UI.Bench.Components cfgControl.Config.ItemNr = (cmpntEntities.Count > 0) ? (cmpntEntities[cmpntEntities.Count - 1].ItemNr + 1) : 1; ComponentParametersDlg cfgForm = new ComponentParametersDlg(); - cfgForm.TbfComponents = cmpntEntities; + cfgForm.CmpntEntities = cmpntEntities; cfgForm.ComponentCfgCtrl = cfgControl; cfgForm.UnlockAfterStart = true; if (cfgForm.ShowDialog() != DialogResult.OK) return; @@ -582,7 +582,7 @@ namespace TBF.UI.Bench.Components cfgControl.Config.ItemNr = (cmpntEntities.Count > 0) ? (cmpntEntities[cmpntEntities.Count - 1].ItemNr + 1) : 1; ComponentParametersDlg cfgForm = new ComponentParametersDlg(); - cfgForm.TbfComponents = cmpntEntities; + cfgForm.CmpntEntities = cmpntEntities; cfgForm.ComponentCfgCtrl = cfgControl; cfgForm.UnlockAfterStart = true; if (cfgForm.ShowDialog() != DialogResult.OK) return;