Changeset 10934

Timestamp:

06/04/14 12:30:08 (11 years ago)

Author:

mleitner

Message:

Update correlationmatrix on preprocessing data change - improve performance on datagrid selection.

Location:

branches/DataPreprocessing

Files:

• HeuristicLab.DataPreprocessing.Views/3.4/DataGridContentView.cs (modified) (3 diffs)
• HeuristicLab.DataPreprocessing.Views/3.4/DataPreprocessingView.cs (modified) (2 diffs)
• HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingFeatureCorrelationView.cs (modified) (2 diffs)
• HeuristicLab.DataPreprocessing/3.4/Implementations/CorrelationMatrixContent.cs (modified) (2 diffs)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/DataGridContentView.cs

@@ -36 +36 @@
     private bool notOwnEvent = true;
     private bool isSearching = false;
+    private bool updateOnMouseUp = false;
     private SearchAndReplaceDialog findAndReplaceDialog;
     private IFindPreprocessingItemsIterator searchIterator;
@@ -70 +71 @@
       dataGridView.CellPainting += new System.Windows.Forms.DataGridViewCellPaintingEventHandler(dataGridView_CellPainting);
       dataGridView.KeyDown += dataGridView_KeyDown;
+      dataGridView.MouseUp += dataGridView_MouseUp;
       contextMenuCell.Items.Add(ShowHideColumns);
       _highlightedRowIndices = new List<int>();
@@ -79 +81 @@
       if (Content != null) {
         if (!isSearching) {
+
+          if (Control.MouseButtons == MouseButtons.Left) {
+            updateOnMouseUp = true;
+            return;
+          }
+           
           base.dataGridView_SelectionChanged(sender, e);
+       
           Content.DataGridLogic.SetSelection(GetSelectedCells());
         }
       }
     }
+
+    private void dataGridView_MouseUp(object sender, MouseEventArgs e) {
+      if (!updateOnMouseUp) 
+        return;
+
+      updateOnMouseUp = false;
+      dataGridView_SelectionChanged(sender, e);
+    }                                     
 
     protected override void OnContentChanged() {

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/DataPreprocessingView.cs

@@ -54 +54 @@
         //var correlationMatrixLogic = new ChartLogic(data);
         var filterLogic = new FilterLogic(data);
-        var creator = new ProblemDataCreator(Content);
-        var problemData = (DataAnalysisProblemData)creator.CreateProblemData();
+       
         //var dataCompletenessLogic = new ChartLogic(data);
 
@@ -65 +64 @@
           new HistogramContent(chartLogic),
           new ScatterPlotContent(chartLogic),
-          new CorrelationMatrixContent(problemData),
+          new CorrelationMatrixContent(Content),
           new DataCompletenessChartContent(dataGridLogic, searchLogic),
           

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingFeatureCorrelationView.cs

@@ -66 +66 @@
     }
 
+
     protected override void RegisterContentEvents() {
       base.RegisterContentEvents();
+      Content.PreprocessingData.Changed += Data_Changed;
       fcc.ProgressCalculation += new FeatureCorrelationCalculator.ProgressCalculationHandler(Content_ProgressCalculation);
       fcc.CorrelationCalculationFinished += new FeatureCorrelationCalculator.CorrelationCalculationFinishedHandler(Content_CorrelationCalculationFinished);
@@ -73 +75 @@
 
     protected override void DeregisterContentEvents() {
+      Content.PreprocessingData.Changed -= Data_Changed;
       fcc.CorrelationCalculationFinished -= new FeatureCorrelationCalculator.CorrelationCalculationFinishedHandler(Content_CorrelationCalculationFinished);
       fcc.ProgressCalculation -= new FeatureCorrelationCalculator.ProgressCalculationHandler(Content_ProgressCalculation);
       base.DeregisterContentEvents();
+    }
+
+    private void Data_Changed(object sender, DataPreprocessingChangedEventArgs e) {
+      OnContentChanged();
     }
 

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.4/Implementations/CorrelationMatrixContent.cs

@@ -29 +29 @@
   [Item("Feature Correlation Matrix", "Represents the feature correlation matrix.")]
   public class CorrelationMatrixContent : Item, IViewShortcut {
-    public DataAnalysisProblemData ProblemData { get; set; }
 
-    public CorrelationMatrixContent(DataAnalysisProblemData data) {
-      ProblemData = data;
+    public DataAnalysisProblemData ProblemData {
+      get {
+        var creator = new ProblemDataCreator(Context);
+        return (DataAnalysisProblemData)creator.CreateProblemData();
+      } 
+    }
+
+    public ITransactionalPreprocessingData PreprocessingData { 
+      get {
+        return Context.Data;
+      } 
+    }
+
+    private IPreprocessingContext Context { get; set; }
+    public CorrelationMatrixContent(IPreprocessingContext context) {
+      Context = context;
+
+
     }
 
@@ -47 +62 @@
       return new CorrelationMatrixContent(this, cloner);
     }
+
+    public event DataPreprocessingChangedEventHandler Changed {
+      add { PreprocessingData.Changed += value; }
+      remove { PreprocessingData.Changed -= value; }
+    }
   }
 }