Changeset 9573

Timestamp:

06/03/13 16:22:19 (11 years ago)

Author:

mkommend

Message:

#1677: Merged r9505 and r9506 in the stable branch.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs (modified) (2 diffs)
• HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionTabularView.cs (modified) (2 diffs)

stable/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs

@@ -340 +340 @@
 
       for (int i = minRowIndex; i <= maxRowIndex; i++) {
+        if (!dataGridView.Rows[i].Visible) continue;
+
         int rowIndex = this.virtualRowIndices[i];
         if (addRowNames) {
@@ -515 +517 @@
     protected virtual void ShowHideColumns_Click(object sender, EventArgs e) {
       new StringConvertibleMatrixColumnVisibilityDialog(this.dataGridView.Columns.Cast<DataGridViewColumn>()).ShowDialog();
+      columnsTextBox.Text = dataGridView.Columns.GetColumnCount(DataGridViewElementStates.Visible).ToString();
     }
 

stable/HeuristicLab.Optimization.Views/3.3/RunCollectionViews/RunCollectionTabularView.cs

@@ -101 +101 @@
     }
     private void run_Changed(object sender, EventArgs e) {
+      if (suppressUpdates) return;
       if (InvokeRequired)
         this.Invoke(new EventHandler(run_Changed), sender, e);
@@ -199 +200 @@
         runIndex++;
       }
+      rowsTextBox.Text = dataGridView.Rows.GetRowCount(DataGridViewElementStates.Visible).ToString();
       UpdateRowHeaders();
     }