Changeset 10970

Timestamp:

06/11/14 11:12:58 (10 years ago)

Author:

rstoll

Message:

• disabled manipulation if a filter is active
• Reordered code ManipulationContent

Location:

branches/DataPreprocessing

Files:

• HeuristicLab.DataPreprocessing.Views/3.4/DataPreprocessingView.cs (modified) (3 diffs)
• HeuristicLab.DataPreprocessing.Views/3.4/ManipulationView.Designer.cs (modified) (11 diffs)
• HeuristicLab.DataPreprocessing.Views/3.4/ManipulationView.cs (modified) (4 diffs)
• HeuristicLab.DataPreprocessing/3.4/Implementations/ManipulationContent.cs (modified) (2 diffs)

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

@@ -26 +26 @@
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
-using HeuristicLab.DataPreprocessing;
-using HeuristicLab.Problems.DataAnalysis;
 
 namespace HeuristicLab.DataPreprocessing.Views {
@@ -54 +52 @@
         //var correlationMatrixLogic = new ChartLogic(data);
         var filterLogic = new FilterLogic(data);
-       
+
         //var dataCompletenessLogic = new ChartLogic(data);
 
@@ -68 +66 @@
           
           new FilterContent(filterLogic),
-          new ManipulationContent(manipulationLogic, searchLogic, dataGridLogic),
+          new ManipulationContent(manipulationLogic, searchLogic, dataGridLogic, filterLogic),
           new TransformationContent(data)
         };

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.4/ManipulationView.Designer.cs

@@ -53 +53 @@
       this.tabsPreview = new System.Windows.Forms.TabControl();
       this.tabPreviewInactive = new System.Windows.Forms.TabPage();
+      this.lblPreviewInActive = new System.Windows.Forms.Label();
       this.tabPreviewDeleteColumnsInfo = new System.Windows.Forms.TabPage();
       this.lblPreviewColumnsInfo = new System.Windows.Forms.Label();
@@ -75 +76 @@
       this.grpBoxPreview.SuspendLayout();
       this.tabsPreview.SuspendLayout();
+      this.tabPreviewInactive.SuspendLayout();
       this.tabPreviewDeleteColumnsInfo.SuspendLayout();
       this.tabPreviewDeleteColumnsVariance.SuspendLayout();
@@ -84 +86 @@
       // lstMethods
       // 
-      this.lstMethods.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+      this.lstMethods.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
       this.lstMethods.FormattingEnabled = true;
@@ -114 +116 @@
       // grpBoxData
       // 
-      this.grpBoxData.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+      this.grpBoxData.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
       this.grpBoxData.Controls.Add(this.tabsData);
@@ -126 +128 @@
       // tabsData
       // 
-      this.tabsData.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+      this.tabsData.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
       this.tabsData.Controls.Add(this.tabPage1);
@@ -369 +371 @@
       // grpBoxPreview
       // 
-      this.grpBoxPreview.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-            | System.Windows.Forms.AnchorStyles.Left)
+      this.grpBoxPreview.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.grpBoxPreview.Controls.Add(this.tabsPreview);
@@ -382 +384 @@
       // tabsPreview
       // 
-      this.tabsPreview.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+      this.tabsPreview.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
       this.tabsPreview.Controls.Add(this.tabPreviewInactive);
@@ -399 +401 @@
       // tabPreviewInactive
       // 
+      this.tabPreviewInactive.Controls.Add(this.lblPreviewInActive);
       this.tabPreviewInactive.Location = new System.Drawing.Point(4, 22);
       this.tabPreviewInactive.Name = "tabPreviewInactive";
@@ -406 +409 @@
       this.tabPreviewInactive.Text = "inactive";
       this.tabPreviewInactive.UseVisualStyleBackColor = true;
+      // 
+      // lblPreviewInActive
+      // 
+      this.lblPreviewInActive.AutoSize = true;
+      this.lblPreviewInActive.Location = new System.Drawing.Point(3, 3);
+      this.lblPreviewInActive.Name = "lblPreviewInActive";
+      this.lblPreviewInActive.Size = new System.Drawing.Size(361, 39);
+      this.lblPreviewInActive.TabIndex = 2;
+      this.lblPreviewInActive.Text = "Filters are active and thus manipulations cannot be applied!\r\n\r\nPlease deactive t" +
+    "he filter(s) first in order to be able to perform manipulations.";
       // 
       // tabPreviewDeleteColumnsInfo
