From bdd2f5f89d52f7ec21901f4afdeaa8adc3130b59 Mon Sep 17 00:00:00 2001
From: Milan Hanajik <hanajikmilan@gmail.com>
Date: Thu, 24 Sep 2015 19:11:42 +0200
Subject: [PATCH] Pre-selected water meter type when opening results page
 configuration.

---
 TestBenchFramework/Forms/ResultsConfig.cs        | 7 +++++--
 TestBenchFramework/Screens/ResultsTabPageCtrl.cs | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/TestBenchFramework/Forms/ResultsConfig.cs b/TestBenchFramework/Forms/ResultsConfig.cs
index e07f7f202..e871f7ed6 100644
--- a/TestBenchFramework/Forms/ResultsConfig.cs
+++ b/TestBenchFramework/Forms/ResultsConfig.cs
@@ -49,11 +49,11 @@ namespace TBF.Forms
 		Entities.Device device;		/// Screen, Printer or Disk
 		bool unlocked;				/// true = changes enabled
 
-		public ResultsConfig()
+		public ResultsConfig(bool combined)
 		{
 			InitializeComponent();
 
-			combined = false;
+			this.combined = combined;
 			device = Entities.Device.Screen;
 			unlocked = false;
 			cancelButton.Visible = false;
@@ -89,6 +89,9 @@ namespace TBF.Forms
 		{
 			Localize();
 
+			singleRadioButton.Checked = !combined;
+			combinedRadioButton.Checked = combined;
+
 			testsRowsRadioButton.Checked = (TestsArrangement == TestsAre.Rows);
 			testsColumnsRadioButton.Checked = (TestsArrangement == TestsAre.Columns);
 
diff --git a/TestBenchFramework/Screens/ResultsTabPageCtrl.cs b/TestBenchFramework/Screens/ResultsTabPageCtrl.cs
index 4fc0d7823..f53af2435 100644
--- a/TestBenchFramework/Screens/ResultsTabPageCtrl.cs
+++ b/TestBenchFramework/Screens/ResultsTabPageCtrl.cs
@@ -85,7 +85,7 @@ namespace TBF.Screens
 		/// </summary>
 		private void configureButton_Click(object sender, EventArgs e)
 		{
-			TBF.Forms.ResultsConfig dlg = new TBF.Forms.ResultsConfig();
+			TBF.Forms.ResultsConfig dlg = new TBF.Forms.ResultsConfig(combined);
 			dlg.TestsArrangement = TestsArrangement;
 			dlg.MetersArrangement = MetersArrangement;
 			dlg.NrMetersInOneGroup = NrMetersInOneGroup;