Changeset 11345 for trunk/sources/HeuristicLab.Optimization

Timestamp:

09/05/14 10:38:42 (10 years ago)

Author:

abeham

Message:

#2120: fixed event handling

File:

• trunk/sources/HeuristicLab.Optimization/3.3/RunCollection.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.Optimization/3.3/RunCollection.cs

@@ -237 +237 @@
       IObservableDictionary<string, IItem> dict = run.Parameters;
       dict.ItemsAdded += RunOnParameterChanged;
-      dict.ItemsRemoved += RunOnParameterChanged;
+      dict.ItemsRemoved += RunOnParameterRemoved;
       dict.ItemsReplaced += RunOnParameterChanged;
       dict.CollectionReset += RunOnParameterChanged;
@@ -245 +245 @@
       IObservableDictionary<string, IItem> dict = run.Results;
       dict.ItemsAdded += RunOnResultChanged;
-      dict.ItemsRemoved += RunOnResultChanged;
+      dict.ItemsRemoved += RunOnResultRemoved;
       dict.ItemsReplaced += RunOnResultChanged;
       dict.CollectionReset += RunOnResultChanged;
@@ -253 +253 @@
       IObservableDictionary<string, IItem> dict = run.Parameters;
       dict.ItemsAdded -= RunOnParameterChanged;
-      dict.ItemsRemoved -= RunOnParameterChanged;
+      dict.ItemsRemoved -= RunOnParameterRemoved;
       dict.ItemsReplaced -= RunOnParameterChanged;
       dict.CollectionReset -= RunOnParameterChanged;
@@ -261 +261 @@
       IObservableDictionary<string, IItem> dict = run.Results;
       dict.ItemsAdded -= RunOnResultChanged;
-      dict.ItemsRemoved -= RunOnResultChanged;
+      dict.ItemsRemoved -= RunOnResultRemoved;
       dict.ItemsReplaced -= RunOnResultChanged;
       dict.CollectionReset -= RunOnResultChanged;
@@ -280 +280 @@
     }
 
+    private void RunOnParameterRemoved(object sender, CollectionItemsChangedEventArgs<KeyValuePair<string, IItem>> e) {
+      bool columnsChanged = false;
+      foreach (var param in e.Items)
+        columnsChanged |= RemoveParameterName(param.Key);
+      if (columnsChanged) columnNameCache = null;
+      OnReset();
+      if (columnsChanged) {
+        OnColumnsChanged();
+        OnColumnNamesChanged();
+      }
+    }
+
     private void RunOnResultChanged(object sender, CollectionItemsChangedEventArgs<KeyValuePair<string, IItem>> e) {
       bool columnsChanged = false;
@@ -285 +297 @@
         columnsChanged |= AddResult(result.Key, result.Value);
       foreach (var result in e.OldItems)
+        columnsChanged |= RemoveResultName(result.Key);
+      if (columnsChanged) columnNameCache = null;
+      OnReset();
+      if (columnsChanged) {
+        OnColumnsChanged();
+        OnColumnNamesChanged();
+      }
+    }
+
+    private void RunOnResultRemoved(object sender, CollectionItemsChangedEventArgs<KeyValuePair<string, IItem>> e) {
+      bool columnsChanged = false;
+      foreach (var result in e.Items)
         columnsChanged |= RemoveResultName(result.Key);
       if (columnsChanged) columnNameCache = null;