From 3b1f0129bad6c75347e36d6cfe65dc1f69819362 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Wed, 25 Mar 2015 07:31:44 +0100 Subject: [PATCH] Bug fixed in Disabled watermeters will not appear in results... When there were no results yet and Results screen was opened -> crash --- TestBenchFramework/Screens/ResultsTabPageCtrl.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/TestBenchFramework/Screens/ResultsTabPageCtrl.cs b/TestBenchFramework/Screens/ResultsTabPageCtrl.cs index a4bc07ae7..6a4e15fff 100644 --- a/TestBenchFramework/Screens/ResultsTabPageCtrl.cs +++ b/TestBenchFramework/Screens/ResultsTabPageCtrl.cs @@ -148,19 +148,20 @@ namespace TBF.Screens { for (int mtr0 = 0; mtr0 < Program.WMsCount; mtr0++) { - if (!testResults[0].Meters[mtr0].Disabled) enabledWMsCount++; + if ((testResults != null) && (testResults.Count > 0) && !testResults[0].Meters[mtr0].Disabled) + enabledWMsCount++; } } if (MetersArrangement == Forms.ResultsConfig.Meters.Horizontally) { flowLayoutPanel.FlowDirection = FlowDirection.LeftToRight; - lvWidth = (lvWidth + 5) / enabledWMsCount - 5; + lvWidth = (lvWidth + 5) / Math.Max(enabledWMsCount, 1) - 5; } else { flowLayoutPanel.FlowDirection = FlowDirection.TopDown; - lvHeight = (lvHeight + 5) / enabledWMsCount - 5; + lvHeight = (lvHeight + 5) / Math.Max(enabledWMsCount, 1) - 5; } flowLayoutPanel.Controls.Clear(); flowLayoutPanel.WrapContents = false; @@ -170,7 +171,7 @@ namespace TBF.Screens int printedWMNr = 1; for (int mtr = 1; mtr <= (combined ? Program.WMsCount / 2 : Program.WMsCount); mtr++) { - if (combined || !testResults[0].Meters[mtr - 1].Disabled) + if (combined || (testResults != null && testResults.Count > 0 && !testResults[0].Meters[mtr - 1].Disabled)) { if (TestsArrangement == Forms.ResultsConfig.TestsAre.Rows) {