Changeset 2476 for trunk

Timestamp:

Sep 4, 2011 8:46:20 PM (13 years ago)

Author:

gah

Message:

 

File:

• trunk/gui/scripts/vtkviewer.tcl (modified) (5 diffs)

trunk/gui/scripts/vtkviewer.tcl

@@ -100 +100 @@
     private method MotionLegend { x y } 
     private method LeaveLegend {}
-    private method SetLegendMark { x y }
+    private method SetLegendTip { x y }
 
     private variable _arcball ""
@@ -1831 +1831 @@
 #
 itcl::body Rappture::VtkViewer::EnterLegend { x y } {
-    SetLegendMark $x $y
+    SetLegendTip $x $y
 }
 
@@ -1840 +1840 @@
     Rappture::Tooltip::tooltip cancel
     set c $itk_component(view)
-    $c delete mark
-    SetLegendMark $x $y
+    SetLegendTip $x $y
 }
 
@@ -1849 +1848 @@
 itcl::body Rappture::VtkViewer::LeaveLegend { } {
     Rappture::Tooltip::tooltip cancel
-    #set c $itk_component(view)
-    #$c delete mark
-}
-
-#
-# SetLegendMark --
-#
-itcl::body Rappture::VtkViewer::SetLegendMark { x y } {
+    .rappturetooltip configure -icon ""
+}
+
+#
+# SetLegendTip --
+#
+itcl::body Rappture::VtkViewer::SetLegendTip { x y } {
     set c $itk_component(view)
     set w [winfo width $c]
@@ -1866 +1864 @@
     set imgY [expr $y - 2]
 
-    if 0 {
     # Make a swatch of the selected color
-    set pixel [image get 0 $imgY]
-    set swatch [image create photo -width 20 -height 20]
-    $swatch puts $pixel -to 0 0 19 19 
-    }
-    # Create a line over the spot
-    $c create line [expr $w - 27] $y [expr $w - 2] $y -fill black \
-        -tags "legend mark"
+    if { [catch { $_image(legend) get 10 $imgY } pixel] != 0 } {
+        return
+    }
+    if { ![info exists _image(swatch)] } {
+        set _image(swatch) [image create photo -width 24 -height 24]
+    }
+    set color [eval format "\#%02x%02x%02x" $pixel]
+    $_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