Changeset 10847 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Timestamp:

05/14/14 13:37:28 (10 years ago)

Author:

aesterer

Message:

Added coloring feature for line chart

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Files:

• Implementations/ChartLogic.cs (modified) (4 diffs)
• Implementations/FilteredPreprocessingData.cs (modified) (1 diff)
• Implementations/PreprocessingDataTable.cs (modified) (2 diffs)
• Interfaces/IChartLogic.cs (modified) (2 diffs)

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

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using HeuristicLab.Analysis;
 using HeuristicLab.Core;
@@ -35 +36 @@
       this.preprocessingData = preprocessingData;
     }
+
+    #region IChartLogic Members
 
     public DataRow CreateDataRow(string variableName, DataRowVisualProperties.DataRowChartType chartType) {
@@ -92 +95 @@
     }
 
+    public event EventHandler SelectionChanged {
+      add { preprocessingData.SelectionChanged += value; }
+      remove { preprocessingData.SelectionChanged -= value; }
+    }
+
     public string GetVariableNameByIndex(int index) {
       return preprocessingData.GetVariableName(index);
@@ -104 +112 @@
     }
 
+    public List<DataRow> CreateAllSelectedDataRows(DataRowVisualProperties.DataRowChartType chartType) {
+      List<DataRow> dataRows = new List<DataRow>();
+      foreach (var name in GetVariableNames()) {
+        DataRow row = CreateSelectedDataRow(name, chartType);
+        if(row != null)
+          dataRows.Add(row);
+      }
+      return dataRows;
+    }
+
+    public DataRow CreateSelectedDataRow(string variableName, DataRowVisualProperties.DataRowChartType chartType) {
+      
+      IDictionary<int,IList<int>> selection = preprocessingData.GetSelection();
+      int variableIndex = preprocessingData.GetColumnIndex(variableName);
+
+      if (selection.Keys.Contains(variableIndex))
+      {
+        List<int> selectedIndices = new List<int>(selection[variableIndex]);
+        //need selection with more than 1 value
+        if(selectedIndices.Count < 2)
+          return null;
+
+        int end = selectedIndices[0];      // indices are provided in reverse order
+        int start = selectedIndices[selectedIndices.Count-1];
+
+        DataRow rowSelect = CreateDataRowRange(variableName, start, end, chartType);
+        rowSelect.VisualProperties.Color = Color.Green;
+        return rowSelect;
+      }
+      else
+       return null;
+    }
+
+    #endregion
   }
 }

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

@@ -186 +186 @@
     }
 
-    public event EventHandler SelectionChanged;
+    public event EventHandler SelectionChanged {
+      add { originalData.SelectionChanged += value; }
+      remove { originalData.SelectionChanged -= value; }
+    }
 
     #endregion

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

@@ -4 +4 @@
 using System.Text;
 using HeuristicLab.Analysis;
+using HeuristicLab.Collections;
 using HeuristicLab.Core;
 
@@ -26 +27 @@
         if (selectedRows != null) throw new InvalidOperationException("Rows already set");
         selectedRows = value;
-        //if (selectedRows != null) RegisterRowsEvents();
+        //if (selectedRows != null) RegisterSelectedRowEvents();
       }
     }
 
-
-
   }
 }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Interfaces/IChartLogic.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
 using HeuristicLab.Analysis;
@@ -32 +33 @@
     event DataPreprocessingChangedEventHandler Changed;
 
+    event EventHandler SelectionChanged;
+
     ICheckedItemList<StringValue> CreateVariableItemList();
+
+    List<DataRow> CreateAllSelectedDataRows(DataRowVisualProperties.DataRowChartType chartType);
+
+    DataRow CreateSelectedDataRow(string variableName, DataRowVisualProperties.DataRowChartType chartType);
 
     DataRow CreateDataRow(string variableName,DataRowVisualProperties.DataRowChartType chartType);