Changeset 18006 for branches/3087_Ceres_Integration/HeuristicLab.Data.Views/3.3

Timestamp:

07/13/21 10:55:09 (3 years ago)

Author:

gkronber

Message:

#3087: merged r17784:18004 from trunk to branch to prepare for trunk reintegration (fixed a conflict in CrossValidation.cs)

Location:

branches/3087_Ceres_Integration

Files:

• . (modified) (1 prop)
• HeuristicLab.Data.Views (modified) (1 prop)
• HeuristicLab.Data.Views/3.3 (modified) (1 prop)
• HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.Designer.cs (modified) (6 diffs)
• HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs (modified) (1 diff)

branches/3087_Ceres_Integration/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.Designer.cs

@@ -71 +71 @@
       // rowsTextBox
       // 
-      this.rowsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.rowsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.rowsTextBox.Location = new System.Drawing.Point(69, 0);
       this.rowsTextBox.Name = "rowsTextBox";
@@ -86 +86 @@
       this.dataGridView.AllowUserToDeleteRows = false;
       this.dataGridView.AllowUserToOrderColumns = true;
-      this.dataGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-                  | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
-      this.dataGridView.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable;
+      this.dataGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.dataGridView.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.EnableWithoutHeaderText;
       this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
       this.dataGridView.Location = new System.Drawing.Point(0, 52);
@@ -115 +115 @@
       // columnsTextBox
       // 
-      this.columnsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.columnsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.columnsTextBox.Location = new System.Drawing.Point(69, 26);
       this.columnsTextBox.Name = "columnsTextBox";
@@ -136 +136 @@
       // contextMenu
       // 
+      this.contextMenu.ImageScalingSize = new System.Drawing.Size(20, 20);
       this.contextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.ShowHideColumns});
@@ -150 +151 @@
       // statisticsTextBox
       // 
-      this.statisticsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
-                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.statisticsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.statisticsTextBox.BorderStyle = System.Windows.Forms.BorderStyle.None;
       this.statisticsTextBox.Location = new System.Drawing.Point(3, 388);
@@ -161 +162 @@
       // StringConvertibleMatrixView
       // 
-      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
       this.Controls.Add(this.columnsTextBox);

branches/3087_Ceres_Integration/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs

@@ -298 +298 @@
 
     protected virtual void dataGridView_KeyDown(object sender, KeyEventArgs e) {
-      if (!ReadOnly && e.Control && e.KeyCode == Keys.V)
+      if (!ReadOnly && e.Control && e.KeyCode == Keys.V) {
         PasteValuesToDataGridView();
-      else if (e.Control && e.KeyCode == Keys.C)
+        e.Handled = true;
+      } else if (e.Control && e.KeyCode == Keys.C) {
         CopyValuesFromDataGridView();
+        e.Handled = true;
+      }
     }
 
     private void CopyValuesFromDataGridView() {
       if (dataGridView.SelectedCells.Count == 0) return;
+
+      //if not all cells are selected use the built-in functionality for copying values to the clipboard
+      if (!dataGridView.AreAllCellsSelected(false)) {
+        dataGridView.ClipboardCopyMode = DataGridViewClipboardCopyMode.EnableWithoutHeaderText;
+        var data = dataGridView.GetClipboardContent();
+        Clipboard.SetDataObject(data);
+        return;
+      }
+
+      //If all cells are selected we want to include row and column headers if they are set in the content.
+      //This is not possible with the built-in functionality, because only both headers can be added.
+      //Furthermore, the current implementation of the view with the virtual DataGridView does set 
+      //Row headers only when they are displayed (see UpdateRowHeaders) and otherwise leaves them empty.
+
       StringBuilder s = new StringBuilder();
-      int minRowIndex = dataGridView.SelectedCells[0].RowIndex;
-      int maxRowIndex = dataGridView.SelectedCells[dataGridView.SelectedCells.Count - 1].RowIndex;
-      int minColIndex = dataGridView.SelectedCells[0].ColumnIndex;
-      int maxColIndex = dataGridView.SelectedCells[dataGridView.SelectedCells.Count - 1].ColumnIndex;
-
-      if (minRowIndex > maxRowIndex) {
-        int temp = minRowIndex;
-        minRowIndex = maxRowIndex;
-        maxRowIndex = temp;
-      }
-      if (minColIndex > maxColIndex) {
-        int temp = minColIndex;
-        minColIndex = maxColIndex;
-        maxColIndex = temp;
-      }
-
-      bool addRowNames = dataGridView.AreAllCellsSelected(false) && Content.RowNames.Count() > 0;
-      bool addColumnNames = dataGridView.AreAllCellsSelected(false) && Content.ColumnNames.Count() > 0;
-
-      //add colum names
+
+      bool addColumnNames = Content.ColumnNames.Any();
+      bool addRowNames = Content.RowNames.Any();
+
+      //add first row with column headers
       if (addColumnNames) {
-        if (addRowNames)
-          s.Append('\t');
-
+        var columnNames = Content.ColumnNames.ToArray();
+        if (addRowNames) s.Append('\t'); //there is no column header for the row headers
         DataGridViewColumn column = dataGridView.Columns.GetFirstColumn(DataGridViewElementStates.Visible);
         while (column != null) {
-          s.Append(column.HeaderText);
+          s.Append(columnNames[column.Index]);
           s.Append('\t');
+
           column = dataGridView.Columns.GetNextColumn(column, DataGridViewElementStates.Visible, DataGridViewElementStates.None);
         }
+        s.Append(Environment.NewLine);
+      }
+
+      var rowNames = Content.RowNames.ToArray();
+      for (int r = 0; r < dataGridView.RowCount; r++) {
+        if (!dataGridView.Rows[r].Visible) continue; //skip invisible rows
+
+        int rowIndex = virtualRowIndices[r];
+        if (addRowNames) {
+          s.Append(rowNames[rowIndex]);
+          s.Append('\t');
+        }
+
+        DataGridViewColumn column = dataGridView.Columns.GetFirstColumn(DataGridViewElementStates.Visible);
+        while (column != null) {
+          s.Append(Content.GetValue(rowIndex, column.Index));
+          s.Append('\t');
+
+          column = dataGridView.Columns.GetNextColumn(column, DataGridViewElementStates.Visible, DataGridViewElementStates.None);
+        }
+
         s.Remove(s.Length - 1, 1); //remove last tab
         s.Append(Environment.NewLine);
       }
 
-      for (int i = minRowIndex; i <= maxRowIndex; i++) {
-        if (!dataGridView.Rows[i].Visible) continue;
-
-        int rowIndex = this.virtualRowIndices[i];
-        if (addRowNames) {
-          s.Append(Content.RowNames.ElementAt(rowIndex));
-          s.Append('\t');
-        }
-
-        DataGridViewColumn column = dataGridView.Columns.GetFirstColumn(DataGridViewElementStates.Visible);
-        while (column != null) {
-          DataGridViewCell cell = dataGridView[column.Index, i];
-          if (cell.Selected) {
-            s.Append(Content.GetValue(rowIndex, column.Index));
-            s.Append('\t');
-          }
-
-          column = dataGridView.Columns.GetNextColumn(column, DataGridViewElementStates.Visible, DataGridViewElementStates.None);
-        }
-        s.Remove(s.Length - 1, 1); //remove last tab
-        s.Append(Environment.NewLine);
-      }
       Clipboard.SetText(s.ToString());
     }