Changeset 3779 for trunk/gui

Timestamp:

Jul 11, 2013, 8:52:48 AM (11 years ago)

Author:

ldelgass

Message:

Fixes for legend in glyph/isosurface viewer.

Location:

trunk/gui/scripts

Files:

• vtkglyphviewer.tcl (modified) (8 diffs)
• vtkisosurfaceviewer.tcl (modified) (5 diffs)

trunk/gui/scripts/vtkglyphviewer.tcl

@@ -136 +136 @@
     private variable _start 0
     private variable _title ""
-    private variable _glyph
-    private variable _glyphsList ""
 
     common _downloadPopup;              # download options from popup
@@ -1487 +1485 @@
 #
 itcl::body Rappture::VtkGlyphViewer::RequestLegend {} {
+    set _legendPending 0
     if { ![info exists _fields($_curFldName)] } {
         return
     }
     set fname $_curFldName
-    set _legendPending 0
     set font "Arial 8"
     set lineht [font metrics $font -linespace]
@@ -2224 +2222 @@
     set tx [expr $x + 15] 
     set ty [expr $y - 5]
-    if { [info exists _glyph($y)] } {
-        Rappture::Tooltip::text $c [format "$title %g (glyph)" $_glyph($y)]
-    } else {
-        Rappture::Tooltip::text $c [format "$title %g" $value]
-    }
+    Rappture::Tooltip::text $c [format "$title %g" $value]
     Rappture::Tooltip::tooltip show $c +$tx,+$ty    
 }
@@ -2330 +2324 @@
         $c create text $x $y \
             -anchor ne \
-            -fill $itk_option(-plotforeground) -tags "zmax legend" \
+            -fill $itk_option(-plotforeground) -tags "vmax legend" \
             -font $font
         incr y $lineht
@@ -2340 +2334 @@
         $c create text $x [expr {$h-2}] \
             -anchor se \
-            -fill $itk_option(-plotforeground) -tags "zmin legend" \
+            -fill $itk_option(-plotforeground) -tags "vmin legend" \
             -font $font
         $c bind sensor <Enter> [itcl::code $this EnterLegend %x %y]
@@ -2346 +2340 @@
         $c bind sensor <Motion> [itcl::code $this MotionLegend %x %y]
     }
-    $c delete isoline
     set x2 $x
     set iw [image width $_image(legend)]
     set ih [image height $_image(legend)]
     set x1 [expr $x2 - ($iw*12)/10]
-    # Draw the glyph on the legend.
-    array unset _glyph
 
     $c bind title <ButtonPress> [itcl::code $this Combo post]
@@ -2361 +2352 @@
     if { [info exists _limits($_curFldName)] } {
         foreach { vmin vmax } $_limits($_curFldName) break
-        $c itemconfigure zmin -text [format %g $vmin]
-        $c itemconfigure zmax -text [format %g $vmax]
+        $c itemconfigure vmin -text [format %g $vmin]
+        $c itemconfigure vmax -text [format %g $vmax]
     }
     set y 2
@@ -2372 +2363 @@
         $c raise title
     }
-    $c coords zmax $x $y
+    $c coords vmax $x $y
     incr y $lineht
     $c coords colormap $x $y
-    set ix [image width $_image(legend)]
-    set ih [image height $_image(legend)]
     $c coords sensor [expr $x - $iw] $y $x [expr $y + $ih]
     $c raise sensor
-    $c coords zmin $x [expr {$h - 2}]
+    $c coords vmin $x [expr {$h - 2}]
 }
 

trunk/gui/scripts/vtkisosurfaceviewer.tcl

@@ -1507 +1507 @@
 #
 itcl::body Rappture::VtkIsosurfaceViewer::RequestLegend {} {
+    set _legendPending 0
     if { ![info exists _fields($_curFldName)] } {
         return
     }
     set fname $_curFldName
-    set _legendPending 0
     set font "Arial 8"
     set lineht [font metrics $font -linespace]
@@ -2388 +2388 @@
         $c create text $x $y \
             -anchor ne \
-            -fill $itk_option(-plotforeground) -tags "zmax legend" \
+            -fill $itk_option(-plotforeground) -tags "vmax legend" \
             -font $font
         incr y $lineht
@@ -2398 +2398 @@
         $c create text $x [expr {$h-2}] \
             -anchor se \
-            -fill $itk_option(-plotforeground) -tags "zmin legend" \
+            -fill $itk_option(-plotforeground) -tags "vmin legend" \
             -font $font
         $c bind sensor <Enter> [itcl::code $this EnterLegend %x %y]
@@ -2443 +2443 @@
     if { [info exists _limits($_curFldName)] } {
         foreach { vmin vmax } $_limits($_curFldName) break
-        $c itemconfigure zmin -text [format %g $vmin]
-        $c itemconfigure zmax -text [format %g $vmax]
+        $c itemconfigure vmin -text [format %g $vmin]
+        $c itemconfigure vmax -text [format %g $vmax]
     }
     set y 2
@@ -2454 +2454 @@
         $c raise title
     }
-    $c coords zmax $x $y
+    $c coords vmax $x $y
     incr y $lineht
     $c coords colormap $x $y
-    set ix [image width $_image(legend)]
-    set ih [image height $_image(legend)]
     $c coords sensor [expr $x - $iw] $y $x [expr $y + $ih]
     $c raise sensor
-    $c coords zmin $x [expr {$h - 2}]
+    $c coords vmin $x [expr {$h - 2}]
 }