Changeset 413 for trunk/gui/scripts/xyresult.tcl

Timestamp:

Apr 26, 2006 6:42:46 PM (18 years ago)

Author:

mmc

Message:

• Added <description> capability to output objects, including axes.

• Fixed the ResultSet? so that it is more compact and supports the simulation number as a parameter. This is useful when there are datasets with wildly varying parameters.

File:

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

trunk/gui/scripts/xyresult.tcl

@@ -32 +32 @@
 
 option add *XyResult*Balloon*Entry.background white widgetDefault
-
-blt::bitmap define XyResult-reset {
-#define reset_width 12
-#define reset_height 12
-static unsigned char reset_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0xfc, 0x03, 0x04, 0x02, 0x04, 0x02, 0x04, 0x02,
-   0x04, 0x02, 0x04, 0x02, 0x04, 0x02, 0xfc, 0x03, 0x00, 0x00, 0x00, 0x00};
-}
-
-blt::bitmap define XyResult-dismiss {
-#define dismiss_width 10
-#define dismiss_height 8
-static unsigned char dismiss_bits[] = {
-   0x87, 0x03, 0xce, 0x01, 0xfc, 0x00, 0x78, 0x00, 0x78, 0x00, 0xfc, 0x00,
-   0xce, 0x01, 0x87, 0x03};
-}
-
 
 itcl::class Rappture::XyResult {
@@ -117 +100 @@
         button $itk_component(controls).reset \
             -borderwidth 1 -padx 1 -pady 1 \
-            -bitmap XyResult-reset \
+            -bitmap [Rappture::icon reset] \
             -command [itcl::code $this _zoom reset]
     } {
@@ -150 +133 @@
     # Add support for editing axes:
     #
-    Rappture::Balloon $itk_component(hull).axes
+    Rappture::Balloon $itk_component(hull).axes -title "Axis Options"
     set inner [$itk_component(hull).axes component inner]
-    set inner [frame $inner.bd -borderwidth 4 -relief flat]
-    pack $inner -expand yes -fill both
-
-    button $inner.dismiss -bitmap XyResult-dismiss \
-        -relief flat -overrelief raised -command "
-          Rappture::Tooltip::cue hide
-          [list $itk_component(hull).axes deactivate]
-        "
-    grid $inner.dismiss -row 0 -column 1 -sticky e
 
     label $inner.labell -text "Label:"
@@ -494 +468 @@
                     $g axis configure $axis -title $label -hide no
                     set _label2axis($ax-$label) $axis
+
+                    # if this axis has a description, add it as a tooltip
+                    set desc [string trim [$xydata hints ${ax}desc]]
+                    Rappture::Tooltip::text $g-$axis $desc
                 }
             }
@@ -531 +509 @@
         $g axis bind $axis <ButtonRelease> \
             [itcl::code $this _axis release $axis %x %y]
+        $g axis bind $axis <KeyPress> \
+            [list ::Rappture::Tooltip::tooltip cancel]
     }
 
@@ -775 +755 @@
             if {$x > 0.5*[winfo width $g]} {
                 if {$x < 4} {
-                    set x "-0"
+                    set tipx "-0"
                 } else {
-                    set x "-[expr {$x-4}]"  ;# move tooltip to the left
+                    set tipx "-[expr {$x-4}]"  ;# move tooltip to the left
                 }
             } else {
                 if {$x < -4} {
-                    set x "+0"
+                    set tipx "+0"
                 } else {
-                    set x "+[expr {$x+4}]"  ;# move tooltip to the right
+                    set tipx "+[expr {$x+4}]"  ;# move tooltip to the right
                 }
             }
             if {$y > 0.5*[winfo height $g]} {
                 if {$y < 4} {
-                    set y "-0"
+                    set tipy "-0"
                 } else {
-                    set y "-[expr {$y-4}]"  ;# move tooltip to the top
+                    set tipy "-[expr {$y-4}]"  ;# move tooltip to the top
                 }
             } else {
                 if {$y < -4} {
-                    set y "+0"
+                    set tipy "+0"
                 } else {
-                    set y "+[expr {$y+4}]"  ;# move tooltip to the bottom
+                    set tipy "+[expr {$y+4}]"  ;# move tooltip to the bottom
                 }
             }
             Rappture::Tooltip::text $g $tip
-            Rappture::Tooltip::tooltip show $g $x,$y
+            Rappture::Tooltip::tooltip show $g $tipx,$tipy
         }
     } else {
@@ -832 +812 @@
 
         $g crosshairs configure -hide yes
-        Rappture::Tooltip::tooltip cancel
+
+        # only cancel in plotting area or we'll mess up axes
+        if {[$g inside $x $y]} {
+            Rappture::Tooltip::tooltip cancel
+        }
 
         # there is no currently highlighted element
@@ -857 +841 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::XyResult::_axis {option args} {
-    set inner [$itk_component(hull).axes component inner].bd
+    set inner [$itk_component(hull).axes component inner]
 
     switch -- $option {
@@ -864 +848 @@
                 error "wrong # args: should be \"_axis hilite axis state\""
             }
+            set g $itk_component(plot)
             set axis [lindex $args 0]
             set state [lindex $args 1]
 
             if {$state} {
-                $itk_component(plot) axis configure $axis \
+                $g axis configure $axis \
                     -color $itk_option(-activecolor) \
                     -titlecolor $itk_option(-activecolor)
+
+                set x [expr {[winfo pointerx $g]+4}]
+                set y [expr {[winfo pointery $g]+4}]
+                Rappture::Tooltip::tooltip pending $g-$axis @$x,$y
             } else {
-                $itk_component(plot) axis configure $axis \
+                $g axis configure $axis \
                     -color $itk_option(-foreground) \
                     -titlecolor $itk_option(-foreground)
+                Rappture::Tooltip::tooltip cancel
             }
         }
@@ -892 +882 @@
             set _axis(min0) $min
             set _axis(max0) $max
+            Rappture::Tooltip::tooltip cancel
         }
         drag {