Changeset 48947f4 in tol for tolbase/lib/wtree/wtree.tcl

Timestamp:

Dec 15, 2011, 7:53:09 PM (15 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

755cdff

Parents:

be70fb2

Message:

fixes #1363, if a node match the search criteria then this implies that every ancestor must be visibles

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@3934 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tolbase/lib/wtree/wtree.tcl (modified) (4 diffs)

tolbase/lib/wtree/wtree.tcl

@@ -501 +501 @@
   }
  
+  method _filterNodesMatching { } {
+    if { [ llength $listFilterOff ] } {
+      $tree item configure [ list list $listFilterOff ] -visible 0
+      set listFilterOff [ list ]
+    }
+    if { [ llength $listFilterOn ] } {
+      $tree item configure [ list list $listFilterOn ] -visible 1
+      if { !$options(-table) } {
+        foreach nid $listFilterOn {
+          $tree item configure \
+              [ list list [ $tree item ancestors $nid ] ] -visible 1
+        }
+      }
+      set listFilterOn [ list ]
+    }
+  }
+
   method _filterNodeSet { nodes positiveWords negativeRegExp } {
     #puts "filterNodeSet '$nodes' '$positiveWords'"
@@ -512 +529 @@
       }
 
+      $self _filterNode $n $positiveWords $negativeRegExp
+      # desciendo a los hijos
+      $self _filterNodeSet [ $tree item children $n ] \
+          $positiveWords $negativeRegExp
+      
+      if { 0 } {
       if { [ $self _filterNode $n $positiveWords $negativeRegExp ] } {
         # si el resultado es visible desciendo y filtro a los hijos
@@ -517 +540 @@
             $positiveWords $negativeRegExp
       }
+      }
 
       # esto es para el filtrado automatico incremental
@@ -522 +546 @@
       if { !$breakFilter && !( $numItemsFiltered % 1000 ) } {
         # refresco la cola de eventos
-        if { [ llength $listFilterOn ] } {
-          $tree item configure [ list list $listFilterOn ] -visible 1
-          set listFilterOn [ list ]
-        }
-        if { [ llength $listFilterOff ] } {
-          $tree item configure [ list list $listFilterOff ] -visible 0
-          set listFilterOff [ list ]
-        }
+        $self _filterNodesMatching
         update
       }
     }
-    if { [ llength $listFilterOn ] } {
-      $tree item configure [ list list $listFilterOn ] -visible 1
-      set listFilterOn [ list ]
-    }
-    if { [ llength $listFilterOff ] } {
-      $tree item configure [ list list $listFilterOff ] -visible 0
-      set listFilterOff [ list ]
-    }
+    $self _filterNodesMatching
     return 1
   }