Changeset 12983 for trunk/sources

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

Files:

• HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing.Views/3.4/DataGridContentView.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.4/Implementations/DataGridContent.cs (modified) (2 diffs)
• HeuristicLab.DataPreprocessing/3.4/Implementations/TransactionalPreprocessingData.cs (modified) (3 diffs)
• HeuristicLab.DataPreprocessing/3.4/ProblemDataCreator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs

@@ -383 +383 @@
       ClearSorting();
     }
-    private string[,] SplitClipboardString(string clipboardText) {
+    protected string[,] SplitClipboardString(string clipboardText) {
       if (clipboardText.EndsWith(Environment.NewLine))
         clipboardText = clipboardText.Remove(clipboardText.Length - Environment.NewLine.Length);  //remove last newline constant

trunk/sources/HeuristicLab.DataPreprocessing.Views/3.4/DataGridContentView.cs

@@ -142 +142 @@
 
 
-    //protected override void PasteValuesToDataGridView() {
-    //  base.PasteValuesToDataGridView();
-    //  dataGridView.Refresh();
-    //}
+    protected override void PasteValuesToDataGridView() {
+      string[,] values = SplitClipboardString(Clipboard.GetText());
+      int rowIndex = 0;
+      int columnIndex = 0;
+      if (dataGridView.CurrentCell != null) {
+        rowIndex = dataGridView.CurrentCell.RowIndex;
+        columnIndex = dataGridView.CurrentCell.ColumnIndex;
+      }
+      if (Content.Rows < values.GetLength(1) + rowIndex) Content.Rows = values.GetLength(1) + rowIndex;
+      if (Content.Columns < values.GetLength(0) + columnIndex) Content.Columns = values.GetLength(0) + columnIndex;
+
+      ReplaceTransaction(() => {
+        Content.PreProcessingData.InTransaction(() => {
+          for (int row = 0; row < values.GetLength(1); row++) {
+            for (int col = 0; col < values.GetLength(0); col++) {
+              Content.SetValue(values[col, row], row + rowIndex, col + columnIndex);
+            }
+          }
+        });
+      });
+
+      ClearSorting();
+      //UpdateData(); // rownames are created on DataGrid creation. Therefore, no update possible, yet.
+    }
 
     protected override void SetEnabledStateOfControls() {

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);
       }