Changeset 18086 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/ShapeConstraintsView.cs

Timestamp:

11/19/21 16:07:45 (2 years ago)

Author:

mkommend

Message:

#2521: Merged trunk changes into branch.

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/ShapeConstraintsView.cs (copied) (copied from trunk/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/ShapeConstraintsView.cs) (3 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/ShapeConstraintsView.cs

@@ -50 +50 @@
       this.shapeConstraintsView.Content = Content;
       UpdateControl();
+      errorOutput.Text = "";
     }
 
@@ -77 +78 @@
     protected override void SetEnabledStateOfControls() {
       constraintsInput.Enabled = Content != null && !Locked && !ReadOnly;
+      parseBtn.Enabled = Content != null && !Locked && !ReadOnly;
     }
 
@@ -86 +88 @@
         try {
           var parsedConstraints = ShapeConstraintsParser.ParseConstraints(constraintsInput.Text);
-          Content.AddRange(parsedConstraints);
+          //Content.AddRange(parsedConstraints);
+          foreach(var constraint in parsedConstraints) {
+            if (parsedConstraints.ItemChecked(constraint))
+              Content.Add(constraint, true);
+            else
+              Content.Add(constraint, false);
+          }
           errorOutput.Text = "Constraints successfully parsed.";
           errorOutput.ForeColor = Color.DarkGreen;
         } catch (ArgumentException ex) {
-          errorOutput.Text = ex.Message.Replace("Parameter name", "@Line");
+          errorOutput.Text = ex.Message;
           errorOutput.ForeColor = Color.DarkRed;
         } finally {