Changeset 3439 for trunk/gui/scripts/vtkheightmapviewer.tcl

Timestamp:

Mar 4, 2013 6:37:47 AM (11 years ago)

Author:

gah

Message:

improvements to legend: button-click to activate

File:

• trunk/gui/scripts/vtkheightmapviewer.tcl (modified) (8 diffs)

trunk/gui/scripts/vtkheightmapviewer.tcl

@@ -139 +139 @@
     private variable _start 0
     private variable _title ""
+    private variable _isolines
 
     common _downloadPopup;              # download options from popup
@@ -2248 +2249 @@
             -anchor ne \
             -image $_image(legend) -tags "colormap legend"
+        $c create rectangle $x $y 1 1 \
+            -fill "" -outline "" -tags "sensor 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 sensor <B1-Enter> [itcl::code $this EnterLegend %x %y]
+        $c bind sensor <Leave> [itcl::code $this LeaveLegend]
+        $c bind sensor <B1-Motion> [itcl::code $this MotionLegend %x %y]
     }
     $c delete isoline
@@ -2282 +2285 @@
         $values seq $vmin $vmax $_settings(numIsolines)
         set tags "isoline legend"
+        array unset _isolines
         foreach pos [$pixels range 0 end] value [$values range end 0] {
             set y1 [expr int($pos)]
+            for { set off 0 } { $off < 3 } { incr off } {
+                set _isolines([expr $y1 + $off]) $value
+                set _isolines([expr $y1 - $off]) $value
+            }
             set id [$c create line $x1 $y1 $x2 $y1 -fill $color -tags $tags]
-            $c bind $id <Enter> [itcl::code $this EnterIsoline %x %y $value]
-            $c bind $id <Leave> [itcl::code $this LeaveIsoline]
+            #$c bind $id <B1-Enter> [itcl::code $this EnterIsoline %x %y $value]
+            #$c bind $id <Leave> [itcl::code $this LeaveIsoline]
         }
         blt::vector destroy $pixels $values
@@ -2310 +2318 @@
     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 vmin $x [expr {$h - 2}]
 }
@@ -2356 +2368 @@
     Rappture::Tooltip::tooltip cancel
     set c $itk_component(view)
-    SetLegendTip $x $y
+    set cw [winfo width $c]
+    set ch [winfo height $c]
+    if { $x >= 0 && $x < $cw && $y >= 0 && $y < $ch } {
+        SetLegendTip $x $y
+    }
 }
 
@@ -2390 +2406 @@
     # If there's a legend title, increase the offset by the line height.
     if { $title != "" } {
-        incr iy $lineht
+        incr iy -$lineht
     }
 
@@ -2404 +2420 @@
     $_image(swatch) put black  -to 0 0 23 23 
     $_image(swatch) put $color -to 1 1 22 22 
-    .rappturetooltip configure -icon $_image(swatch)
 
     # Compute the value of the point
@@ -2416 +2431 @@
     set tipx [expr $x + 15] 
     set tipy [expr $y - 5]
-    Rappture::Tooltip::text $c "$title $value"
+    .rappturetooltip configure -icon $_image(swatch)
+    if { [info exists _isolines($iy)] } {
+        Rappture::Tooltip::text $c [format "$title (isoline) %g" $_isolines($iy)]
+    } else {
+        Rappture::Tooltip::text $c [format "$title %g" $value]
+    }
     Rappture::Tooltip::tooltip show $c +$tipx,+$tipy    
 }