Changeset 13514

Timestamp:

01/15/16 15:21:04 (9 years ago)

Author:

pfleck

Message:

#2559

• Enabled pasting values with headers into preprocessing. The headers will be extracted and the columns renamed.
• Removed an unnecessary interface.

Location:

trunk/sources

Files:

• HeuristicLab.DataPreprocessing.Views/3.4/DataGridContentView.cs (modified) (4 diffs)
• HeuristicLab.DataPreprocessing/3.4/Content/DataGridContent.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.4/Content/IDataGridContent.cs (deleted)
• HeuristicLab.DataPreprocessing/3.4/HeuristicLab.DataPreprocessing-3.4.csproj (modified) (1 diff)

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

@@ -31 +31 @@
 namespace HeuristicLab.DataPreprocessing.Views {
   [View("Data Grid Content View")]
-  [Content(typeof(IDataGridContent), true)]
+  [Content(typeof(DataGridContent), true)]
   public partial class DataGridContentView : StringConvertibleMatrixView {
 
@@ -42 +42 @@
     private Tuple<int, int> currentCell;
 
-    public new IDataGridContent Content {
-      get { return (IDataGridContent)base.Content; }
+    public new DataGridContent Content {
+      get { return (DataGridContent)base.Content; }
       set { base.Content = value; }
     }
@@ -145 +145 @@
     protected override void PasteValuesToDataGridView() {
       string[,] values = SplitClipboardString(Clipboard.GetText());
+      if (values.Length == 0) return;
       int rowIndex = 0;
       int columnIndex = 0;
@@ -151 +152 @@
         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;
+
+      bool containsHeader = false;
+      var firstRow = Enumerable.Range(0, values.GetLength(0)).Select(col => values[col, 0]).ToList();
+      if ((Content.Selection.Values.Sum(s => s.Count) == Content.Rows * Content.Columns)
+          || (rowIndex == 0 && columnIndex == 0 && Content.Rows <= values.GetLength(1) && Content.Columns <= values.GetLength(0))) {
+        // All is selected -or- top left selected and everything will be replaced
+        double temp;
+        containsHeader = !firstRow.All(string.IsNullOrEmpty) && firstRow.Any(r => !double.TryParse(r, out temp));
+        if (containsHeader)
+          rowIndex = columnIndex = 0;
+      }
+
+      int newRows = values.GetLength(1) + rowIndex - (containsHeader ? 1 : 0);
+      int newColumns = values.GetLength(0) + columnIndex;
+      if (Content.Rows < newRows) Content.Rows = newRows;
+      if (Content.Columns < newColumns) Content.Columns = newColumns;
 
       ReplaceTransaction(() => {
         Content.PreProcessingData.InTransaction(() => {
-          for (int row = 0; row < values.GetLength(1); row++) {
+          for (int row = containsHeader ? 1 : 0; row < values.GetLength(1); row++) {
             for (int col = 0; col < values.GetLength(0); col++) {
-              Content.SetValue(values[col, row], row + rowIndex, col + columnIndex);
+              Content.SetValue(values[col, row], row + rowIndex - (containsHeader ? 1 : 0), col + columnIndex);
             }
+          }
+          if (containsHeader) {
+            for (int i = 0; i < firstRow.Count; i++)
+              if (string.IsNullOrWhiteSpace(firstRow[i]))
+                firstRow[i] = string.Format("<{0}>", i);
+            Content.PreProcessingData.RenameColumns(firstRow);
           }
         });

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

@@ -26 +26 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 
 namespace HeuristicLab.DataPreprocessing {
 
   [Item("DataGrid", "Represents a data grid.")]
-  public class DataGridContent : Item, IViewShortcut, IDataGridContent {
+  public class DataGridContent : Item, IStringConvertibleMatrix, IViewShortcut {
 
     public ITransactionalPreprocessingData PreProcessingData { get; private set; }

trunk/sources/HeuristicLab.DataPreprocessing/3.4/HeuristicLab.DataPreprocessing-3.4.csproj

@@ -108 +108 @@
     <Compile Include="Logic\SearchLogic.cs" />
     <Compile Include="Logic\StatisticsLogic.cs" />
-    <Compile Include="Content\IDataGridContent.cs" />
     <Compile Include="Data\ITransactionalPreprocessingData.cs" />
     <Compile Include="Plugin.cs" />