Changeset 5995 for branches/histogram/HeuristicLab.Analysis.Views/3.3/AggregatedHistogramHistoryView.cs

Timestamp:

04/09/11 14:48:19 (13 years ago)

Author:

abeham

Message:

#1465

• Changed HistogramHistory to derive from CheckedItemList<T> instead of ItemCollection<T>
• Changed AggregatedHistogramHistoryView to aggregate only checked entries

File:

• branches/histogram/HeuristicLab.Analysis.Views/3.3/AggregatedHistogramHistoryView.cs (modified) (4 diffs)

branches/histogram/HeuristicLab.Analysis.Views/3.3/AggregatedHistogramHistoryView.cs

@@ -43 +43 @@
 
     protected override void DeregisterContentEvents() {
-      Content.ItemsAdded -= new CollectionItemsChangedEventHandler<Histogram>(Content_ItemsAdded);
-      Content.ItemsRemoved -= new CollectionItemsChangedEventHandler<Histogram>(Content_ItemsRemoved);
-      Content.CollectionReset -= new CollectionItemsChangedEventHandler<Histogram>(Content_CollectionReset);
+      Content.ItemsAdded -= new CollectionItemsChangedEventHandler<IndexedItem<Histogram>>(Content_ItemsAdded);
+      Content.ItemsRemoved -= new CollectionItemsChangedEventHandler<IndexedItem<Histogram>>(Content_ItemsRemoved);
+      Content.CollectionReset -= new CollectionItemsChangedEventHandler<IndexedItem<Histogram>>(Content_CollectionReset);
+      Content.CheckedItemsChanged -= new CollectionItemsChangedEventHandler<IndexedItem<Histogram>>(Content_CheckedItemsChanged);
       foreach (Histogram h in Content) {
         DeregisterHistogramEvents(h);
@@ -60 +61 @@
     protected override void RegisterContentEvents() {
       base.RegisterContentEvents();
-      Content.ItemsAdded += new CollectionItemsChangedEventHandler<Histogram>(Content_ItemsAdded);
-      Content.ItemsRemoved += new CollectionItemsChangedEventHandler<Histogram>(Content_ItemsRemoved);
-      Content.CollectionReset += new CollectionItemsChangedEventHandler<Histogram>(Content_CollectionReset);
+      Content.ItemsAdded += new CollectionItemsChangedEventHandler<IndexedItem<Histogram>>(Content_ItemsAdded);
+      Content.ItemsRemoved += new CollectionItemsChangedEventHandler<IndexedItem<Histogram>>(Content_ItemsRemoved);
+      Content.CollectionReset += new CollectionItemsChangedEventHandler<IndexedItem<Histogram>>(Content_CollectionReset);
+      Content.CheckedItemsChanged += new CollectionItemsChangedEventHandler<IndexedItem<Histogram>>(Content_CheckedItemsChanged);
       foreach (Histogram h in Content) {
         RegisterHistogramEvents(h);
@@ -84 +86 @@
       InitializeHistogram();
     }
-    private void Content_ItemsAdded(object sender, CollectionItemsChangedEventArgs<Histogram> e) {
+    private void Content_CheckedItemsChanged(object sender, CollectionItemsChangedEventArgs<IndexedItem<Histogram>> e) {
+      InitializeHistogram();
+    }
+    private void Content_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IndexedItem<Histogram>> e) {
       List<double> added = new List<double>();
-      foreach (Histogram h in e.Items) {
-        RegisterHistogramEvents(h);
-        added.AddRange(h.Values);
+      foreach (IndexedItem<Histogram> h in e.Items) {
+        RegisterHistogramEvents(h.Value);
+        added.AddRange(h.Value.Values);
       }
       histogramControl.AddPoints(added);
     }
-    private void Content_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<Histogram> e) {
-      foreach (Histogram h in e.Items) {
-        DeregisterHistogramEvents(h);
+    private void Content_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IndexedItem<Histogram>> e) {
+      foreach (IndexedItem<Histogram> h in e.Items) {
+        DeregisterHistogramEvents(h.Value);
       }
       InitializeHistogram();
     }
-    private void Content_CollectionReset(object sender, CollectionItemsChangedEventArgs<Histogram> e) {
-      foreach (Histogram h in e.OldItems) {
-        DeregisterHistogramEvents(h);
+    private void Content_CollectionReset(object sender, CollectionItemsChangedEventArgs<IndexedItem<Histogram>> e) {
+      foreach (IndexedItem<Histogram> h in e.OldItems) {
+        DeregisterHistogramEvents(h.Value);
       }
       InitializeHistogram();
@@ -123 +128 @@
       if (Content == null) return;
       histogramControl.ClearPoints();
-      var points = Content.SelectMany(x => x.Values);
+      var points = Content.CheckedItems.SelectMany(x => x.Value.Values);
       histogramControl.AddPoints(points);
     }