Changeset 12983 for trunk/sources/HeuristicLab.DataPreprocessing

Timestamp:

10/06/15 16:41:59 (9 years ago)

Author:

pfleck

Message:

#2486
Allows pasting of multiple values that extend the current data limits (rows and/or columns).
In case, additional rows and columns are added with the default value of the column's type.

Location:

trunk/sources/HeuristicLab.DataPreprocessing/3.4

Files:

• Implementations/DataGridContent.cs (modified) (2 diffs)
• Implementations/TransactionalPreprocessingData.cs (modified) (3 diffs)
• ProblemDataCreator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.DataPreprocessing/3.4/Implementations/DataGridContent.cs

@@ -75 +75 @@
       }
       set {
-        //not supported
+        throw new NotSupportedException();
       }
     }
@@ -84 +84 @@
       }
       set {
-        //not supported
+        throw new NotSupportedException();
       }
     }

trunk/sources/HeuristicLab.DataPreprocessing/3.4/Implementations/TransactionalPreprocessingData.cs

@@ -98 +98 @@
     public override void SetCell<T>(int columnIndex, int rowIndex, T value) {
       SaveSnapshot(DataPreprocessingChangedEventType.ChangeItem, columnIndex, rowIndex);
+
+      for (int i = Rows; i <= rowIndex; i++)
+        InsertRow(i);
+      for (int i = Columns; i <= columnIndex; i++)
+        InsertColumn<T>(i.ToString(), i);
+
       variableValues[columnIndex][rowIndex] = value;
       if (!IsInTransaction)
@@ -116 +122 @@
 
     public override bool VariableHasType<T>(int columnIndex) {
-      return variableValues[columnIndex] is List<T>;
+      return columnIndex >= variableValues.Count || variableValues[columnIndex] is List<T>;
     }
 
@@ -242 +248 @@
     public override void InsertColumn<T>(string variableName, int columnIndex) {
       SaveSnapshot(DataPreprocessingChangedEventType.DeleteColumn, columnIndex, -1);
-      variableValues.Insert(columnIndex, new List<T>(Rows));
+      variableValues.Insert(columnIndex, new List<T>(Enumerable.Repeat(default(T), Rows)));
       variableNames.Insert(columnIndex, variableName);
       if (!IsInTransaction)

trunk/sources/HeuristicLab.DataPreprocessing/3.4/ProblemDataCreator.cs

@@ -63 +63 @@
       var inputVariables = oldProblemData.InputVariables.ToDictionary(x => x.Value, x => x);
       foreach (var variable in problemData.InputVariables) {
-        bool isChecked = oldProblemData.InputVariables.ItemChecked(inputVariables[variable.Value]);
+        bool isChecked = oldProblemData.InputVariables.Contains(variable) && oldProblemData.InputVariables.ItemChecked(inputVariables[variable.Value]);
         problemData.InputVariables.SetItemCheckedState(variable, isChecked);
       }