@@ -549 +562 @@
       this.grpBoxPreview.ResumeLayout(false);
       this.tabsPreview.ResumeLayout(false);
+      this.tabPreviewInactive.ResumeLayout(false);
+      this.tabPreviewInactive.PerformLayout();
       this.tabPreviewDeleteColumnsInfo.ResumeLayout(false);
       this.tabPreviewDeleteColumnsInfo.PerformLayout();
@@ -606 +621 @@
     private System.Windows.Forms.ComboBox cmbVariableNames;
     private System.Windows.Forms.Label label8;
+    private System.Windows.Forms.Label lblPreviewInActive;
   }
 }

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

@@ -45 +45 @@
       tabsPreview.ItemSize = new Size(0, 1);
       tabsPreview.SizeMode = TabSizeMode.Fixed;
+      lblPreviewInActive.Visible = false;
 
       validators = new Action[] { 
@@ -72 +73 @@
         }
         cmbVariableNames.SelectedIndex = 0;
+        checkFilters();
       }
     }
@@ -78 +80 @@
       base.RegisterContentEvents();
       Content.ManipulationLogic.Changed += Content_Changed;
+      Content.FilterLogic.FilterChanged += FilterLogic_FilterChanged;
     }
 
@@ -83 +86 @@
       base.DeregisterContentEvents();
       Content.ManipulationLogic.Changed -= Content_Changed;
+      Content.FilterLogic.FilterChanged -= FilterLogic_FilterChanged;
+    }
+
+    private void FilterLogic_FilterChanged(object sender, EventArgs e) {
+      if (Content != null) {
+        checkFilters();
+      }
+    }
+
+    private void checkFilters() {
+      if (Content.FilterLogic.IsFiltered) {
+        tabsPreview.SelectedIndex = 0;
+        lstMethods.Enabled = false;
+        tabsData.Enabled = false;
+        tabsPreview.Enabled = false;
+        lblPreviewInActive.Visible = true;
+        btnApply.Enabled = false;
+      } else {
+        lblPreviewInActive.Visible = false;
+        tabsData.Enabled = true;
+        tabsPreview.Enabled = true;
+        lstMethods.Enabled = true;
+        lstMethods_SelectedIndexChanged(null, null);
+      }
     }
 

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

@@ -32 +32 @@
     private ISearchLogic searchLogic;
     private IDataGridLogic dataGridLogic;
+    private IFilterLogic filterLogic;
 
-    public ManipulationContent(IManipulationLogic theManipulationLogic, ISearchLogic theSearchLogic, IDataGridLogic theDataGridLogic) {
+    public IManipulationLogic ManipulationLogic { get { return manipulationLogic; } }
+    public ISearchLogic SearchLogic { get { return searchLogic; } }
+    public IDataGridLogic DataGridLogic { get { return dataGridLogic; } }
+    public IFilterLogic FilterLogic { get { return filterLogic; } }
+
+    public static new Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Method; }
+    }
+
+    public ManipulationContent(IManipulationLogic theManipulationLogic, ISearchLogic theSearchLogic, IDataGridLogic theDataGridLogic, IFilterLogic theFitlerLogic) {
       manipulationLogic = theManipulationLogic;
       searchLogic = theSearchLogic;
       dataGridLogic = theDataGridLogic;
+      filterLogic = theFitlerLogic;
     }
 
@@ -45 +56 @@
     }
 
-    public IManipulationLogic ManipulationLogic {
-      get {
-        return manipulationLogic;
-      }
-    }
 
-    public ISearchLogic SearchLogic {
-      get {
-        return searchLogic;
-      }
-    }
-
-    public IDataGridLogic DataGridLogic {
-      get {
-        return dataGridLogic;
-      }
-    }
-
-    public static new Image StaticItemImage {
-      get { return HeuristicLab.Common.Resources.VSImageLibrary.Method; }
-    }
   }
 }