Changeset 16545

Timestamp:

01/22/19 11:59:54 (6 years ago)

Author:

chaider

Message:

#2971

• Added ReadOnly field to NamedIntervals
• Changes at cell validation of NamedIntervalsView
• Added save on value changed

Location:

branches/2971_named_intervals

Files:

• HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/NamedIntervalsView.cs (modified) (3 diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/NamedIntervals.cs (modified) (1 diff)

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/NamedIntervalsView.cs

@@ -65 +65 @@
       base.SetEnabledStateOfControls();
       dataGridView.Enabled = Content != null;
-      dataGridView.ReadOnly = ReadOnly;
+      //dataGridView.ReadOnly = ReadOnly;
     }
 
@@ -108 +108 @@
 
     private void dataGridView_CellValueChanged(object sender, DataGridViewCellEventArgs e) {
-      
+      var key = dataGridView.Rows[e.RowIndex].HeaderCell.Value.ToString();
+
+      if (e.ColumnIndex < 0 || e.RowIndex < 0) return;
+
+      var lowerBound = e.ColumnIndex == 0 ? double.Parse(dataGridView.Rows[e.RowIndex].Cells[e.ColumnIndex].Value.ToString()) : Content.VariableIntervals[key].LowerBound;
+      var upperBound = e.ColumnIndex == 1 ? double.Parse(dataGridView.Rows[e.RowIndex].Cells[e.ColumnIndex].Value.ToString()) : Content.VariableIntervals[key].UpperBound;
+
+      Content.VariableIntervals[key] = new Interval(lowerBound, upperBound);
     }
 
@@ -114 +121 @@
       double value;
 
+      if (dataGridView.Rows[e.RowIndex].IsNewRow) {
+        return;
+      }
+
       if (!double.TryParse(e.FormattedValue.ToString(), out value)) {
-        dataGridView.Rows[e.RowIndex].ErrorText = "Value has to be a double value";
         e.Cancel = true;
-      } else if (string.IsNullOrEmpty(e.FormattedValue.ToString())) {
-        dataGridView.Rows[e.RowIndex].ErrorText = "Value has to best";
-        e.Cancel = true;
-      } else if (double.Parse(dataGridView.Rows[e.RowIndex].Cells[0].Value.ToString()) >
-                 double.Parse(dataGridView.Rows[e.RowIndex].Cells[1].Value.ToString())) {
-        dataGridView.Rows[e.RowIndex].ErrorText = "Lower Bound of Interval has to be smaller than Upper Bound";
-        e.Cancel = true;
+        dataGridView.Rows[e.RowIndex].ErrorText = "Value must be a double value.";
+      } else {
+        if (e.ColumnIndex == 0 && value > double.Parse(dataGridView.Rows[e.RowIndex].Cells[1].Value.ToString()) ||
+            e.ColumnIndex == 1 && value < double.Parse(dataGridView.Rows[e.RowIndex].Cells[0].Value.ToString())) {
+          e.Cancel = true;
+          dataGridView.Rows[e.RowIndex].ErrorText = "Lower Bound of Interval must be smaller than Upper Bound.";
+        }
       }
+      
     }
 

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/NamedIntervals.cs

@@ -26 +26 @@
     public ObservableDictionary<string, Interval> VariableIntervals => variableIntervals;
 
+    public bool ReadOnly { get; }
+
     public bool InsertMany(IEnumerable<KeyValuePair<string, Interval>> entries) {
       if (entries == null) throw new ArgumentNullException("The given dataset is null.");