Changeset 10581

Timestamp:

03/12/14 15:53:38 (10 years ago)

Author:

tsteinre

Message:

• removed index workaround in PreprocessingData Undo-Feature event handling.

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations

Files:

• HistogramLogic.cs (modified) (1 diff)
• LineChartLogic.cs (modified) (1 diff)
• PreprocessingData.cs (modified) (2 diffs)

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

@@ -84 +84 @@
     }
 
+    //TODO: refactor: possible code duplication with LineChartLogic
     void PreprocessingData_Changed(object sender, DataPreprocessingChangedEventArgs e) {
-      var variableName = preprocessingData.GetVariableName(e.Column);
       switch (e.Type) {
         case DataPreprocessingChangedEventType.DeleteColumn:
-          dataTable.Rows.Remove(variableName);
+          dataTable.Rows.Remove(preprocessingData.GetVariableName(e.Column));
           break;
         case DataPreprocessingChangedEventType.AddColumn:
-          dataTable.Rows.Add(new DataRow(variableName, String.Empty, preprocessingData.GetValues<double>(e.Column)));
+          dataTable.Rows.Add(new DataRow(preprocessingData.GetVariableName(e.Column), 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)));
+          dataTable.Rows.Remove(preprocessingData.GetVariableName(e.Column));
+          dataTable.Rows.Add(new DataRow(preprocessingData.GetVariableName(e.Column), String.Empty, preprocessingData.GetValues<double>(e.Column)));
           break;
         case DataPreprocessingChangedEventType.DeleteRow:

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

@@ -82 +82 @@
     }
 
+    //TODO: refactor: possible code duplication with HistogramLogic
     void PreprocessingData_Changed(object sender, DataPreprocessingChangedEventArgs e) {
-      var variableName = preprocessingData.GetVariableName(e.Column);
       switch (e.Type) {
         case DataPreprocessingChangedEventType.DeleteColumn:
-          dataTable.Rows.Remove(variableName);
+          dataTable.Rows.Remove(preprocessingData.GetVariableName(e.Column));
           break;
         case DataPreprocessingChangedEventType.AddColumn:
-          dataTable.Rows.Add(new DataRow(variableName, String.Empty, preprocessingData.GetValues<double>(e.Column)));
+          dataTable.Rows.Add(new DataRow(preprocessingData.GetVariableName(e.Column), 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)));
+          dataTable.Rows.Remove(preprocessingData.GetVariableName(e.Column));
+          dataTable.Rows.Add(new DataRow(preprocessingData.GetVariableName(e.Column), String.Empty, preprocessingData.GetValues<double>(e.Column)));
           break;
         case DataPreprocessingChangedEventType.DeleteRow:

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

@@ -278 +278 @@
 
     public void BeginTransaction() {
-      SaveSnapshot(DataPreprocessingChangedEventType.Any, 0, 0); //TODO: fix event handling, so that the ints can be -1, -1
+      SaveSnapshot(DataPreprocessingChangedEventType.Any, -1, -1);
       transactionDepth++;
     }
@@ -287 +287 @@
         throw new InvalidOperationException("There is no open transaction that can be ended.");
       if (transactionDepth == 0)
-        OnChanged(DataPreprocessingChangedEventType.Any, 0, 0); //TODO: fix event handling, so that the ints can be -1, -1
+        OnChanged(DataPreprocessingChangedEventType.Any, -1, -1);
     }