Changeset 12489 for branches/HeuristicLab.DatasetRefactor

Timestamp:

06/22/15 17:08:16 (9 years ago)

Author:

bburlacu

Message:

#2276: Made events in Dataset.cs virtual and overrode them in the ModifiableDataset class. Added event handlers for dataset changes.

Location:

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.DataAnalysis/3.4

Files:

• Dataset.cs (modified) (1 diff)
• ModifiableDataset.cs (modified) (6 diffs)

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.DataAnalysis/3.4/Dataset.cs

@@ -230 +230 @@
     }
 
-    public event EventHandler ColumnsChanged { add { } remove { } }
-    public event EventHandler RowsChanged { add { } remove { } }
-    public event EventHandler ColumnNamesChanged { add { } remove { } }
-    public event EventHandler RowNamesChanged { add { } remove { } }
-    public event EventHandler SortableViewChanged { add { } remove { } }
-    public event EventHandler<EventArgs<int, int>> ItemChanged { add { } remove { } }
-    public event EventHandler Reset { add { } remove { } }
+    public virtual event EventHandler ColumnsChanged { add { } remove { } }
+    public virtual event EventHandler RowsChanged { add { } remove { } }
+    public virtual event EventHandler ColumnNamesChanged { add { } remove { } }
+    public virtual event EventHandler RowNamesChanged { add { } remove { } }
+    public virtual event EventHandler SortableViewChanged { add { } remove { } }
+    public virtual event EventHandler<EventArgs<int, int>> ItemChanged { add { } remove { } }
+    public virtual event EventHandler Reset { add { } remove { } }
     #endregion
   }

branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.DataAnalysis/3.4/ModifiableDataset.cs

@@ -56 +56 @@
         variableValues[variableNames[i]][row] = list[i];
       }
+      OnRowsChanged();
+      OnReset();
     }
 
@@ -73 +75 @@
       }
       rows++;
+      OnRowsChanged();
+      OnReset();
     }
 
@@ -84 +88 @@
       variableValues[variableName] = new List<T>(values);
       variableNames.Add(variableName);
+      OnColumnsChanged();
+      OnColumnNamesChanged();
+      OnReset();
     }
 
@@ -91 +98 @@
       variableValues.Remove(variableName);
       variableNames.Remove(variableName);
+      OnColumnsChanged();
+      OnColumnNamesChanged();
+      OnReset();
     }
 
@@ -98 +108 @@
         list.RemoveAt(row);
       rows--;
+      OnRowsChanged();
+      OnReset();
     }
 
@@ -158 +170 @@
       return false;
     }
+
+    #region event handlers
+    public override event EventHandler RowsChanged;
+    private void OnRowsChanged() {
+      var changed = RowsChanged;
+      if (changed != null)
+        changed(this, EventArgs.Empty);
+    }
+
+    public override event EventHandler ColumnsChanged;
+    private void OnColumnsChanged() {
+      var changed = ColumnsChanged;
+      if (changed != null)
+        changed(this, EventArgs.Empty);
+    }
+
+    public override event EventHandler RowNamesChanged;
+    private void OnRowNamesChanged() {
+      var changed = RowNamesChanged;
+      if (changed != null)
+        changed(this, EventArgs.Empty);
+    }
+
+    public override event EventHandler ColumnNamesChanged;
+    private void OnColumnNamesChanged() {
+      var changed = ColumnNamesChanged;
+      if (changed != null)
+        changed(this, EventArgs.Empty);
+    }
+
+    public override event EventHandler Reset;
+    private void OnReset() {
+      var reset = Reset;
+      if (reset != null)
+        reset(this, EventArgs.Empty);
+    }
+
+    // not sure if this is really applicable in the ModifiableDataset
+    // since this is not a matrix and values are changed based on row + variableName
+    public override event EventHandler<EventArgs<int, int>> ItemChanged;
+    private void OnItemChanged(int rowIndex, int columnIndex) {
+      var changed = ItemChanged;
+      if (changed != null) {
+        changed(this, new EventArgs<int, int>(rowIndex, columnIndex));
+      }
+    }
+    #endregion
   }
 }