Changeset 7977

Timestamp:

06/11/12 09:02:04 (11 months ago)

Author:

mkommend

Message:

#1869: Added methods to handle collection of data rows in DataTableView.

File:

• trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableView.cs (modified) (7 diffs)

trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableView.cs

@@ -104 +104 @@
       if (Content != null) {
         chart.Titles[0].Text = Content.Name;
-        foreach (DataRow row in Content.Rows)
-          AddDataRow(row);
+        AddDataRows(Content.Rows);
         ConfigureChartArea(chart.ChartAreas[0]);
         RecalculateAxesScale(chart.ChartAreas[0]);
@@ -123 +122 @@
       } else MessageBox.Show("Nothing to configure.");
     }
-
-    protected virtual void AddDataRow(DataRow row) {
-      Series series = new Series(row.Name);
-      if (row.VisualProperties.DisplayName.Trim() != String.Empty) series.LegendText = row.VisualProperties.DisplayName;
-      else series.LegendText = row.Name;
-      ConfigureSeries(series, row);
-      FillSeriesWithRowValues(series, row);
-
-      chart.Series.Add(series);
+    protected virtual void AddDataRows(IEnumerable<DataRow> rows) {
+      foreach (var row in rows) {
+        RegisterDataRowEvents(row);
+        Series series = new Series(row.Name);
+        if (row.VisualProperties.DisplayName.Trim() != String.Empty) series.LegendText = row.VisualProperties.DisplayName;
+        else series.LegendText = row.Name;
+        ConfigureSeries(series, row);
+        FillSeriesWithRowValues(series, row);
+        chart.Series.Add(series);
+      }
       ConfigureChartArea(chart.ChartAreas[0]);
       RecalculateAxesScale(chart.ChartAreas[0]);
@@ -265 +265 @@
     }
 
-
-    protected virtual void RemoveDataRow(DataRow row) {
-      Series series = chart.Series[row.Name];
-      chart.Series.Remove(series);
-      if (invisibleSeries.Contains(series))
-        invisibleSeries.Remove(series);
+    protected virtual void RemoveDataRows(IEnumerable<DataRow> rows) {
+      foreach (var row in rows) {
+        DeregisterDataRowEvents(row);
+        Series series = chart.Series[row.Name];
+        chart.Series.Remove(series);
+        if (invisibleSeries.Contains(series))
+          invisibleSeries.Remove(series);
+      }
       RecalculateAxesScale(chart.ChartAreas[0]);
     }
@@ -298 +300 @@
         Invoke(new CollectionItemsChangedEventHandler<DataRow>(Rows_ItemsAdded), sender, e);
       else {
-        foreach (DataRow row in e.Items) {
-          AddDataRow(row);
-          RegisterDataRowEvents(row);
-        }
+        AddDataRows(e.Items);
       }
     }
@@ -308 +307 @@
         Invoke(new CollectionItemsChangedEventHandler<DataRow>(Rows_ItemsRemoved), sender, e);
       else {
-        foreach (DataRow row in e.Items) {
-          DeregisterDataRowEvents(row);
-          RemoveDataRow(row);
-        }
+        RemoveDataRows(e.Items);
       }
     }
@@ -318 +314 @@
         Invoke(new CollectionItemsChangedEventHandler<DataRow>(Rows_ItemsReplaced), sender, e);
       else {
-        foreach (DataRow row in e.OldItems) {
-          DeregisterDataRowEvents(row);
-          RemoveDataRow(row);
-        }
-        foreach (DataRow row in e.Items) {
-          AddDataRow(row);
-          RegisterDataRowEvents(row);
-        }
+        RemoveDataRows(e.OldItems);
+        AddDataRows(e.Items);
       }
     }
@@ -332 +322 @@
         Invoke(new CollectionItemsChangedEventHandler<DataRow>(Rows_CollectionReset), sender, e);
       else {
-        foreach (DataRow row in e.OldItems) {
-          DeregisterDataRowEvents(row);
-          RemoveDataRow(row);
-        }
-        foreach (DataRow row in e.Items) {
-          AddDataRow(row);
-          RegisterDataRowEvents(row);
-        }
+        RemoveDataRows(e.OldItems);
+        AddDataRows(e.Items);
       }
     }