Changeset 8537

Timestamp:

08/29/12 16:43:01 (10 years ago)

Author:

mkommend

Message:

#1292: Improved drawing of feature correlation view.

File:

• branches/DatasetFeatureCorrelation/HeuristicLab.Problems.DataAnalysis.Views/3.4/FeatureCorrelationView.cs (modified) (2 diffs)

branches/DatasetFeatureCorrelation/HeuristicLab.Problems.DataAnalysis.Views/3.4/FeatureCorrelationView.cs

@@ -79 +79 @@
         PartitionComboBox.DataSource = Content.Partitions;
         CalculateCorrelation();
+      } else {
+        DataGridView.Columns.Clear();
+        DataGridView.Rows.Clear();
       }
     }
@@ -145 +148 @@
 
     protected void DataGridView_CellValueNeeded(object sender, DataGridViewCellValueEventArgs e) {
-      if (Content != null && DataGridView.Enabled && e.RowIndex < Content.Rows && e.ColumnIndex < Content.Columns) {
-        int rowIndex = virtualRowIndices[e.RowIndex];
-        e.Value = Content[rowIndex, e.ColumnIndex];
-      }
+      if (Content == null) return;
+      int rowIndex = virtualRowIndices[e.RowIndex];
+      e.Value = Content[rowIndex, e.ColumnIndex];
     }
 
     protected void DataGridView_CellPainting(object sender, DataGridViewCellPaintingEventArgs e) {
-      if (Content != null && DataGridView.Enabled && e.RowIndex >= 0 && e.ColumnIndex >= 0 && e.PaintParts.HasFlag(DataGridViewPaintParts.Background)) {
-        int rowIndex = virtualRowIndices[e.RowIndex];
-        e.CellStyle.BackColor = GetDataPointColor(Content[rowIndex, e.ColumnIndex], Content.Minimum, Content.Maximum);
-      }
-      e.Paint(e.CellBounds, e.PaintParts);
+      //if (Content != null && DataGridView.Enabled && e.RowIndex >= 0 && e.ColumnIndex >= 0 && e.PaintParts.HasFlag(DataGridViewPaintParts.Background)) {
+      //  int rowIndex = virtualRowIndices[e.RowIndex];
+      //e.CellStyle.BackColor = GetDataPointColor(Content[rowIndex, e.ColumnIndex], Content.Minimum, Content.Maximum);
+      //}
+      //e.Paint(e.CellBounds, e.PaintParts);
+
+      if (Content == null) return;
+      if (e.RowIndex < 0) return;
+      if (e.ColumnIndex < 0) return;
+      if (e.State.HasFlag(DataGridViewElementStates.Selected)) return;
+      if (!e.PaintParts.HasFlag(DataGridViewPaintParts.Background)) return;
+
+      int rowIndex = virtualRowIndices[e.RowIndex];
+      Color backColor = GetDataPointColor(Content[rowIndex, e.ColumnIndex], Content.Minimum, Content.Maximum);
+      using (Brush backColorBrush = new SolidBrush(backColor)) {
+        e.Graphics.FillRectangle(backColorBrush, e.CellBounds);
+      }
+      e.PaintContent(e.CellBounds);
+      e.Handled = true;
     }