Changeset 1644 for branches/blt4/gui/scripts/xyresult.tcl

Timestamp:

Jan 27, 2010, 8:41:20 PM (15 years ago)

Author:

gah

Message:

 

File:

• branches/blt4/gui/scripts/xyresult.tcl (modified) (10 diffs)

branches/blt4/gui/scripts/xyresult.tcl

@@ -166 +166 @@
             -rightmargin 10
     } {
-        keep -background -foreground -cursor -font
+        keep -foreground -cursor -font
     }
     pack $itk_component(plot) -expand yes -fill both
@@ -252 +252 @@
     after idle [subst {
         update idletasks
-        #$itk_component(legend) reset 
+        $itk_component(legend) reset 
     }]
 
@@ -601 +601 @@
     eval $g element delete [$g element names]
     foreach axis [$g axis names] {
-        $g axis configure $axis -hide yes -checklimits no
+        $g axis configure $axis -hide yes -checklimits no \
+            -activeforeground blue
     }
     # Presumably you want at least an X-axis and Y-axis displayed.
@@ -667 +668 @@
         $g axis bind $axis <Leave> \
             [itcl::code $this _axis hilite $axis off]
-        $g axis bind $axis <ButtonPress> \
+        $g axis bind $axis <ButtonPress-1> \
             [itcl::code $this _axis click $axis %x %y]
         $g axis bind $axis <B1-Motion> \
             [itcl::code $this _axis drag $axis %x %y]
-        $g axis bind $axis <ButtonRelease> \
+        $g axis bind $axis <ButtonRelease-1> \
             [itcl::code $this _axis release $axis %x %y]
         $g axis bind $axis <KeyPress> \
@@ -907 +908 @@
     set tip ""
     if {$state == "at"} {
-        if {[$g element closest $x $y info -interpolate yes]} {
+        set results [$g element closest $x $y -interpolate yes]
+        if { $results != "" } {
+            array set info $results
             # for dealing with xy line plots
             set elem $info(name)
@@ -922 +925 @@
             set tip ""
             array unset info
-            if {[$g element closest $x $y info -interpolate no]
-                  && $info(name) == $elem} {
+            set results [$g element closest $x $y -interpolate no]
+            array set info $results
+            if { [info exists info(name)] && $info(name) == $elem } {
 
                 set x [$g axis transform $mapx $info(x)]
@@ -944 +948 @@
             }
             set state 1
-        } elseif {[$g element closest $x $y info -interpolate no]} {
-            # for dealing with xy scatter plot
-            set elem $info(name)
-
-            # Some elements are generated dynamically and therefore will
-            # not have a curve object associated with them.
-            set mapx [$g element cget $elem -mapx]
-            set mapy [$g element cget $elem -mapy]
-            if {[info exists _elem2curve($elem)]} {
-                foreach {mapx mapy} [_getAxes $_elem2curve($elem)] break
-            }
-
-            set tip ""
-            set x [$g axis transform $mapx $info(x)]
-            set y [$g axis transform $mapy $info(y)]
+        } else { 
+            set results [$g element closest $x $y -interpolate no]
+            if { $results != ""  } {
+                array unset info
+                array set info $results
+                # for dealing with xy scatter plot
+                set elem $info(name)
+                
+                # Some elements are generated dynamically and therefore will
+                # not have a curve object associated with them.
+                set mapx [$g element cget $elem -mapx]
+                set mapy [$g element cget $elem -mapy]
+                if {[info exists _elem2curve($elem)]} {
+                    foreach {mapx mapy} [_getAxes $_elem2curve($elem)] break
+                }
+                
+                set tip ""
+                set x [$g axis transform $mapx $info(x)]
+                set y [$g axis transform $mapy $info(y)]
                 
-            if {[info exists _elem2curve($elem)]} {
-                set curve $_elem2curve($elem)
-                set yunits [$curve hints yunits]
-                set xunits [$curve hints xunits]
-            } else {
-                set xunits ""
-                set yunits ""
-            }
-            set tip [$g element cget $elem -label]
-            set yval [_axis format y dummy $info(y)]
-            append tip "\n$yval$yunits"
-            set xval [_axis format x dummy $info(x)]
-            append tip " @ $xval$xunits"
-            set tip [string trim $tip]
-            set state 1
-        } else {
-            set state 0
-        }
+                if {[info exists _elem2curve($elem)]} {
+                    set curve $_elem2curve($elem)
+                    set yunits [$curve hints yunits]
+                    set xunits [$curve hints xunits]
+                } else {
+                    set xunits ""
+                    set yunits ""
+                }
+                set tip [$g element cget $elem -label]
+                set yval [_axis format y dummy $info(y)]
+                append tip "\n$yval$yunits"
+                set xval [_axis format x dummy $info(x)]
+                append tip " @ $xval$xunits"
+                set tip [string trim $tip]
+                set state 1
+            } else {
+                set state 0
+            }
+        }
     }
 
@@ -1118 +1127 @@
 itcl::body Rappture::XyResult::_axis {option args} {
     set inner [$itk_component(hull).axes component inner]
-
     switch -- $option {
         hilite {
@@ -1129 +1137 @@
 
             if {$state} {
-                $g axis configure $axis \
-                    -color $itk_option(-activecolor) \
-                    -titlecolor $itk_option(-activecolor)
-
+                $g axis activate $axis 
+                update
                 set x [expr {[winfo pointerx $g]+4}]
                 set y [expr {[winfo pointery $g]+4}]
                 Rappture::Tooltip::tooltip pending $g-$axis @$x,$y
             } else {
-                $g axis configure $axis \
-                    -color $itk_option(-foreground) \
-                    -titlecolor $itk_option(-foreground)
+                $g axis deactivate $axis 
+                update
                 Rappture::Tooltip::tooltip cancel
             }
@@ -1553 +1558 @@
 # ----------------------------------------------------------------------
 itcl::configbody Rappture::XyResult::gridcolor {
-    if {"" == $itk_option(-gridcolor)} {
+    if { "" == $itk_option(-gridcolor) } {
         foreach axis [$itk_component(plot) axis names] { 
-            $itk_component(plot) axis configure -grid off
+            $itk_component(plot) axis configure $axis -grid off
         }
     } else {
         foreach axis [$itk_component(plot) axis names] { 
-            $itk_component(plot) axis configure \
+            $itk_component(plot) axis configure $axis \
                 -gridcolor $itk_option(-gridcolor) -grid on
         }