From 0a1966d7bd3e3c1b4af0cfc527722417dc3f72b0 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Sat, 19 Nov 2016 00:41:56 +0100 Subject: [PATCH] ResultsBrowser : (1) More safe StatisticsOptionsDlg, (2) ResultsConfigDlg initializes 'Caption', ver. 2.12.392 --- Results/Forms/ResultsConfigDlg.cs | 8 ++++-- Results/Properties/AssemblyInfo.cs | 4 +-- ResultsBrowser/Forms/StatisticsOptionsDlg.cs | 28 +++++++++++--------- ResultsBrowser/Properties/AssemblyInfo.cs | 4 +-- 4 files changed, 25 insertions(+), 19 deletions(-) diff --git a/Results/Forms/ResultsConfigDlg.cs b/Results/Forms/ResultsConfigDlg.cs index e75c2e829..403fd11c1 100644 --- a/Results/Forms/ResultsConfigDlg.cs +++ b/Results/Forms/ResultsConfigDlg.cs @@ -219,7 +219,9 @@ namespace Results.Forms if (availableResultsListBox.SelectedIndices.Count == 1) { var oriItem = AvailableItems[availableResultsListBox.SelectedIndices[0]]; - SelectedItems.Add(oriItem.Clone()); + WMeterRsltItemSpec newItem = oriItem.Clone(); + newItem.Caption = newItem.Name; + SelectedItems.Add(newItem); RedrawAvailable(); RedrawSelected(); @@ -238,7 +240,9 @@ namespace Results.Forms for (int i = availableResultsListBox.SelectedIndices.Count - 1; i >= 0; i--) { var oriItem = AvailableItems[availableResultsListBox.SelectedIndices[i]]; - SelectedItems.Add(oriItem.Clone()); + WMeterRsltItemSpec newItem = oriItem.Clone(); + newItem.Caption = newItem.Name; + SelectedItems.Add(newItem); } RedrawAvailable(); RedrawSelected(); diff --git a/Results/Properties/AssemblyInfo.cs b/Results/Properties/AssemblyInfo.cs index 0dec1864c..78b70397f 100644 --- a/Results/Properties/AssemblyInfo.cs +++ b/Results/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.12.391.0")] -[assembly: AssemblyFileVersion("2.12.391.0")] +[assembly: AssemblyVersion("2.12.392.0")] +[assembly: AssemblyFileVersion("2.12.392.0")] diff --git a/ResultsBrowser/Forms/StatisticsOptionsDlg.cs b/ResultsBrowser/Forms/StatisticsOptionsDlg.cs index 6be0a1262..4b00268c4 100644 --- a/ResultsBrowser/Forms/StatisticsOptionsDlg.cs +++ b/ResultsBrowser/Forms/StatisticsOptionsDlg.cs @@ -23,10 +23,10 @@ namespace ResultsBrowser.Forms public string ColumnTestSpecifier2; public string ColumnTestSpecifier3; + public StatisticsOptionsDlg(IList items) { InitializeComponent(); - this.items = items; } @@ -34,24 +34,24 @@ namespace ResultsBrowser.Forms { Localize(); - columnsComboBox.Enabled = twoDimCheckBox.Checked = TwoDim = Program.LocalSettings.TwoDim; + columnsGroupBox.Enabled = twoDimCheckBox.Checked = TwoDim = Program.LocalSettings.TwoDim; - rowsComboBox.Text = Program.LocalSettings.RowItemCaption; - rowsComboBox2.Text = Program.LocalSettings.RowItemCaption2; - rowsComboBox3.Text = Program.LocalSettings.RowItemCaption3; - columnsComboBox.Text = Program.LocalSettings.ColumnItemCaption; - columnsComboBox2.Text = Program.LocalSettings.ColumnItemCaption2; - columnsComboBox3.Text = Program.LocalSettings.ColumnItemCaption3; - /// - foreach (var item in items) - { - rowsComboBox.Items.Add(item.Caption); + foreach (var item in items) + { + rowsComboBox.Items.Add(item.Caption); rowsComboBox2.Items.Add(item.Caption); rowsComboBox3.Items.Add(item.Caption); columnsComboBox.Items.Add(item.Caption); columnsComboBox2.Items.Add(item.Caption); columnsComboBox3.Items.Add(item.Caption); } + /// + rowsComboBox.Text = rowsComboBox.Items.Contains(Program.LocalSettings.RowItemCaption) ? Program.LocalSettings.RowItemCaption : string.Empty; + rowsComboBox2.Text = rowsComboBox2.Items.Contains(Program.LocalSettings.RowItemCaption2) ? Program.LocalSettings.RowItemCaption2 : string.Empty; + rowsComboBox3.Text = rowsComboBox3.Items.Contains(Program.LocalSettings.RowItemCaption3) ? Program.LocalSettings.RowItemCaption3 : string.Empty; + columnsComboBox.Text = columnsComboBox.Items.Contains(Program.LocalSettings.ColumnItemCaption) ? Program.LocalSettings.ColumnItemCaption : string.Empty; + columnsComboBox2.Text = columnsComboBox2.Items.Contains(Program.LocalSettings.ColumnItemCaption2) ? Program.LocalSettings.ColumnItemCaption2 : string.Empty; + columnsComboBox3.Text = columnsComboBox3.Items.Contains(Program.LocalSettings.ColumnItemCaption3) ? Program.LocalSettings.ColumnItemCaption3 : string.Empty; rowTestSpecTextBox.Text = RowTestSpecifier = Program.LocalSettings.RowTestSpecifier; rowTestSpecTextBox2.Text = RowTestSpecifier2 = Program.LocalSettings.RowTestSpecifier2; @@ -78,12 +78,13 @@ namespace ResultsBrowser.Forms private void twoDimCheckBox_CheckedChanged(object sender, EventArgs e) { - columnsComboBox.Enabled = twoDimCheckBox.Checked; + columnsGroupBox.Enabled = twoDimCheckBox.Checked; } private void okButton_Click(object sender, EventArgs e) { TwoDim = twoDimCheckBox.Checked; + RowTestSpecifier = rowTestSpecTextBox.Text; RowTestSpecifier2 = rowTestSpecTextBox2.Text; RowTestSpecifier3 = rowTestSpecTextBox3.Text; @@ -114,6 +115,7 @@ namespace ResultsBrowser.Forms MessageBox.Show(Strings.Error, Strings.Error, MessageBoxButtons.OK, MessageBoxIcon.Exclamation); DialogResult = DialogResult.Cancel; Close(); + return; } Program.LocalSettings.TwoDim = TwoDim; diff --git a/ResultsBrowser/Properties/AssemblyInfo.cs b/ResultsBrowser/Properties/AssemblyInfo.cs index 9d3b3f136..a1c5be1c3 100644 --- a/ResultsBrowser/Properties/AssemblyInfo.cs +++ b/ResultsBrowser/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.12.391.0")] -[assembly: AssemblyFileVersion("2.12.391.0")] +[assembly: AssemblyVersion("2.12.392.0")] +[assembly: AssemblyFileVersion("2.12.392.0")]