Changeset 17564 for branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4

Timestamp:

05/27/20 15:45:50 (4 years ago)

Author:

mkommend

Message:

#2971: Minor changes in interval collection and interval interpreter.

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

@@ -21 +21 @@
 
 
-using System.Linq;
 using System.Windows.Forms;
 using HeuristicLab.MainForm;
@@ -69 +68 @@
 
 
-      var variablesCount = Content.GetIntervals().Count;
+      var variablesCount = Content.Count;
 
       DataGridViewRow[] rows = new DataGridViewRow[variablesCount];
@@ -78 +77 @@
       dataGridView.Rows.AddRange(rows);
 
-      SetRowsHeader();
-      FillRows();
+      int j = 0;
+      foreach (var variableInterval in Content.GetVariableIntervals()) {
+        dataGridView.Rows[j].HeaderCell.Value = variableInterval.Item1;
+        dataGridView.Rows[j].Cells[0].Value = variableInterval.Item2.LowerBound;
+        dataGridView.Rows[j].Cells[1].Value = variableInterval.Item2.UpperBound;
+        j++;
+      }
 
       dataGridView.AutoResizeColumns(DataGridViewAutoSizeColumnsMode.AllCells);
@@ -87 +91 @@
       foreach (DataGridViewColumn column in dataGridView.Columns) {
         column.SortMode = DataGridViewColumnSortMode.NotSortable;
-      }
-    }
-
-    private void FillRows() {
-      for (var i = 0; i < dataGridView.RowCount; ++i) {
-        var key = (string)dataGridView.Rows[i].HeaderCell.Value;
-        dataGridView.Rows[i].Cells[0].Value = Content.GetInterval(key).LowerBound;
-        dataGridView.Rows[i].Cells[1].Value = Content.GetInterval(key).UpperBound;
-      }
-    }
-
-    private void SetRowsHeader() {
-      for (var i = 0; i < Content.GetIntervals().Count; ++i) {
-        var item = Content.GetIntervals().ElementAt(i);
-        dataGridView.Rows[i].HeaderCell.Value = item.Key;
       }
     }