Changeset 10851

Timestamp:

05/14/14 14:54:41 (11 years ago)

Author:

aesterer

Message:

Added selection tag in line chart legend

Location:

branches/DataPreprocessing

Files:

• HeuristicLab.DataPreprocessing.Views/3.3/PreprocessingDataTableView.cs (modified) (4 diffs)
• HeuristicLab.DataPreprocessing/3.3/Implementations/ChartLogic.cs (modified) (1 diff)

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

@@ -107 +107 @@
       base.OnContentChanged();
       invisibleSeries.Clear();
-      //chart.Titles[0].Text = string.Empty;
       chart.ChartAreas[0].AxisX.Title = string.Empty;
       chart.ChartAreas[0].AxisY.Title = string.Empty;
@@ -113 +112 @@
       chart.Series.Clear();
       if (Content != null) {
-        //chart.Titles[0].Text = Content.Name;
+
         AddDataRows(Content.Rows);
         AddSelectedDataRows(Content.SelectedRows);
@@ -150 +149 @@
 
     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) {
           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)");
@@ -164 +178 @@
 
     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)"];

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/ChartLogic.cs

@@ -134 +134 @@
           return null;
 
-        int end = selectedIndices[0];      // indices are provided in reverse order
-        int start = selectedIndices[selectedIndices.Count-1];
+        selectedIndices.Sort();
+        int start = selectedIndices[0];     
+        int end = selectedIndices[selectedIndices.Count-1];
 
         DataRow rowSelect = CreateDataRowRange(variableName, start, end, chartType);
-        rowSelect.VisualProperties.Color = Color.Green;
         return rowSelect;
       }