Changeset 10544

Timestamp:

03/05/14 15:43:46 (11 years ago)

Author:

sbreuer

Message:

• created changed event in preprocessing data
• register to event in line chart

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Files:

• HeuristicLab.DataPreprocessing-3.3.csproj (modified) (1 diff)
• Implementations/DataPreprocessingChangedEvent.cs (added)
• Implementations/LineChartLogic.cs (modified) (3 diffs)
• Implementations/PreprocessingData.cs (modified) (8 diffs)
• Interfaces/IPreprocessingData.cs (modified) (1 diff)
• Views/LineChartView.cs (modified) (1 diff)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/HeuristicLab.DataPreprocessing-3.3.csproj

@@ -78 +78 @@
   <ItemGroup>
     <Compile Include="Implementations\DataGridLogic.cs" />
+    <Compile Include="Implementations\DataPreprocessingChangedEvent.cs" />
     <Compile Include="Implementations\ManipulationLogic.cs" />
     <Compile Include="Interfaces\IDataGridLogic.cs" />

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

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
 using HeuristicLab.Analysis;
@@ -32 +33 @@
       dataTable = new DataTable("LineChart");
       FillDataTable();
+      preprocessingData.Changed += PreprocessingData_Changed;
     }
 
@@ -77 +79 @@
     }
 
+    void PreprocessingData_Changed(object sender, DataPreprocessingChangedEventArgs e) {
+      var variableName = preprocessingData.GetVariableName(e.Column);
+      switch (e.Type) {
+        case DataPreprocessingChangedEventType.DeleteColumn:
+          dataTable.Rows.Remove(variableName);
+          break;
+        case DataPreprocessingChangedEventType.AddColumn:
+          dataTable.Rows.Add(new DataRow(variableName, String.Empty, preprocessingData.GetValues<double>(e.Column)));
+          break;
+        case DataPreprocessingChangedEventType.ChangeColumn:
+        case DataPreprocessingChangedEventType.ChangeItem:
+          dataTable.Rows.Remove(variableName);
+          dataTable.Rows.Add(new DataRow(variableName, String.Empty, preprocessingData.GetValues<double>(e.Column)));
+          break;
+        case DataPreprocessingChangedEventType.DeleteRow:
+        case DataPreprocessingChangedEventType.AddRow:
+          dataTable.Rows.Clear();
+          FillDataTable();
+          break;
+      }
+    }
   }
 }

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

@@ -103 +103 @@
     public void SetCell<T>(int columnIndex, int rowIndex, T value) {
       variableValues[columnIndex][rowIndex] = value;
+      OnChanged(DataPreprocessingChangedEventType.ChangeItem, columnIndex, rowIndex);
     }
 
@@ -112 +113 @@
     public string GetCellAsString(int columnIndex, int rowIndex) {
       return variableValues[columnIndex][rowIndex].ToString();
-
     }
 
@@ -127 +127 @@
     public void SetValues<T>(string variableName, IList<T> values) {
       SetValues<T>(GetColumnIndex(variableName), values);
-
-    }
+    }
+
     public void SetValues<T>(int columnIndex, IList<T> values) {
       if (IsType<T>(columnIndex)) {
@@ -135 +135 @@
         throw new ArgumentException("The datatype of column " + columnIndex + " must be of type " + variableValues[columnIndex].GetType().Name + " but was " + typeof(T).Name);
       }
+      OnChanged(DataPreprocessingChangedEventType.ChangeColumn, columnIndex, -1);
     }
 
@@ -140 +141 @@
       foreach (IList column in variableValues.Values) {
         Type type = column.GetType().GetGenericArguments()[0];
-
         column.Insert(rowIndex, type.IsValueType ? Activator.CreateInstance(type) : null);
       }
+      OnChanged(DataPreprocessingChangedEventType.AddRow, -1, rowIndex);
     }
 
@@ -149 +150 @@
         column.RemoveAt(rowIndex);
       }
+      OnChanged(DataPreprocessingChangedEventType.DeleteRow, -1, rowIndex);
     }
 
     public void InsertColumn<T>(string variableName, int columnIndex) {
       variableValues.Add(columnIndex, new List<T>(Rows));
-      variableNames.Insert(columnIndex, variableName);
+      variableNames.Insert(columnIndex, variableName); 
+      OnChanged(DataPreprocessingChangedEventType.AddColumn, columnIndex , -1);
     }
 
@@ -159 +162 @@
       variableValues.Remove(columnIndex);
       variableNames.RemoveAt(columnIndex);
+      OnChanged(DataPreprocessingChangedEventType.DeleteColumn, columnIndex, -1);
     }
 
@@ -212 +216 @@
       var dataset = new Dataset(variableNames, values);
       return dataset;
+    }
+
+    public event DataPreprocessingChangedEventHandler Changed;
+    protected virtual void OnChanged(DataPreprocessingChangedEventType type, int column, int row) {
+      var listeners = Changed;
+      if (listeners != null) listeners(this, new DataPreprocessingChangedEventArgs(type, column, row));
     }
 

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

@@ -74 +74 @@
 
     Dataset ExportToDataset();
+
+    event DataPreprocessingChangedEventHandler Changed;
   }
 }

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

@@ -35 +35 @@
     }
 
-    private void InitDataTable() {
+    private void InitDataTable() { 
       ILineChartLogic logic = Content.LineChartLogic;
       viewHost.Content = logic.GetDataTable();