Changeset 3546 for trunk/sources

Timestamp:

04/27/10 18:51:23 (15 years ago)

Author:

mkommend

Message:

corrected tabular view and bubble chart view (ticket #970)

Location:

trunk/sources

Files:

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

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

@@ -145 +145 @@
 
     private void UpdateRowHeaders() {
-      for (int i = dataGridView.FirstDisplayedScrollingRowIndex; i < dataGridView.FirstDisplayedScrollingRowIndex + dataGridView.DisplayedRowCount(true); i++) {
+      for (int i = 0; i < dataGridView.RowCount; i++) {
         if (Content.RowNames.Count() != 0)
-          dataGridView.Rows[i].HeaderCell.Value = Content.RowNames.ElementAt(i);
+          dataGridView.Rows[i].HeaderCell.Value = Content.RowNames.ElementAt(virtualRowIndizes[i]);
         else
           dataGridView.Rows[i].HeaderCell.Value = "Row " + (i + 1);
@@ -290 +290 @@
       virtualRowIndizes = Sort(sortedColumnIndizes);
       UpdateSortGlyph();
+      UpdateRowHeaders();
       dataGridView.Invalidate();
     }

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionBubbleChartView.cs

@@ -63 +63 @@
       this.isSelecting = false;
 
-      
+
       this.chart.ChartAreas[0].CursorX.IsUserSelectionEnabled = true;
       this.chart.ChartAreas[0].CursorY.IsUserSelectionEnabled = true;
@@ -293 +293 @@
           view.Locked = this.Locked;
           view.Show();
-        } else {
+        } else
           this.draggedRun = run;
-          this.chart.ChartAreas[0].CursorX.SetSelectionPosition(double.NaN, double.NaN);
-          this.chart.ChartAreas[0].CursorY.SetSelectionPosition(double.NaN, double.NaN);
-        }
+        this.chart.ChartAreas[0].CursorX.SetSelectionPosition(double.NaN, double.NaN);
+        this.chart.ChartAreas[0].CursorY.SetSelectionPosition(double.NaN, double.NaN);
       }
     }

trunk/sources/HeuristicLab.Optimization.Views/3.3/RunCollectionTabularView.cs

@@ -100 +100 @@
 
     private void dataGridView_RowHeaderMouseDoubleClick(object sender, DataGridViewCellMouseEventArgs e) {
-      if (e.RowIndex > 0) {
-        IContentView view = MainFormManager.CreateDefaultView(Content.ElementAt(e.RowIndex));
+      if (e.RowIndex >= 0) {
+        IRun run = Content.ElementAt(virtualRowIndizes[e.RowIndex]);
+        IContentView view = MainFormManager.CreateDefaultView(run);
         if (view != null) {
           view.ReadOnly = this.ReadOnly;