Changeset 10697 for branches/DataPreprocessing

Timestamp:

04/02/14 11:51:23 (10 years ago)

Author:

psteiner

Message:

 

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3

Files:

• FilterView.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing.Views-3.3.csproj (modified) (1 diff)

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

@@ -44 +44 @@
     private void Content_CheckedItemsChanged(object sender, Collections.CollectionItemsChangedEventArgs<IFilter> e)
     {
-      //change active state of filters
+      
       foreach (IFilter filter in e.Items)
       {
-        filter.Active = !filter.Active;
+        if (!filter.Active && (filter.ConstrainedValue == null || filter.ConstraintData == null || filter.ConstraintOperation == null))
+        {
+          filterView.Content.SetItemCheckedState(filter, false);
+        }
+        else //change active state of filters
+        {
+          filter.Active = !filter.Active;
+        }
       }
       UpdateFilterInfo();

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>