Changeset 5469 for branches/1.4

Timestamp:

May 7, 2015, 2:17:47 PM (9 years ago)

Author:

ldelgass

Message:

fix legend toggle in vtkvolume

File:

• branches/1.4/gui/scripts/vtkvolumeviewer.tcl (modified) (3 diffs)

branches/1.4/gui/scripts/vtkvolumeviewer.tcl

@@ -1349 +1349 @@
         }
         "-legendvisible" {
-            set bool $_settings($what)
+            DrawLegend
         }
         "-volumevisible" {
@@ -2192 +2192 @@
     set lineht [font metrics $font -linespace]
 
+    if { !$_settings(-legendvisible) } {
+        $c delete legend
+        return
+    }
+
     if { [info exists _fields($fname)] } {
         foreach { title units } $_fields($fname) break
@@ -2200 +2205 @@
         set title $fname
     }
-    if { $_settings(-legendvisible) } {
-        set x [expr $w - 2]
-        if { [$c find withtag "legend"] == "" } {
-            set y 2
-            $c create text $x $y \
-                -anchor ne \
-                -fill $itk_option(-plotforeground) -tags "title legend" \
-                -font $font
-            incr y $lineht
-            $c create text $x $y \
-                -anchor ne \
-                -fill $itk_option(-plotforeground) -tags "vmax legend" \
-                -font $font
-            incr y $lineht
-            $c create image $x $y \
-                -anchor ne \
-                -image $_image(legend) -tags "colormap legend"
-            $c create text $x [expr {$h-2}] \
-                -anchor se \
-                -fill $itk_option(-plotforeground) -tags "vmin legend" \
-                -font $font
-            #$c bind colormap <Enter> [itcl::code $this EnterLegend %x %y]
-            $c bind colormap <Leave> [itcl::code $this LeaveLegend]
-            $c bind colormap <Motion> [itcl::code $this MotionLegend %x %y]
-        }
-        $c bind title <ButtonPress> [itcl::code $this Combo post]
-        $c bind title <Enter> [itcl::code $this Combo activate]
-        $c bind title <Leave> [itcl::code $this Combo deactivate]
-        # Reset the item coordinates according the current size of the plot.
-        $c itemconfigure title -text $title
-        if { [info exists _limits($_curFldName)] } {
-            foreach { vmin vmax } $_limits($_curFldName) break
-            $c itemconfigure vmin -text [format %g $vmin]
-            $c itemconfigure vmax -text [format %g $vmax]
-        }
+
+    set x [expr $w - 2]
+    if { [$c find withtag "legend"] == "" } {
         set y 2
-        $c coords title $x $y
+        $c create text $x $y \
+            -anchor ne \
+            -fill $itk_option(-plotforeground) -tags "title legend" \
+            -font $font
         incr y $lineht
-        $c coords vmax $x $y
+        $c create text $x $y \
+            -anchor ne \
+            -fill $itk_option(-plotforeground) -tags "vmax legend" \
+            -font $font
         incr y $lineht
-        $c coords colormap $x $y
-        $c coords vmin $x [expr {$h - 2}]
-    }
+        $c create image $x $y \
+            -anchor ne \
+            -image $_image(legend) -tags "colormap legend"
+        $c create text $x [expr {$h-2}] \
+            -anchor se \
+            -fill $itk_option(-plotforeground) -tags "vmin legend" \
+            -font $font
+        #$c bind colormap <Enter> [itcl::code $this EnterLegend %x %y]
+        $c bind colormap <Leave> [itcl::code $this LeaveLegend]
+        $c bind colormap <Motion> [itcl::code $this MotionLegend %x %y]
+    }
+    $c bind title <ButtonPress> [itcl::code $this Combo post]
+    $c bind title <Enter> [itcl::code $this Combo activate]
+    $c bind title <Leave> [itcl::code $this Combo deactivate]
+    # Reset the item coordinates according the current size of the plot.
+    $c itemconfigure title -text $title
+    if { [info exists _limits($_curFldName)] } {
+        foreach { vmin vmax } $_limits($_curFldName) break
+        $c itemconfigure vmin -text [format %g $vmin]
+        $c itemconfigure vmax -text [format %g $vmax]
+    }
+    set y 2
+    $c coords title $x $y
+    incr y $lineht
+    $c coords vmax $x $y
+    incr y $lineht
+    $c coords colormap $x $y
+    $c coords vmin $x [expr {$h - 2}]
 }