Changeset 7984

Timestamp:

06/12/12 01:27:53 (12 years ago)

Author:

abeham

Message:

#1870:

• Added a check to remove the last newline only when there's actually a newline at the end
• Improved speed of StringConvertibleMatrixView with respect to paste operations that would extend the number of rows and columns

Location:

trunk/sources/HeuristicLab.Data.Views/3.3

Files:

• StringConvertibleArrayView.cs (modified) (1 diff)
• StringConvertibleMatrixView.cs (modified) (1 diff)

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

@@ -195 +195 @@
     }
     private string[] SplitClipboardString(string clipboardText) {
-      clipboardText = clipboardText.Remove(clipboardText.Length - Environment.NewLine.Length);  //remove last newline constant
+      if (clipboardText.EndsWith(Environment.NewLine))
+        clipboardText = clipboardText.Remove(clipboardText.Length - Environment.NewLine.Length);  //remove last newline constant
       return clipboardText.Split(new string[] { Environment.NewLine, "\t" }, StringSplitOptions.None);
     }

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

@@ -370 +370 @@
         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;
 
       for (int row = 0; row < values.GetLength(1); row++) {
-        if (row + rowIndex >= Content.Rows)
-          Content.Rows = Content.Rows + 1;
         for (int col = 0; col < values.GetLength(0); col++) {
-          if (col + columnIndex >= Content.Columns)
-            Content.Columns = Content.Columns + 1;
           Content.SetValue(values[col, row], row + rowIndex, col + columnIndex);
         }