Changeset 17891 for branches/3073_IA_constraint_splitting_reintegration/HeuristicLab.Problems.DataAnalysis.Views/3.4/IntervalConstraintView.cs

Timestamp:

03/12/21 16:41:42 (3 years ago)

Author:

gkronber

Message:

#3073 refactoring to prepare for trunk reintegration

Location:

branches/3073_IA_constraint_splitting_reintegration

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/IntervalConstraintView.cs (modified) (12 diffs)

branches/3073_IA_constraint_splitting_reintegration

@@ -1 +1 @@
 bin
+TestResults

@@ -1 +1 @@
 bin
+TestResults

branches/3073_IA_constraint_splitting_reintegration/HeuristicLab.Problems.DataAnalysis.Views/3.4/IntervalConstraintView.cs

@@ -33 +33 @@
   public sealed partial class IntervalConstraintView : ItemView {
     public new ShapeConstraint Content {
-      get => (ShapeConstraint) base.Content;
+      get => (ShapeConstraint)base.Content;
       set => base.Content = value;
     }
@@ -39 +39 @@
     public IntervalConstraintView() {
       InitializeComponent();
-      int[] items = {1, 2, 3};
-      expressionInput.ReadOnly         = true;
+      int[] items = { 1, 2, 3 };
       numberderivationInput.DataSource = items;
     }
@@ -61 +60 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      expressionInput.Enabled       = Content != null && !Locked && !ReadOnly;
-      variableInput.Enabled         = Content != null && !Locked && !ReadOnly;
+      variableInput.Enabled = Content != null && !Locked && !ReadOnly;
       numberderivationInput.Enabled = Content != null && !Locked && !ReadOnly;
-      lowerboundInput.Enabled       = Content != null && !Locked && !ReadOnly;
-      upperboundInput.Enabled       = Content != null && !Locked && !ReadOnly;
-      ischeckedCheckBox.Enabled     = Content != null && !Locked && !ReadOnly;
+      lowerboundInput.Enabled = Content != null && !Locked && !ReadOnly;
+      upperboundInput.Enabled = Content != null && !Locked && !ReadOnly;
     }
 
@@ -83 +80 @@
           return double.NegativeInfinity;
         default: {
-          if (double.TryParse(input, out var value)) {
-            return value;
+            if (double.TryParse(input, out var value)) {
+              return value;
+            }
+
+            errorProvider.SetError(control, "Invalid input: value must be a double.");
+            return double.NaN;
           }
-
-          errorProvider.SetError(control, "Invalid Input: Value must be a double!");
-          return double.NaN;
-        }
       }
     }
@@ -95 +92 @@
     private void UpdateControls() {
       if (Content == null) {
-        expressionInput.Text = string.Empty;
         lowerboundInput.Text = string.Empty;
         upperboundInput.Text = string.Empty;
@@ -101 +97 @@
       }
 
-      expressionInput.Text = Content.Expression;
       lowerboundInput.Text = Content.Interval.LowerBound.ToString();
       upperboundInput.Text = Content.Interval.UpperBound.ToString();
@@ -107 +102 @@
       variableInput.Text = Content.Variable;
       if (!Content.IsDerivative) {
-        numberderivationInput.Enabled      = false;
+        numberderivationInput.Enabled = false;
         numberderivationInput.SelectedItem = null;
-        numberderivationInput.Text         = "0";
-      }
-      else {
-        numberderivationLabel.Visible      = true;
-        numberderivationInput.Visible      = true;
-        numberderivationInput.Enabled      = true;
+        numberderivationInput.Text = "0";
+      } else {
+        numberderivationLabel.Visible = true;
+        numberderivationInput.Visible = true;
+        numberderivationInput.Enabled = true;
         numberderivationInput.SelectedItem = Content.NumberOfDerivations;
       }
-
-      ischeckedCheckBox.Checked = Content.Enabled;
     }
 
@@ -128 +120 @@
       var value = ParseDoubleValue(lowerboundInput.Text, lowerboundInput, errorProvider);
       if (double.IsNaN(value)) {
-        errorProvider.SetError(lowerboundInput, "Invalid Input: Lowerbound must be a double value!");
+        errorProvider.SetError(lowerboundInput, "Invalid input: lower bound must be a double value.");
         e.Cancel = true;
         return;
@@ -134 +126 @@
 
       if (value > Content.Interval.UpperBound) {
-        errorProvider.SetError(lowerboundInput, "Invalid Input: Lowerbound must be smaller than Upperbound!");
+        errorProvider.SetError(lowerboundInput, "Invalid input: lower bound must be smaller than upper bound.");
         e.Cancel = true;
         return;
@@ -152 +144 @@
       var value = ParseDoubleValue(upperboundInput.Text, upperboundInput, errorProvider);
       if (double.IsNaN(value)) {
-        errorProvider.SetError(upperboundInput, "Invalid Input: Upperbound must be a double value!");
+        errorProvider.SetError(upperboundInput, "Invalid Input: upper bound must be a double value.");
         e.Cancel = true;
         return;
@@ -158 +150 @@
 
       if (value < Content.Interval.LowerBound) {
-        errorProvider.SetError(upperboundInput, "Invalid Input: Upperbound must be bigger than Lowerbound!");
+        errorProvider.SetError(upperboundInput, "Invalid input: upper bound must be bigger than lower bound.");
         e.Cancel = true;
         return;
@@ -173 +165 @@
     }
 
-    private void ischeckedCheckBox_CheckedChanged(object sender, EventArgs e) {
-      Content.Enabled = ischeckedCheckBox.Checked;
-    }
-
     private void numberderivationInput_SelectedIndexChanged(object sender, EventArgs e) {
       if (numberderivationInput.SelectedItem == null) {
-        Content.NumberOfDerivations   = 0;
+        Content.NumberOfDerivations = 0;
         numberderivationInput.Enabled = false;
         return;
       }
 
-      if ((int) numberderivationInput.SelectedItem == 1)
+      if ((int)numberderivationInput.SelectedItem == 1)
         Content.NumberOfDerivations = 1;
-      else if ((int) numberderivationInput.SelectedItem == 2)
+      else if ((int)numberderivationInput.SelectedItem == 2)
         Content.NumberOfDerivations = 2;
-      else if ((int) numberderivationInput.SelectedItem == 3)
+      else if ((int)numberderivationInput.SelectedItem == 3)
         Content.NumberOfDerivations = 3;
     }

@@ -1 +1 @@
 bin
+TestResults