From 902d596c63ca4f4f09e0ed98705e777aadd724ce Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Wed, 21 Jun 2017 16:07:54 +0200 Subject: [PATCH] RsltItems_Screen_xxx lists in ResultsTabPageCtrl initialized earlier (in the constructor), possible Torino50 bug fix). --- .../Screens/ResultsTabPageCtrl.cs | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/TestBenchFramework/Screens/ResultsTabPageCtrl.cs b/TestBenchFramework/Screens/ResultsTabPageCtrl.cs index 086025bdc..f42ecd81f 100644 --- a/TestBenchFramework/Screens/ResultsTabPageCtrl.cs +++ b/TestBenchFramework/Screens/ResultsTabPageCtrl.cs @@ -40,6 +40,13 @@ namespace TBF.Screens { InitializeComponent(); + MetersArrangement = Program.LocalSettings.ResultsConfigMeters; + TestsArrangement = Program.LocalSettings.ResultsConfigTests; + NrMetersInOneGroup = Math.Max(1, Program.LocalSettings.ResultsConfigMetersInOneGroup); + RsltItems_Screen_SingleWM = Results.WMeterRsltItemSpec.FromStrArray(Program.LocalSettings.RsltItems_Screen_SingleWM); + RsltItems_Screen_CombinedWM = Results.WMeterRsltItemSpec.FromStrArray(Program.LocalSettings.RsltItems_Screen_CombinedWM); + RsltItems_Screen_HeatM = Results.WMeterRsltItemSpec.FromStrArray(Program.LocalSettings.RsltItems_Screen_HeatM); + Bridge.ProcedureSelectedHandler += delegate(object sender, ProcedureSelectedEventArgs args) { if (InvokeRequired) @@ -87,13 +94,6 @@ namespace TBF.Screens columnWidthsButton.Text = Strings.Save_column_widths; showPreviousResultsButton.Text = Strings.Previous_results; - MetersArrangement = Program.LocalSettings.ResultsConfigMeters; - TestsArrangement = Program.LocalSettings.ResultsConfigTests; - NrMetersInOneGroup = Math.Max(1, Program.LocalSettings.ResultsConfigMetersInOneGroup); - RsltItems_Screen_SingleWM = Results.WMeterRsltItemSpec.FromStrArray(Program.LocalSettings.RsltItems_Screen_SingleWM); - RsltItems_Screen_CombinedWM = Results.WMeterRsltItemSpec.FromStrArray(Program.LocalSettings.RsltItems_Screen_CombinedWM); - RsltItems_Screen_HeatM = Results.WMeterRsltItemSpec.FromStrArray(Program.LocalSettings.RsltItems_Screen_HeatM); - RedrawAll(TBF.BenchControl.Sequences.ProcessData.BatchRslts); } @@ -110,7 +110,10 @@ namespace TBF.Screens } IList copiedItems = new List(); + if (srcItems != null) + { foreach (var it in srcItems) copiedItems.Add(it.Clone()); + } return copiedItems; }