Changeset 12826

Timestamp:

08/02/15 10:56:34 (9 years ago)

Author:

abeham

Message:

#2431: omitting empty series

File:

• branches/PerformanceComparison/HeuristicLab.Analysis.Views/3.3/IndexedDataTableView.cs (modified) (5 diffs)

branches/PerformanceComparison/HeuristicLab.Analysis.Views/3.3/IndexedDataTableView.cs

@@ -153 +153 @@
     /// <param name="row">DataRow to add as series to the chart.</param>
     protected virtual void AddDataRow(IndexedDataRow<T> row) {
+      if (row.Values.Count == 0) return;
+
       Series series = new Series(row.Name);
       if (row.VisualProperties.DisplayName.Trim() != String.Empty) series.LegendText = row.VisualProperties.DisplayName;
@@ -306 +308 @@
     /// <param name="row">DataRow which series should be removed.</param>
     protected virtual void RemoveDataRow(IndexedDataRow<T> row) {
+      if (chart.Series.All(x => x.Name != row.Name)) return;
       Series series = chart.Series[row.Name];
       chart.Series.Remove(series);
@@ -419 +422 @@
             UpdateYCursorInterval();
           }
-        }
+        } else AddDataRow((IndexedDataRow<T>)sender);
       }
     }
@@ -425 +428 @@
       if (InvokeRequired)
         Invoke(new CollectionItemsChangedEventHandler<IndexedItem<Tuple<T, double>>>(Values_ItemsRemoved), sender, e);
+      else {
+        IndexedDataRow<T> row = null;
+        valuesRowsTable.TryGetValue((IObservableList<Tuple<T, double>>)sender, out row);
+        if (row != null) {
+          if (row.Values.Count == 0) {
+            RemoveDataRow(row);
+          } else {
+            Series rowSeries = chart.Series[row.Name];
+            if (!invisibleSeries.Contains(rowSeries)) {
+              rowSeries.Points.Clear();
+              FillSeriesWithRowValues(rowSeries, row);
+              RecalculateAxesScale(chart.ChartAreas[0]);
+              UpdateYCursorInterval();
+            }
+          }
+        }
+      }
+    }
+    private void Values_ItemsReplaced(object sender, CollectionItemsChangedEventArgs<IndexedItem<Tuple<T, double>>> e) {
+      if (InvokeRequired)
+        Invoke(new CollectionItemsChangedEventHandler<IndexedItem<Tuple<T, double>>>(Values_ItemsReplaced), sender, e);
+      else {
+        IndexedDataRow<T> row = null;
+        valuesRowsTable.TryGetValue((IObservableList<Tuple<T, double>>)sender, out row);
+        if (row != null) {
+          if (row.Values.Count == 0) {
+            RemoveDataRow(row);
+          } else {
+            Series rowSeries = chart.Series[row.Name];
+            if (!invisibleSeries.Contains(rowSeries)) {
+              if (row.VisualProperties.ChartType == DataRowVisualProperties.DataRowChartType.Histogram) {
+                rowSeries.Points.Clear();
+                FillSeriesWithRowValues(rowSeries, row);
+              } else {
+                foreach (IndexedItem<Tuple<T, double>> item in e.Items) {
+                  rowSeries.Points[item.Index].SetValueXY(item.Value.Item1, item.Value.Item2);
+                }
+              }
+              RecalculateAxesScale(chart.ChartAreas[0]);
+              UpdateYCursorInterval();
+            }
+          }
+        }
+      }
+    }
+    private void Values_ItemsMoved(object sender, CollectionItemsChangedEventArgs<IndexedItem<Tuple<T, double>>> e) {
+      if (InvokeRequired)
+        Invoke(new CollectionItemsChangedEventHandler<IndexedItem<Tuple<T, double>>>(Values_ItemsMoved), sender, e);
       else {
         IndexedDataRow<T> row = null;
@@ -439 +490 @@
       }
     }
-    private void Values_ItemsReplaced(object sender, CollectionItemsChangedEventArgs<IndexedItem<Tuple<T, double>>> e) {
-      if (InvokeRequired)
-        Invoke(new CollectionItemsChangedEventHandler<IndexedItem<Tuple<T, double>>>(Values_ItemsReplaced), sender, e);
+
+    private void Values_CollectionReset(object sender, CollectionItemsChangedEventArgs<IndexedItem<Tuple<T, double>>> e) {
+      if (InvokeRequired)
+        Invoke(new CollectionItemsChangedEventHandler<IndexedItem<Tuple<T, double>>>(Values_CollectionReset), sender, e);
       else {
         IndexedDataRow<T> row = null;
         valuesRowsTable.TryGetValue((IObservableList<Tuple<T, double>>)sender, out row);
         if (row != null) {
-          Series rowSeries = chart.Series[row.Name];
-          if (!invisibleSeries.Contains(rowSeries)) {
-            if (row.VisualProperties.ChartType == DataRowVisualProperties.DataRowChartType.Histogram) {
+          if (row.Values.Count == 0) {
+            RemoveDataRow(row);
+          } else {
+            Series rowSeries = chart.Series[row.Name];
+            if (!invisibleSeries.Contains(rowSeries)) {
               rowSeries.Points.Clear();
               FillSeriesWithRowValues(rowSeries, row);
-            } else {
-              foreach (IndexedItem<Tuple<T, double>> item in e.Items) {
-                rowSeries.Points[item.Index].SetValueXY(item.Value.Item1, item.Value.Item2);
-              }
+              RecalculateAxesScale(chart.ChartAreas[0]);
+              UpdateYCursorInterval();
             }
-            RecalculateAxesScale(chart.ChartAreas[0]);
-            UpdateYCursorInterval();
-          }
-        }
-      }
-    }
-    private void Values_ItemsMoved(object sender, CollectionItemsChangedEventArgs<IndexedItem<Tuple<T, double>>> e) {
-      if (InvokeRequired)
-        Invoke(new CollectionItemsChangedEventHandler<IndexedItem<Tuple<T, double>>>(Values_ItemsMoved), sender, e);
-      else {
-        IndexedDataRow<T> row = null;
-        valuesRowsTable.TryGetValue((IObservableList<Tuple<T, double>>)sender, out row);
-        if (row != null) {
-          Series rowSeries = chart.Series[row.Name];
-          if (!invisibleSeries.Contains(rowSeries)) {
-            rowSeries.Points.Clear();
-            FillSeriesWithRowValues(rowSeries, row);
-            RecalculateAxesScale(chart.ChartAreas[0]);
-            UpdateYCursorInterval();
-          }
-        }
-      }
-    }
-
-    private void Values_CollectionReset(object sender, CollectionItemsChangedEventArgs<IndexedItem<Tuple<T, double>>> e) {
-      if (InvokeRequired)
-        Invoke(new CollectionItemsChangedEventHandler<IndexedItem<Tuple<T, double>>>(Values_CollectionReset), sender, e);
-      else {
-        IndexedDataRow<T> row = null;
-        valuesRowsTable.TryGetValue((IObservableList<Tuple<T, double>>)sender, out row);
-        if (row != null) {
-          Series rowSeries = chart.Series[row.Name];
-          if (!invisibleSeries.Contains(rowSeries)) {
-            rowSeries.Points.Clear();
-            FillSeriesWithRowValues(rowSeries, row);
-            RecalculateAxesScale(chart.ChartAreas[0]);
-            UpdateYCursorInterval();
           }
         }