michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ResultsBrowser : (1) More safe StatisticsOptionsDlg, (2) ResultsConfigDlg initializes 'Caption', ver. 2.12.392

Browse Source
This commit is contained in:
Milan Hanajik
2016-11-19 00:41:56 +01:00
parent 9b457299ea
commit 0a1966d7bd
4 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Results/Forms/ResultsConfigDlg.cs
+6 -2
View File
@@ -219,7 +219,9 @@ namespace Results.Forms
if (availableResultsListBox.SelectedIndices.Count == 1) if (availableResultsListBox.SelectedIndices.Count == 1)
{ {
var oriItem = AvailableItems[availableResultsListBox.SelectedIndices[0]]; var oriItem = AvailableItems[availableResultsListBox.SelectedIndices[0]];
SelectedItems.Add(oriItem.Clone()); WMeterRsltItemSpec newItem = oriItem.Clone();
newItem.Caption = newItem.Name;
SelectedItems.Add(newItem);
RedrawAvailable(); RedrawAvailable();
RedrawSelected(); RedrawSelected();
@@ -238,7 +240,9 @@ namespace Results.Forms
for (int i = availableResultsListBox.SelectedIndices.Count - 1; i >= 0; i--) for (int i = availableResultsListBox.SelectedIndices.Count - 1; i >= 0; i--)
{ {
var oriItem = AvailableItems[availableResultsListBox.SelectedIndices[i]]; var oriItem = AvailableItems[availableResultsListBox.SelectedIndices[i]];
SelectedItems.Add(oriItem.Clone()); WMeterRsltItemSpec newItem = oriItem.Clone();
newItem.Caption = newItem.Name;
SelectedItems.Add(newItem);
} }
RedrawAvailable(); RedrawAvailable();
RedrawSelected(); RedrawSelected();
Results/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.12.391.0")] [assembly: AssemblyVersion("2.12.392.0")]
[assembly: AssemblyFileVersion("2.12.391.0")] [assembly: AssemblyFileVersion("2.12.392.0")]
ResultsBrowser/Forms/StatisticsOptionsDlg.cs
+12 -10
View File
@@ -23,10 +23,10 @@ namespace ResultsBrowser.Forms
public string ColumnTestSpecifier2; public string ColumnTestSpecifier2;
public string ColumnTestSpecifier3; public string ColumnTestSpecifier3;
public StatisticsOptionsDlg(IList<Results.WMeterRsltItemSpec> items) public StatisticsOptionsDlg(IList<Results.WMeterRsltItemSpec> items)
{ {
InitializeComponent(); InitializeComponent();
this.items = items; this.items = items;
} }
@@ -34,15 +34,8 @@ namespace ResultsBrowser.Forms
{ {
Localize(); 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) foreach (var item in items)
{ {
rowsComboBox.Items.Add(item.Caption); rowsComboBox.Items.Add(item.Caption);
@@ -52,6 +45,13 @@ namespace ResultsBrowser.Forms
columnsComboBox2.Items.Add(item.Caption); columnsComboBox2.Items.Add(item.Caption);
columnsComboBox3.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; rowTestSpecTextBox.Text = RowTestSpecifier = Program.LocalSettings.RowTestSpecifier;
rowTestSpecTextBox2.Text = RowTestSpecifier2 = Program.LocalSettings.RowTestSpecifier2; rowTestSpecTextBox2.Text = RowTestSpecifier2 = Program.LocalSettings.RowTestSpecifier2;
@@ -78,12 +78,13 @@ namespace ResultsBrowser.Forms
private void twoDimCheckBox_CheckedChanged(object sender, EventArgs e) private void twoDimCheckBox_CheckedChanged(object sender, EventArgs e)
{ {
columnsComboBox.Enabled = twoDimCheckBox.Checked; columnsGroupBox.Enabled = twoDimCheckBox.Checked;
} }
private void okButton_Click(object sender, EventArgs e) private void okButton_Click(object sender, EventArgs e)
{ {
TwoDim = twoDimCheckBox.Checked; TwoDim = twoDimCheckBox.Checked;
RowTestSpecifier = rowTestSpecTextBox.Text; RowTestSpecifier = rowTestSpecTextBox.Text;
RowTestSpecifier2 = rowTestSpecTextBox2.Text; RowTestSpecifier2 = rowTestSpecTextBox2.Text;
RowTestSpecifier3 = rowTestSpecTextBox3.Text; RowTestSpecifier3 = rowTestSpecTextBox3.Text;
@@ -114,6 +115,7 @@ namespace ResultsBrowser.Forms
MessageBox.Show(Strings.Error, Strings.Error, MessageBoxButtons.OK, MessageBoxIcon.Exclamation); MessageBox.Show(Strings.Error, Strings.Error, MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
DialogResult = DialogResult.Cancel; DialogResult = DialogResult.Cancel;
Close(); Close();
return;
} }
Program.LocalSettings.TwoDim = TwoDim; Program.LocalSettings.TwoDim = TwoDim;
ResultsBrowser/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.12.391.0")] [assembly: AssemblyVersion("2.12.392.0")]
[assembly: AssemblyFileVersion("2.12.391.0")] [assembly: AssemblyFileVersion("2.12.392.0")]