Changeset 13855 for branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4/GradientChartConfigurationDialog.cs

Timestamp:

05/20/16 13:01:24 (8 years ago)

Author:

pfleck

Message:

#2597

• Added validation in GradientChartConfigurationDialog and DensityTrackbar.
• Added optional configuration button for GradientChart.

File:

• branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4/GradientChartConfigurationDialog.cs (modified) (7 diffs)

branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4/GradientChartConfigurationDialog.cs

@@ -21 +21 @@
 
 using System;
+using System.ComponentModel;
 using System.Globalization;
 using System.Windows.Forms;
@@ -28 +29 @@
   public partial class GradientChartConfigurationDialog : Form {
     private readonly GradientChart chart;
-
-    private IFormatProvider FormatProvider {
-      get { return CultureInfo.CurrentUICulture.NumberFormat; }
-    }
 
     public GradientChartConfigurationDialog(GradientChart chart) {
@@ -41 +38 @@
       if (chart.FixedXAxisMin.HasValue && chart.FixedXAxisMax.HasValue) {
         xAutomaticCheckBox.Checked = false;
-        minXTextBox.Text = chart.FixedXAxisMin.Value.ToString(FormatProvider);
-        maxXTextBox.Text = chart.FixedXAxisMax.Value.ToString(FormatProvider);
+        minXTextBox.Text = chart.FixedXAxisMin.Value.ToString(CultureInfo.CurrentUICulture);
+        maxXTextBox.Text = chart.FixedXAxisMax.Value.ToString(CultureInfo.CurrentUICulture);
       } else xAutomaticCheckBox.Checked = true;
       if (chart.FixedYAxisMin.HasValue && chart.FixedYAxisMax.HasValue) {
         yAutomaticCheckBox.Checked = false;
-        minYTextBox.Text = chart.FixedYAxisMin.Value.ToString(FormatProvider);
-        maxYTextBox.Text = chart.FixedYAxisMax.Value.ToString(FormatProvider);
+        minYTextBox.Text = chart.FixedYAxisMin.Value.ToString(CultureInfo.CurrentUICulture);
+        maxYTextBox.Text = chart.FixedYAxisMax.Value.ToString(CultureInfo.CurrentUICulture);
       } else yAutomaticCheckBox.Checked = true;
       StepsNumericUpDown.Value = chart.DrawingSteps;
@@ -59 +56 @@
           chart.FixedXAxisMax = null;
         } else {
-          var min = Convert.ToDouble(minXTextBox.Text, FormatProvider);
-          var max = Convert.ToDouble(maxXTextBox.Text, FormatProvider);
+          var min = double.Parse(minXTextBox.Text, CultureInfo.CurrentUICulture);
+          var max = double.Parse(maxXTextBox.Text, CultureInfo.CurrentUICulture);
           chart.FixedXAxisMin = min;
           chart.FixedXAxisMax = max;
@@ -69 +66 @@
           chart.FixedYAxisMax = null;
         } else {
-          var min = Convert.ToDouble(minYTextBox.Text, FormatProvider);
-          var max = Convert.ToDouble(maxYTextBox.Text, FormatProvider);
+          var min = double.Parse(minYTextBox.Text, CultureInfo.CurrentUICulture);
+          var max = double.Parse(maxYTextBox.Text, CultureInfo.CurrentUICulture);
           chart.FixedYAxisMin = min;
           chart.FixedYAxisMax = max;
@@ -81 +78 @@
         Close();
       }
-      catch (FormatException fe) {
-        MessageBox.Show(this, "Illegal number format: {0}", fe.Message, MessageBoxButtons.OK, MessageBoxIcon.Error);
+      catch (FormatException) {
+        MessageBox.Show(this, "Illegal number format", "Wrong format", MessageBoxButtons.OK, MessageBoxIcon.Error);
       }
       finally {
@@ -96 +93 @@
       maxYTextBox.Enabled = !yAutomaticCheckBox.Checked;
     }
+
+    private void numberTextBox_Validating(object sender, CancelEventArgs e) {
+      var textBox = sender as TextBox;
+      if (textBox != null) {
+        double number;
+        if (!double.TryParse(textBox.Text, NumberStyles.Any, CultureInfo.CurrentUICulture, out number)) {
+          e.Cancel = true;
+          applyButton.Enabled = false;
+          errorProvider.SetIconAlignment(textBox, ErrorIconAlignment.MiddleLeft);
+          errorProvider.SetIconPadding(textBox, 2);
+          errorProvider.SetError(textBox, "Illegal number format");
+          textBox.SelectAll();
+        }
+      }
+    }
+
+    private void numberTextBox_Validated(object sender, EventArgs e) {
+      var textBox = sender as TextBox;
+      if (textBox != null) {
+        errorProvider.SetError(textBox, string.Empty);
+        applyButton.Enabled = true;
+      }
+    }
   }
 }