Changeset ffeacdc in tol

Timestamp:

Nov 18, 2016, 11:18:15 AM (10 years ago)

Author:

Pedro Gea <pgea@…>

Branches:

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

Children:

6dc91d2

Parents:

b23291d

Message:

Refs #1933
Mejora en bmultiselect.
Se quitan algunas trazas

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

Location:

tolbase/lib

Files:

• byswidget/bmultiselect/bmultiselect.tcl (modified) (2 diffs)
• toltk/tolinspe__wtree2.tcl (modified) (1 diff)
• toltk/tolprj.tcl (modified) (4 diffs)
• wtree/wtree.tcl (modified) (2 diffs)

tolbase/lib/byswidget/bmultiselect/bmultiselect.tcl

@@ -472 +472 @@
       set last [lindex $indexes end]      
       if { $plus } {
-        set start [$right first]
-        if { $first != $start } {
-          $right move [lindex [$right range [$right first] $first] end-1] \
-                 after $last
-          $right selection clearall
-          $right selection set $first $last
-        }        
+        # hacia arriba
+        if {$first eq [$right item firstchild root]} return
+        foreach index $indexes {
+          $right move $index before {}
+        }
+        #@+ set start [$right first]
+        #@+ if { $first != $start } {
+        #@+   $right move [lindex [$right range [$right first] $first] end-1] after $last
+        #@+   $right selection clearall
+        #@+   $right selection set $first $last
+        #@+ }        
       } else {
         if { $first != 0 } {
@@ -499 +503 @@
     if {$indexes != ""} {
       set first [lindex $indexes 0]
-      set last [lindex $indexes end]      
+      set last [lindex $indexes end]
       if { $plus } {
-        set end [$right last]
-        if { $last != $end } {
-          $right move [lindex [$right find $last] 1] before $first
-          $right selection clearall
-          $right selection set $first $last
-        }    
+        # hacia abajo
+        if {$last eq [$right item lastchild root]} return
+        foreach index [lreverse $indexes] {
+          $right move $index after {}
+        }
+        #@+ set end [$right last]
+        #@+ if { $last != $end } {
+        #@+   $right move [lindex [$right find $last] 1] before $first
+        #@+   $right selection clearall
+        #@+   $right selection set $first $last
+        #@+ }
       } else {
         set end [$right index end]

tolbase/lib/toltk/tolinspe__wtree2.tcl

@@ -686 +686 @@
 #/////////////////////////////////////////////////////////////////////////////
   variable wt_vars
-  #@! REVISAR dejó de funcionar!
   set node [$wt_vars selection get 0]
   if {$node == ""} {
     ::TolInspector::SelectionCollapse 
   } else { 
-    Tolcon_Trace "node $node"
     $wt_vars expand $node
   }

tolbase/lib/toltk/tolprj.tcl

@@ -805 +805 @@
       set item "Set $name.$data(num)"
       set value "Include(\"$filename\");"
-      Tolcon_Trace "item: $item, value: $value"
       writeini $fd $key $item $value
       incr data(num)
@@ -1026 +1025 @@
         set hasbutton 0
       }
-      Tolcon_Trace "prev $prev node $node"
       if {$prev eq "end"} {
         set idx [$tv item create -parent $node -button $hasbutton -open 0]
@@ -1819 +1817 @@
     return -code error "File $path doesn't exist"
   }
-  #@ Tolcon_Trace "Llamada a WtreeFromFile"
   set fd [iniparse:openfile $path] 
   BNodeFromFile $tv root "" $fd $proc
@@ -1871 +1868 @@
   # Llamar recursivamente para los hijos
   foreach child [$tv item children $index] {
-    Tolcon_Trace "child $child"
     BNodeToFile $tv $child $fd
   }

tolbase/lib/wtree/wtree.tcl

@@ -837 +837 @@
   method selection { args } {
     if { [lindex $args 0] eq "set" } {
-      Tolcon_Trace "selection $args"
       switch [llength $args] {
         1 { $tree selection clear all }
@@ -858 +857 @@
   
   method move { item how dest } {
-    Tolcon_Trace "item: $item how: $how dest: $dest"
     if { $item eq $dest } { return }
     switch $how {