Changeset 10696

Timestamp:

04/02/14 11:44:22 (11 years ago)

Author:

mleitner

Message:

Add logic for apply filter button

Location:

branches/DataPreprocessing

Files:

• HeuristicLab.DataPreprocessing.Views/3.3/FilterView.Designer.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing.Views/3.3/FilterView.cs (modified) (2 diffs)
• HeuristicLab.DataPreprocessing.Views/3.3/HeuristicLab.DataPreprocessing.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.3/Implementations/FilterLogic.cs (modified) (1 diff)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/FilterView.Designer.cs

@@ -130 +130 @@
       // 
       this.applyFilterButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+      this.applyFilterButton.Enabled = false;
       this.applyFilterButton.Location = new System.Drawing.Point(554, 474);
       this.applyFilterButton.Name = "applyFilterButton";

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/FilterView.cs

@@ -57 +57 @@
     {
       List<IFilter> filters = filterView.ItemCollection.ToList<IFilter>();
+
+      int activeFilters = filters.Count(c => c.Active);
+
+      applyFilterButton.Enabled = (activeFilters > 0);
+
       bool[] result = Content.FilterLogic.Preview(filters);
-      int filteredCnt = 0;
-      for (int i = 0; i < result.Length; i++)
-      {
-        if (result[i] == true)
-          filteredCnt++;
-      }
+      
+      int filteredCnt = result.Count(c => c);
+  
       tbFiltered.Text = filteredCnt.ToString();
       double percentage = filteredCnt * 100 / result.Length;
@@ -72 +74 @@
     private void applyFilterButton_Click(object sender, EventArgs e)
     {
-      //todo: inform Logic for apply Filter
+      List<IFilter> filters = filterView.ItemCollection.ToList<IFilter>();
+      Content.FilterLogic.Apply(filters);
     }
 

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/HeuristicLab.DataPreprocessing.Views-3.3.csproj

@@ -227 +227 @@
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="FilterView.resx">
+      <DependentUpon>FilterView.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/FilterLogic.cs

@@ -35 +35 @@
     public bool[] Preview(IList<IFilter> filters)
     {
+       IList<IFilter> activeFilters = filters.Where(f => f.Active && f.ConstraintData != null).ToList<IFilter>();
+
+       if (activeFilters.Count == 0) { 
+        return new bool[preprocessingData.Rows];
+       }
+
        bool[] result = Enumerable.Repeat<bool>(true, preprocessingData.Rows).ToArray();
 
        foreach (IFilter filter in filters)
        {
-            if (filter.ConstraintData == null || !filter.Active) {
-              continue;
-            }
-
             bool[] filterResult = filter.Check();