Changeset 17565

Timestamp:

05/28/20 09:35:39 (5 years ago)

Author:

chaider

Message:

#2971 fixed bug in gridview in IntervalCollectionView

File:

• branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/IntervalCollectionView.cs (modified) (4 diffs)

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/IntervalCollectionView.cs

@@ -22 +22 @@
 
 using System.Windows.Forms;
+using HeuristicLab.Common;
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
@@ -77 +78 @@
       dataGridView.Rows.AddRange(rows);
 
-      int j = 0;
+      var j = 0;
       foreach (var variableInterval in Content.GetVariableIntervals()) {
         dataGridView.Rows[j].HeaderCell.Value = variableInterval.Item1;
@@ -100 +101 @@
 
     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.GetInterval(key).LowerBound;
-      var upperBound = e.ColumnIndex == 1 ? double.Parse(dataGridView.Rows[e.RowIndex].Cells[e.ColumnIndex].Value.ToString()) : Content.GetInterval(key).UpperBound;
+      var key = dataGridView.Rows[e.RowIndex].HeaderCell.Value.ToString();
+      var gridData = dataGridView[e.ColumnIndex, e.RowIndex].Value;
+      //Cells maybe null during initialization
+      var lowerBound = Content.GetInterval(key).LowerBound;
+      var upperBound = Content.GetInterval(key).UpperBound;
+
+      //Check if the input data is a string (user-defined input)
+      //if so parse the toString() of the value, otherwise do a hard-cast
+      //to not loose the double precision
+      double parsedValue;
+      if (gridData is string) {
+        parsedValue = double.Parse(gridData.ToString());
+      } else {
+        parsedValue = (double) gridData;
+      }
+
+      if (e.ColumnIndex == 0) lowerBound = parsedValue;
+      if (e.ColumnIndex == 1) upperBound = parsedValue;
+
+      var newInterval = new Interval(lowerBound, upperBound);
 
       // update if there was a change
-      if (lowerBound != Content.GetInterval(key).LowerBound ||
-        upperBound != Content.GetInterval(key).UpperBound)
-        Content.SetInterval(key, new Interval(lowerBound, upperBound));
+      if (!Content.GetInterval(key).Equals(newInterval))
+        Content.SetInterval(key, newInterval);
     }
 
@@ -118 +134 @@
         dataGridView.Rows[e.RowIndex].ErrorText = "Value must be a double value.";
         return;
-      } else {
-        var lowerBound = double.Parse(dataGridView.Rows[e.RowIndex].Cells[0].Value.ToString());
-        var upperBound = double.Parse(dataGridView.Rows[e.RowIndex].Cells[1].Value.ToString());
-        if (e.ColumnIndex == 1 && value < lowerBound || e.ColumnIndex == 0 && value > upperBound) {
-          e.Cancel = true;
-          dataGridView.Rows[e.RowIndex].ErrorText = "Lower bound of interval must be smaller than upper bound.";
-        }
       }
+
+      var lowerBound = double.Parse(dataGridView.Rows[e.RowIndex].Cells[0].Value.ToString());
+      var upperBound = double.Parse(dataGridView.Rows[e.RowIndex].Cells[1].Value.ToString());
+      
+      if (e.ColumnIndex == 0 && value > upperBound || e.ColumnIndex == 1 && value < lowerBound) {
+        e.Cancel = true;
+        dataGridView.Rows[e.RowIndex].ErrorText = "Lower bound of interval must be smaller than upper bound.";
+        return;
+      }
+
+      dataGridView[e.ColumnIndex, e.RowIndex].Value = value;
     }