Changeset 43 for trunk/gui/scripts/tooltip.tcl

Timestamp:

Aug 16, 2005, 1:12:56 AM (19 years ago)

Author:

mmc

Message:

• Added a new Rappture.result() function to the Python library. This makes it easy to finalize results. See examples/graph for example use.

• Added examples/graph to illustrate a simple tool with a string and two numbers for input.

• Fixed the XY graph to show crosshairs and pop-up info when you mouse over particular points.

• Fixed Rappture::exec so that it doesn't add stray newlines when a program has lots (more than 8k) of output.

• Fixed the analyzer to recognize the <tool><analyzer> tag. When set to "last", this automatically clears the last result. Handy for programs like SPICE, where you don't compare much, but keep running one new simulation after another.

• Fixed <string> entries to enable the Simulate button after each editing keystroke.

File:

• trunk/gui/scripts/tooltip.tcl (modified) (4 diffs)

trunk/gui/scripts/tooltip.tcl

@@ -93 +93 @@
 
 # ----------------------------------------------------------------------
-# USAGE: show @<x>,<y>|<widget>+<x>,<y>
+# USAGE: show @<x>,<y>|<widget>+/-<x>,<y>
 #
 # Clients use this to pop up the tooltip on the screen.  The position
-# should be either a <widget> name with an optional offset +<x>,<y>
+# should be either a <widget> name with an optional offset +/-<x>,<y>
 # (tooltip pops up beneath widget by default), or a specific root
 # window coordinate of the form @x,y.
@@ -106 +106 @@
 itcl::body Rappture::Tooltip::show {where} {
     set hull $itk_component(hull)
+    set signx "+"
+    set signy "+"
 
     if {[regexp {^@([0-9]+),([0-9]+)$} $where match x y]} {
         set xpos $x
         set ypos $y
-    } elseif {[regexp {^(.*)\+([0-9]+),([0-9]+)$} $where match win x y]} {
-        set xpos [expr {[winfo rootx $win]+$x}]
-        set ypos [expr {[winfo rooty $win]+$y}]
+    } elseif {[regexp {^(.*)([-+])([0-9]+),([-+]?)([0-9]+)$} $where match win signx x signy y]} {
+        if {$signy == ""} { set signy $signx }
+        set xpos [expr {[winfo rootx $win] + $x}]
+        set ypos [expr {[winfo rooty $win] + $y}]
     } elseif {[winfo exists $where]} {
         set xpos [expr {[winfo rootx $where]+10}]
         set ypos [expr {[winfo rooty $where]+[winfo height $where]}]
     } else {
-        error "bad position \"$where\": should be widget name, +x,y, or @x,y"
+        error "bad position \"$where\": should be widget+x,y, or @x,y"
     }
 
@@ -152 +155 @@
     # Make sure the tooltip doesn't go off screen.  Then, put it up.
     #
-    update
-    if {$xpos+[winfo reqwidth $hull] > [winfo screenwidth $hull]} {
-        set xpos [expr {[winfo screenwidth $hull]-[winfo reqwidth $hull]}]
-    }
-    if {$xpos < 0} { set xpos 0 }
-
-    if {$ypos+[winfo reqheight $hull] > [winfo screenheight $hull]} {
-        set ypos [expr {[winfo screenheight $hull]-[winfo reqheight $hull]}]
-    }
-    if {$ypos < 0} { set ypos 0 }
-
-    wm geometry $hull +$xpos+$ypos
+    update idletasks
+    if {$signx == "+"} {
+        if {$xpos+[winfo reqwidth $hull] > [winfo screenwidth $hull]} {
+            set xpos [expr {[winfo screenwidth $hull]-[winfo reqwidth $hull]}]
+        }
+        if {$xpos < 0} { set xpos 0 }
+    } else {
+        if {$xpos-[winfo reqwidth $hull] < 0} {
+            set xpos [expr {[winfo screenwidth $hull]-[winfo reqwidth $hull]}]
+        }
+        set xpos [expr {[winfo screenwidth $hull]-$xpos}]
+    }
+
+    if {$signy == "+"} {
+        if {$ypos+[winfo reqheight $hull] > [winfo screenheight $hull]} {
+            set ypos [expr {[winfo screenheight $hull]-[winfo reqheight $hull]}]
+        }
+        if {$ypos < 0} { set ypos 0 }
+    } else {
+        if {$ypos-[winfo reqheight $hull] < 0} {
+            set ypos [expr {[winfo screenheight $hull]-[winfo reqheight $hull]}]
+        }
+        set ypos [expr {[winfo screenheight $hull]-$ypos}]
+    }
+
+    wm geometry $hull $signx$xpos$signy$ypos
     update
 
@@ -264 +281 @@
                 if {[string index $loc 0] == "@"} {
                     .rappturetooltip show $loc
-                } elseif {[string index $loc 0] == "+"} {
+                } elseif {[regexp {^[-+]} $loc]} {
                     .rappturetooltip show $widget$loc
                 } else {