From 563141fbbea11c6a1872a9a156802628be02ef07 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Mon, 6 Jul 2015 15:40:57 +0200 Subject: [PATCH] ProcessTabPageCtrl24 modificatons for compound meter. Version 1.5.67. --- TestBenchFramework/Program.cs | 9 ++++++- TestBenchFramework/Properties/AssemblyInfo.cs | 4 +-- .../Screens/ProcessTabPageCtrl24.cs | 26 +++++++++++++++---- 3 files changed, 31 insertions(+), 8 deletions(-) diff --git a/TestBenchFramework/Program.cs b/TestBenchFramework/Program.cs index 6dd936507..d5bb42f09 100644 --- a/TestBenchFramework/Program.cs +++ b/TestBenchFramework/Program.cs @@ -39,12 +39,19 @@ namespace TBF #if DN100 || MUNICH public const int WMsCount = 3; public const int LineSize = 3; -#elif FUZHOU300 || FUZHOU150 || PT200IL || TORINO50 || BADGER_MALA_TRAT + public const int CompondWMsCount = 1; +#elif FUZHOU300 || FUZHOU150 || PT200IL public const int WMsCount = 6; public const int LineSize = 6; + public const int CompondWMsCount = 3; +#elif TORINO50 || BADGER_MALA_TRAT + public const int WMsCount = 6; + public const int LineSize = 6; + public const int CompondWMsCount = 1; #elif TORUN_PT50_2015 || CEVAK_PT40_272 public const int WMsCount = 20; public const int LineSize = 10; + public const int CompondWMsCount = 1; #endif /// diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index 4c1558175..5fe58781e 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("1.5.66.1")] -[assembly: AssemblyFileVersion("1.5.66.1")] +[assembly: AssemblyVersion("1.5.67.1")] +[assembly: AssemblyFileVersion("1.5.67.1")] diff --git a/TestBenchFramework/Screens/ProcessTabPageCtrl24.cs b/TestBenchFramework/Screens/ProcessTabPageCtrl24.cs index 2c14acf16..a67d33cc2 100644 --- a/TestBenchFramework/Screens/ProcessTabPageCtrl24.cs +++ b/TestBenchFramework/Screens/ProcessTabPageCtrl24.cs @@ -204,10 +204,18 @@ namespace TBF.Screens if (currentMetersKind == Entities.MetersKind.Single) { - watermeterPictureBox1z.Visible = false; + watermeterPictureBox1.Visible = true; + watermeterPictureBox2.Visible = true; + watermeterPictureBox3.Visible = true; + watermeterPictureBox4.Visible = true; + watermeterPictureBox5.Visible = true; + watermeterPictureBox6.Visible = true; + + watermeterPictureBox1z.Visible = false; watermeterPictureBox2z.Visible = false; watermeterPictureBox3z.Visible = false; - groupBox1z.Visible = false; + + groupBox1z.Visible = false; groupBox2z.Visible = false; groupBox3z.Visible = false; @@ -220,13 +228,21 @@ namespace TBF.Screens } else if (currentMetersKind == Entities.MetersKind.Combined) { - groupBox1z.Visible = true; - watermeterPictureBox1z.Visible = true; - watermeterPictureBox2.Visible = false; + watermeterPictureBox1.Visible = false; + watermeterPictureBox2.Visible = true; watermeterPictureBox3.Visible = false; watermeterPictureBox4.Visible = false; watermeterPictureBox5.Visible = false; watermeterPictureBox6.Visible = false; + + watermeterPictureBox1z.Visible = true; + watermeterPictureBox2z.Visible = false; + watermeterPictureBox3z.Visible = false; + + groupBox1z.Visible = true; + groupBox2z.Visible = false; + groupBox3z.Visible = false; + sensor1Label.Visible = true; sensor1Label.Text = "---"; sensor2Label.Visible = true;