From 2183d1c45264105a195171382fad02c9e67ccc4d Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Fri, 2 Sep 2022 13:01:13 +0200 Subject: [PATCH] Components with proc. params. in 'More" tab in ProcedureDlg are determined automatically, ver. 2.30.1955 --- TBF/Properties/AssemblyInfo.cs | 4 ++-- TBF/Rig/ComponentCfgBase.cs | 4 ++-- TBF/UI/Procedures/ProcedureDlg.cs | 9 ++++----- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 45a3cd32c..24c9fabfb 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.30.1930.0")] -[assembly: AssemblyFileVersion("2.30.1930.0")] +[assembly: AssemblyVersion("2.30.1955.0")] +[assembly: AssemblyFileVersion("2.30.1955.0")] diff --git a/TBF/Rig/ComponentCfgBase.cs b/TBF/Rig/ComponentCfgBase.cs index 4103a6dd4..7b4a4b202 100644 --- a/TBF/Rig/ComponentCfgBase.cs +++ b/TBF/Rig/ComponentCfgBase.cs @@ -134,7 +134,7 @@ namespace TBF.Rig { if (GetRuntimeProcParamsProvider() == null) { - /// Component has no test parametes + /// Component has no procedure parameters return null; } @@ -195,7 +195,7 @@ namespace TBF.Rig { if (GetRuntimeTestParamsProvider() == null) { - /// Component has no test parametes + /// Component has no test parameters return null; } diff --git a/TBF/UI/Procedures/ProcedureDlg.cs b/TBF/UI/Procedures/ProcedureDlg.cs index bdaa48aa4..59fe66eb4 100644 --- a/TBF/UI/Procedures/ProcedureDlg.cs +++ b/TBF/UI/Procedures/ProcedureDlg.cs @@ -327,11 +327,10 @@ namespace TBF.UI.Procedures IList other = new List(); foreach (var cmpnt in TbfComponents) { - if (cmpnt is TBF.Rig.Output.DB.SensusOracle.Database) other.Add(cmpnt); - if (cmpnt is TBF.Rig.TestMethods.S640Communication.S640Start) other.Add(cmpnt); - if (cmpnt is TBF.Rig.TestMethods.S640Communication.S640End) other.Add(cmpnt); - if (cmpnt is TBF.Rig.Modbus.TempControl.Easytherm.Easytherm) other.Add(cmpnt); - if (cmpnt is TBF.Rig.Modbus.TempControl.Novus.TControl) other.Add(cmpnt); + if (!(cmpnt is IRegReader) && !(cmpnt is IWaterMeter) && cmpnt.Cfg.CreateProcParamsProvider() != null) + { + other.Add(cmpnt); + } } if (other.Count > 0)