From ae0ebd15f76de7b1e31e5b844730fa1b711a938d Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Fri, 21 Jul 2017 14:26:26 +0300 Subject: [PATCH] (1) RegValveCalib array pre-initialized, (2) Test ID column supressed in ResultsArrangementDlg, (3) ValveEx fixed, ver. 2.14.616 --- .../BenchControl/Elde/ControlBoardDev.cs | 17 ++++++++++------- .../BenchControl/Elde/ValveEx/ValveCfgCtrl.cs | 8 ++++++-- .../Forms/ResultsArrangementDlg.cs | 1 + TestBenchFramework/Properties/AssemblyInfo.cs | 4 ++-- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs index effd70c02..36b819ac7 100644 --- a/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs +++ b/TestBenchFramework/BenchControl/Elde/ControlBoardDev.cs @@ -123,32 +123,35 @@ namespace TBF.BenchControl.Elde // Array length is the reference flowmeters count plus one #if DN100 || FUZHOU150 || FUZHOU300 || PT200IL || PUCHONG_PT200 - public uint[,] RegValveCalib = new uint[8, 2]; + public uint[,] RegValveCalib = new uint[8,2] {{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500}}; public byte[] MeretRS485Address = new byte[4]; public float[] EtCalib = new float[6] { 1, 1, 1, 1, 1, 1 }; public uint[] DiverterEdge = new uint[2] { 50, 50 }; #elif GENESIS || BERLIN || PETERSBURG_200 - public uint[,] RegValveCalib = new uint[16, 2]; + public uint[,] RegValveCalib = new uint[16, 2] { {100,500}, {100,500}, {100,500}, {100,500}, + {100,500}, {100,500}, {100,500}, {100,500}, + {100,500}, {100,500}, {100,500}, {100,500}, + {100,500}, {100,500}, {100,500}, {100,500} }; public byte[] MeretRS485Address = new byte[4]; public float[] EtCalib = new float[7] { 1, 1, 1, 1, 1, 1, 1 }; public uint[] DiverterEdge = new uint[6] { 50, 50, 50, 50, 50, 50 }; #elif MUNICH || TORINO50 || BADGER_MALA_TRAT || TORUN_PT50_2015 || CEVAK_PT40_272 || TURA_IPERL || TURA_SPECIAL || MURES_PT40 || FUZHOU_40 || SLM_50 || SLM_150 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 - public uint[,] RegValveCalib = new uint[8, 2]; - public byte[] MeretRS485Address = new byte[4]; + public uint[,] RegValveCalib = new uint[8,2] {{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500}}; + public byte[] MeretRS485Address = new byte[4]; public float[] EtCalib = new float[5] { 1, 1, 1, 1, 1 }; public uint[] DiverterEdge = new uint[2] { 50, 50 }; #elif SLM_END || WARSAW_END - public uint[,] RegValveCalib = new uint[8, 2]; + public uint[,] RegValveCalib = new uint[8,2] {{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500}}; public byte[] MeretRS485Address = new byte[4]; public float[] EtCalib = new float[5] { 1, 1, 1, 1, 1 }; public uint[] DiverterEdge = new uint[2] { 50, 50 }; #elif MALTA_WSD25 - public uint[,] RegValveCalib = new uint[8, 2]; + public uint[,] RegValveCalib = new uint[8,2] {{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500}}; public byte[] MeretRS485Address = new byte[12]; public float[] EtCalib = new float[9] { 1, 1, 1, 1, 1, 1, 1, 1, 1 }; public uint[] DiverterEdge = new uint[2] { 50, 50 }; #elif BADGER_VELKA_TRAT - public uint[,] RegValveCalib = new uint[8, 2]; + public uint[,] RegValveCalib = new uint[8,2] {{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500}}; public byte[] MeretRS485Address = new byte[4]; public float[] EtCalib = new float[8] { 1, 1, 1, 1, 1, 1, 1, 1 }; public uint[] DiverterEdge = new uint[2] { 50, 50 }; diff --git a/TestBenchFramework/BenchControl/Elde/ValveEx/ValveCfgCtrl.cs b/TestBenchFramework/BenchControl/Elde/ValveEx/ValveCfgCtrl.cs index 23b89e876..04b578e3d 100644 --- a/TestBenchFramework/BenchControl/Elde/ValveEx/ValveCfgCtrl.cs +++ b/TestBenchFramework/BenchControl/Elde/ValveEx/ValveCfgCtrl.cs @@ -57,8 +57,12 @@ namespace TBF.BenchControl.Elde.ValveEx { foreach (var cmpntEntity in components) { - IComponent comp = TbfComponents.CmpntFactoryFromClassName(cmpntEntity.ClassName).DummyComponent(); - if (comp is GenericDevices.IValve ) + IComponentFactory fac = TbfComponents.CmpntFactoryFromClassName(cmpntEntity.ClassName); + + if (fac is Elde.Valve.ValveFactory || /// IValve component factories + fac is Elde.Pump.PumpFactory || + fac is Danfoss.VLT2800.PumpFactory || + fac is Elde.PumpWithFM.PumpFactory) { combo.Items.Add(cmpntEntity.Name); } diff --git a/TestBenchFramework/Forms/ResultsArrangementDlg.cs b/TestBenchFramework/Forms/ResultsArrangementDlg.cs index a44a5ffac..bd2dbbac7 100644 --- a/TestBenchFramework/Forms/ResultsArrangementDlg.cs +++ b/TestBenchFramework/Forms/ResultsArrangementDlg.cs @@ -44,6 +44,7 @@ namespace TBF.Forms public ResultsArrangementDlg() { InitializeComponent(); + resultsConfigCtrl.SupressTestIDColumn = true; Unlocked = false; cancelButton.Visible = false; diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index ad3a50a2b..e2380e9a5 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.14.615.1")] -[assembly: AssemblyFileVersion("2.14.615.1")] +[assembly: AssemblyVersion("2.14.616.1")] +[assembly: AssemblyFileVersion("2.14.616.1")]