Changeset 13199 for stable/HeuristicLab.Optimization.Views/3.3

Timestamp:

11/16/15 21:39:15 (8 years ago)

Author:

abeham

Message:

#2441: merged r13181, r13198 to stable

Location:

stable/HeuristicLab.Optimization.Views/3.3/RunCollectionViews

Files:

• RunCollectionChartAggregationView.cs (modified) (2 diffs)
• RunCollectionView.cs (modified) (1 diff)

stable/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionChartAggregationView.cs

@@ -80 +80 @@
         return;
       }
+      UpdateDataTableComboBox(); // will trigger AddRuns
+    }
+    private void Content_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IRun> e) {
+      if (suppressUpdates) return;
+      if (InvokeRequired) {
+        Invoke(new CollectionItemsChangedEventHandler<IRun>(Content_ItemsRemoved), sender, e);
+        return;
+      }
+      RemoveRuns(e.Items);
       UpdateDataTableComboBox();
       UpdateDataRowComboBox();
-      AddRuns(e.Items);
-    }
-    private void Content_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IRun> e) {
-      if (suppressUpdates) return;
-      if (InvokeRequired) {
-        Invoke(new CollectionItemsChangedEventHandler<IRun>(Content_ItemsRemoved), sender, e);
-        return;
-      }
+      RebuildCombinedDataTable();
+    }
+    private void Content_CollectionReset(object sender, CollectionItemsChangedEventArgs<IRun> e) {
+      if (suppressUpdates) return;
+      if (InvokeRequired) {
+        Invoke(new CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset), sender, e);
+        return;
+      }
+      RemoveRuns(e.OldItems);
       UpdateDataTableComboBox();
       UpdateDataRowComboBox();
-      RemoveRuns(e.Items);
-    }
-    private void Content_CollectionReset(object sender, CollectionItemsChangedEventArgs<IRun> e) {
-      if (suppressUpdates) return;
-      if (InvokeRequired) {
-        Invoke(new CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset), sender, e);
-        return;
-      }
-      UpdateDataTableComboBox();
-      UpdateDataRowComboBox();
-      RemoveRuns(e.OldItems);
-      AddRuns(e.Items);
+      RebuildCombinedDataTable();
     }
     private void Content_AlgorithmNameChanged(object sender, EventArgs e) {
@@ -117 +116 @@
       suppressUpdates = Content.UpdateOfRunsInProgress;
       if (!suppressUpdates) {
+        foreach (var run in runMapping)
+          DeregisterRunEvents(run.Key);
+        runMapping.Clear();
+        combinedDataTable.Rows.Clear();
         UpdateDataTableComboBox();
-        UpdateDataRowComboBox();
-        UpdateRuns(Content);
       }
     }

stable/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionView.cs

@@ -389 +389 @@
         return;
       ReadOnly = true;
+
       try {
+        RunCollection.UpdateOfRunsInProgress = true;
         RunCollection.Modify();
       } finally {
         ReadOnly = false;
+        RunCollection.UpdateOfRunsInProgress = false;
       }
     }