Changeset 10868 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views

Timestamp:

05/21/14 11:43:10 (10 years ago)

Author:

aesterer

Message:

Removed selection from histogram

File:

• branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/PreprocessingDataTableView.cs (modified) (2 diffs)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/PreprocessingDataTableView.cs

@@ -177 +177 @@
     protected virtual void AddSelectedDataRows(IEnumerable<DataRow> rows) {
 
-      // add dummy series for selction entry in legend
-      if (rows.Count() > 0 && chart.Series.FindByName("(Selection)") == null)
-      {
-        Series series = new Series("(Selection)");
-        series.IsVisibleInLegend = true;
-        series.Color = Color.Green;
-        series.BorderWidth = 1;
-        series.BorderDashStyle = ChartDashStyle.Solid;
-        series.BorderColor = Color.Empty;
-        series.ChartType = SeriesChartType.FastLine;
-        chart.Series.Add(series);
-
-      }
-
-      foreach (var row in rows) {
-        if (row.VisualProperties.ChartType == DataRowVisualProperties.DataRowChartType.Line) {
+      // only paint selection for line chart
+      if (rows.Count() > 0 && rows.ElementAt(0).VisualProperties.ChartType == DataRowVisualProperties.DataRowChartType.Line)
+      {
+        // add dummy series for selction entry in legend
+        if (rows.Count() > 0 && chart.Series.FindByName("(Selection)") == null) {
+          Series series = new Series("(Selection)");
+          series.IsVisibleInLegend = true;
+          series.Color = Color.Green;
+          series.BorderWidth = 1;
+          series.BorderDashStyle = ChartDashStyle.Solid;
+          series.BorderColor = Color.Empty;
+          series.ChartType = SeriesChartType.FastLine;
+          chart.Series.Add(series);
+        }
+
+        foreach (var row in rows) {
           row.VisualProperties.IsVisibleInLegend = false;
           row.VisualProperties.Color = Color.Green;
           //add selected to name in order to avoid naming conflict
-          var series = new Series(row.Name+"(Selected)");
+          var series = new Series(row.Name + "(Selected)");
           ConfigureSeries(series, row);
           FillSeriesWithRowValues(series, row);
 
-          if (classification == null)
-          {
+          if (classification == null) {
             chart.Series.Add(series);
           }
-
         }
       }
@@ -211 +209 @@
     protected virtual void RemoveSelectedDataRows(IEnumerable<DataRow> rows) {
 
-      //remove selection entry in legend
-      if (Content.SelectedRows.Count == 0) {
-        Series series = chart.Series["(Selection)"];
-        chart.Series.Remove(series);
-      }
-
-      foreach (var row in rows) {
-        Series series = chart.Series[row.Name + "(Selected)"];
-        chart.Series.Remove(series);
+      // only remove selection for line chart
+      if (rows.Count() > 0 && rows.ElementAt(0).VisualProperties.ChartType == DataRowVisualProperties.DataRowChartType.Line) 
+      {
+        //remove selection entry in legend
+        if (Content.SelectedRows.Count == 0) {
+          Series series = chart.Series["(Selection)"];
+          chart.Series.Remove(series);
+        }
+
+        foreach (var row in rows) {
+          Series series = chart.Series[row.Name + "(Selected)"];
+          chart.Series.Remove(series);
+        }
       }
     }