Changeset 413

Timestamp:

Apr 26, 2006 6:42:46 PM (15 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.

Location:

trunk

Files:

• examples/zoo/curve/tool.xml (modified) (5 diffs)
• gui/Makefile.in (modified) (1 diff)
• gui/apps/driver (modified) (2 diffs)
• gui/scripts/analyzer.tcl (modified) (14 diffs)
• gui/scripts/balloon.tcl (modified) (8 diffs)
• gui/scripts/contourresult.tcl (modified) (7 diffs)
• gui/scripts/curve.tcl (modified) (2 diffs)
• gui/scripts/energyLevels.tcl (modified) (6 diffs)
• gui/scripts/filexfer.tcl (modified) (4 diffs)
• gui/scripts/icons.tcl (added)
• gui/scripts/imageresult.tcl (modified) (4 diffs)
• gui/scripts/images/blank.gif (added)
• gui/scripts/images/cue24.gif (modified) (previous)
• gui/scripts/images/cue48.gif (modified) (previous)
• gui/scripts/images/empty.xbm (added)
• gui/scripts/images/rarrow.xbm (added)
• gui/scripts/images/rarrow2.xbm (added)
• gui/scripts/meshresult.tcl (modified) (2 diffs)
• gui/scripts/moleculeViewer.tcl (modified) (5 diffs)
• gui/scripts/panes.tcl (modified) (7 diffs)
• gui/scripts/postern.tcl (modified) (5 diffs)
• gui/scripts/radiodial.tcl (modified) (14 diffs)
• gui/scripts/resultset.tcl (modified) (21 diffs)
• gui/scripts/textresult.tcl (modified) (7 diffs)
• gui/scripts/tool.tcl (modified) (2 diffs)
• gui/scripts/tooltip.tcl (modified) (6 diffs)
• gui/scripts/xyresult.tcl (modified) (10 diffs)
• src2/core/Makefile (modified) (1 diff)
• src2/core/RpSerialBuffer.cc (modified) (8 diffs)
• src2/core/RpSerialBuffer.h (modified) (3 diffs)
• src2/core/RpSerializable.cc (modified) (1 diff)
• src2/core/RpSerializable.h (modified) (3 diffs)

trunk/examples/zoo/curve/tool.xml

@@ -26 +26 @@
 <output>
   <curve id="single">
-    <about><label>Single curve</label></about>
+    <about>
+      <label>Single curve</label>
+      <description>This is an example of a single curve.</description>
+    </about>
     <xaxis>
       <label>Time</label>
+      <description>Time during the experiment.</description>
       <units>s</units>
     </xaxis>
     <yaxis>
       <label>Voltage v(11)</label>
+      <description>Output from the amplifier.</description>
       <units>V</units>
     </yaxis>
@@ -41 +46 @@
       <group>Multiple curves</group>
       <label>Factor a=1</label>
+      <description>This is an example of multiple curves on the same plot.</description>
     </about>
     <xaxis>
       <label>Frequency</label>
+      <description>Frequency of the input source.</description>
       <units>Hz</units>
       <scale>log</scale>
@@ -49 +56 @@
     <yaxis>
       <label>Current</label>
+      <description>Current through the pull-down resistor.</description>
       <units>uA</units>
       <scale>log</scale>
@@ -58 +66 @@
       <group>Multiple curves</group>
       <label>Factor a=2</label>
+      <description>This is an example of multiple curves on the same plot.</description>
     </about>
     <xaxis>
       <label>Frequency</label>
+      <description>Frequency of the input source.</description>
       <units>Hz</units>
       <scale>log</scale>
@@ -66 +76 @@
     <yaxis>
       <label>Current</label>
+      <description>Current through the pull-down resistor.</description>
       <units>uA</units>
       <scale>log</scale>

trunk/gui/Makefile.in

@@ -339 +339 @@
         $(TCLSH_PROG) $(srcdir)/cf/mkindex.tcl $(DESTDIR)$(pkglibdir)/scripts
         $(mkinstalldirs) $(pkglibdir)/scripts/images
-        @for i in $(srcdir)/scripts/images/*.gif; do \
+        @for i in $(srcdir)/scripts/images/*.gif \
+                $(srcdir)/scripts/images/*.xbm; do \
             echo "Installing $$i" ; \
             $(INSTALL_DATA) $$i $(DESTDIR)$(pkglibdir)/scripts/images ; \

trunk/gui/apps/driver

@@ -50 +50 @@
 option add *Switch.textBackground white
 option add *Progress.barColor #ffffcc
+option add *Balloon.titleBackground #6666cc
+option add *Balloon.titleForeground white
+option add *ResultSet.controlbarBackground #6666cc
+option add *ResultSet.controlbarForeground white
+option add *ResultSet.activeControlBackground #ccccff
+option add *ResultSet.activeControlForeground black
+option add *Radiodial.length 3i
 
 switch $tcl_platform(platform) {
@@ -83 +90 @@
 
 set tool [Rappture::Tool ::#auto $xmlobj $installdir]
+
+# ----------------------------------------------------------------------
+# LOAD RESOURCE SETTINGS
+#
+# Try to load the $SESSIONDIR/resources file, which contains
+# middleware settings, such as the application name and the
+# filexfer settings.
+# ----------------------------------------------------------------------
+Rappture::resources::load
 
 # ----------------------------------------------------------------------

trunk/gui/scripts/analyzer.tcl

@@ -64 +64 @@
     protected method _simState {state args}
     protected method _simOutput {message}
+    protected method _resultTooltip {}
 
     private variable _tool ""          ;# belongs to this tool
@@ -70 +71 @@
     private variable _pages 0          ;# number of pages for result sets
     private variable _label2page       ;# maps output label => result set
+    private variable _label2desc       ;# maps output label => description
     private variable _lastlabel ""     ;# label of last example loaded
     private variable _plotlist ""      ;# items currently being plotted
@@ -75 +77 @@
     private common job                 ;# array var used for blt::bgexec jobs
 
-    private common icons
-    set icons(download) [image create photo -data {
-R0lGODlhFAAUAMYBAAAAAP///+js9vL1+4yhxrbD21h6sFp8slx+tV6Bt2CFumSIvmOHvWaLwGyS
-yG6UynCRwWiOw2yUyXCZzm+XzG+Wy3Oc0XKaz3We1Hqk23mj2Xqk2nmi2ICex/T3+3Od0nqm3Hag
-1Xun3Iat3ZK56JK03t7n8uzy+PX4+/f5+/T4+/L3+vn7/Pj7/Pf7/Pb6+/n9/fz///r9/fn8/Pz+
-/vv9/fr8/Pz9/UGMfluegZzRp6XYqwWXC67frwCZAAKaAgOaAgOaAwWbBQabBQicCA6fDg6eDw+f
-Dw+fEA+eDxCfEF6/Xl+/X6TbpKbbpqzerK7frq3era/fr/z+/P3+/bXjsXjSbKrjotbw02bSVKvj
-olnSQYPfcJbjh5/jk1TSOV7XQm3bVIvidprmiKjqmXTgV4DjZrPuo7TupNb1zo/qc5nsf8L0s8Hz
-sar0j7L1mdD5wdH5wur+4eL91f///////////////////////////////////////////////yH5
-BAEAAH8ALAIAAgAQABAAAAfYgAUlIiAbHCEYHxcTFRIdBX8jJJOUlZQQfyKam5ycDX8ZAaKjpKMM
-fxoBLC0pHis7Rz5GOiYBCn8cATI2LC8oSFhVWEkCAQl/IQE3NTIzLj5aVlc+JwEIfxgBNDXLMD5e
-WV4+AwEHfxbaNNs1Pl1bXT4qAQZ/FAExPUo++1xfXPs+eEh5IIpJGjJjxIQBE0bMGDJpljgQFQUI
-GjNlMmY0c0bIEwIRGizAEYTNGjUo17QhkoPKn5cvnwSJ88bNGzhEmkyByfPJDzlz5AxxspMnTyix
-ijxx+TIQADs=
-}]
+    # resources file tells us the results directory
+    public common _resultdir ""
+    public proc setResultDir {path} { set _resultdir $path }
+}
+
+# must use this name -- plugs into Rappture::resources::load
+proc analyzer_init_resources {} {
+    Rappture::resources::register \
+        results_directory Rappture::Analyzer::setResultDir
 }
                                                                                 
@@ -214 +210 @@
         [itcl::code $this download coming]
 
+    Rappture::Tooltip::for $itk_component(resultselector) \
+        "@[itcl::code $this _resultTooltip]"
+
     if {[Rappture::filexfer::enabled]} {
         $itk_component(resultselector) choices insert end \
@@ -221 +220 @@
 
         itk_component add download {
-            button $w.top.dl -image $icons(download) -anchor e \
+            button $w.top.dl -image [Rappture::icon download] -anchor e \
                 -borderwidth 1 -relief flat -overrelief raised \
                 -command [itcl::code $this download now $w.top.dl]
@@ -235 +234 @@
 
     itk_component add results {
-        Rappture::Panes $w.pane
+        Rappture::Panes $w.pane -sashwidth 1 -sashrelief solid -sashpadding {4 0}
     }
     pack $itk_component(results) -expand yes -fill both
@@ -254 +253 @@
     pack $itk_component(resultset) -expand yes -fill both
     bind $itk_component(resultset) <<Control>> [itcl::code $this _fixSize]
+    bind $itk_component(results) <Configure> [itcl::code $this _fixSize]
 
     eval itk_initialize $args
@@ -360 +360 @@
                 set result "$msg\n$errorInfo"
             }
+
+            # if there's a results_directory defined in the resources
+            # file, then move the run.xml file there for storage
+            if {"" != $_resultdir} {
+                file rename -force -- $file $_resultdir
+            }
         } else {
             set status 1
-            set result "Can't find result file in output:\n\n$result"
+            set result "Can't find result file in output.\nDid you call Rappture::result in your simulator?"
         }
     }
@@ -465 +471 @@
     # if there are any valid results, add them to the resultset
     if {$haveresults} {
-        set size [$itk_component(resultset) size]
         set index [$itk_component(resultset) add $xmlobj]
 
@@ -483 +488 @@
                     set page [$itk_component(resultpages) insert end $name]
                     set _label2page($label) $page
+                    set _label2desc($label) \
+                        [$xmlobj get output.$item.about.description]
                     Rappture::ResultViewer $page.rviewer
                     pack $page.rviewer -expand yes -fill both -pady 4
@@ -535 +542 @@
 
     $itk_component(resultset) clear
-    $itk_component(results) fraction end 0.1
+
+    # reset the size of the controls area
+    set ht [winfo height $itk_component(results)]
+    set cntlht [$itk_component(resultset) size -controlarea]
+    set frac [expr {double($cntlht)/$ht}]
+    $itk_component(results) fraction end $frac
 
     foreach label [array names _label2page] {
@@ -544 +556 @@
     $itk_component(resultselector) choices delete 0 end
     catch {unset _label2page}
+    catch {unset _label2desc}
     set _plotlist ""
 
@@ -775 +788 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::Analyzer::_fixSize {} {
-    set f [$itk_component(results) fraction end]
-    if {$f < 0.4} {
-        $itk_component(results) fraction end [expr {$f+0.15}]
+    set ht [winfo height $itk_component(results)]
+    if {$ht <= 1} { set ht [winfo reqheight $itk_component(results)] }
+    set cntlht [$itk_component(resultset) size -controlarea]
+    set frac [expr {double($cntlht)/$ht}]
+
+    if {$frac < 0.4} {
+        $itk_component(results) fraction end $frac
     }
     _fixSimControl
@@ -937 +954 @@
 
 # ----------------------------------------------------------------------
+# USAGE: _resultTooltip
+#
+# Used internally to build the tooltip string displayed for the
+# result selector.  If the current page has an associated description,
+# then it is displayed beneath the result.
+#
+# Returns the string for the tooltip.
+# ----------------------------------------------------------------------
+itcl::body Rappture::Analyzer::_resultTooltip {} {
+    set tip ""
+    set name [$itk_component(resultselector) value]
+    if {[info exists _label2desc($name)] &&
+         [string length $_label2desc($name)] > 0} {
+        append tip "$_label2desc($name)\n\n"
+    }
+    if {[array size _label2page] > 1} {
+        append tip "Use this control to display other output results."
+    }
+    return $tip
+}
+
+# ----------------------------------------------------------------------
 # USAGE: _fixSimControl
 #

trunk/gui/scripts/balloon.tcl

@@ -19 +19 @@
 namespace eval Rappture { # forward declaration }
 
+option add *Balloon.dismissButton on widgetDefault
+option add *Balloon.padX 4 widgetDefault
+option add *Balloon.padY 4 widgetDefault
+option add *Balloon.titleBackground #999999 widgetDefault
+option add *Balloon.titleForeground white widgetDefault
+option add *Balloon.relief raised widgetDefault
 option add *Balloon.stemLength 16 widgetDefault
 
@@ -24 +30 @@
     inherit itk::Toplevel
 
+    itk_option define -deactivatecommand deactivateCommand DeactivateCommand ""
+    itk_option define -dismissbutton dismissButton DismissButton "on"
+    itk_option define -padx padX Pad 0
+    itk_option define -pady padY Pad 0
+    itk_option define -title title Title ""
+    itk_option define -titlebackground titleBackground Background ""
+    itk_option define -titleforeground titleForeground Foreground ""
     itk_option define -stemlength stemLength StemLength 20
-    itk_option define -deactivatecommand deactivateCommand DeactivateCommand ""
 
     constructor {args} { # defined below }
@@ -53 +65 @@
     wm overrideredirect $itk_component(hull) yes
     wm withdraw $itk_component(hull)
-    component hull configure -borderwidth 1 -relief solid
+    component hull configure -borderwidth 1 -relief solid -padx 0 -pady 0
+
+    itk_component add border {
+        frame $itk_interior.border -borderwidth 2
+    } {
+        usual
+        keep -relief
+    }
+    pack $itk_component(border) -expand yes -fill both
+
+    itk_component add titlebar {
+        frame $itk_component(border).tbar
+    } {
+        usual
+        rename -background -titlebackground titleBackground Background
+    }
+
+    itk_component add title {
+        label $itk_component(titlebar).title -width 1 -anchor w
+    } {
+        usual
+        rename -background -titlebackground titleBackground Background
+        rename -foreground -titleforeground titleForeground Foreground
+        rename -highlightbackground -titlebackground titleBackground Background
+        rename -text -title title Title
+    }
+    pack $itk_component(title) -side left -expand yes -fill both -padx 2
+
+    itk_component add dismiss {
+        button $itk_component(titlebar).dismiss \
+            -bitmap [Rappture::icon dismiss] \
+            -relief flat -overrelief raised -command "
+              Rappture::Tooltip::cue hide
+              [list $itk_component(hull) deactivate]
+            "
+    } {
+        usual
+        rename -background -titlebackground titleBackground Background
+        rename -foreground -titleforeground titleForeground Foreground
+        rename -highlightbackground -titlebackground titleBackground Background
+    }
 
     itk_component add inner {
-        frame $itk_interior.inner -borderwidth 2 -relief raised
+        frame $itk_component(border).inner
     }
     pack $itk_component(inner) -expand yes -fill both
@@ -85 +137 @@
     set sh [image height $_fills($placement)]
     set p $itk_component(hull)
+    set screenw [winfo screenwidth $p]
+    set screenh [winfo screenheight $p]
 
     if {[winfo exists $where]} {
@@ -104 +158 @@
     deactivate
 
+    set pw [winfo reqwidth $p]
+    if {$pw > $screenw} { set pw [expr {$screenw-10}] }
+    set ph [winfo reqheight $p]
+    if {$ph > $screenh} { set ph [expr {$screenh-10}] }
+
     switch -- $placement {
         left {
             set sx [expr {$x-$sw+3}]
             set sy [expr {$y-$sh/2}]
-            set px [expr {$sx-[winfo reqwidth $p]+3}]
-            set py [expr {$y-[winfo reqheight $p]/2}]
+            set px [expr {$sx-$pw+3}]
+            set py [expr {$y-$ph/2}]
+
+            # make sure that the panel doesn't go off-screen
+            if {$py < 0} { set py 0 }
+            if {$py+$ph > $screenh} { set py [expr {$screenh-$ph}] }
+            if {$px < 0} { set pw [expr {$pw+$px}]; set px 0 }
         }
         right {
@@ -115 +179 @@
             set sy [expr {$y-$sh/2}]
             set px [expr {$x+$sw-3}]
-            set py [expr {$y-[winfo reqheight $p]/2}]
+            set py [expr {$y-$ph/2}]
+
+            # make sure that the panel doesn't go off-screen
+            if {$py < 0} { set py 0 }
+            if {$py+$ph > $screenh} { set py [expr {$screenh-$ph}] }
+            if {$px+$pw > $screenw} { set pw [expr {$screenw-$px)}] }
         }
         above {
             set sx [expr {$x-$sw/2}]
             set sy [expr {$y-$sh+3}]
-            set px [expr {$x-[winfo reqwidth $p]/2}]
-            set py [expr {$sy-[winfo reqheight $p]+3}]
+            set px [expr {$x-$pw/2}]
+            set py [expr {$sy-$ph+3}]
+
+            # make sure that the panel doesn't go off-screen
+            if {$px < 0} { set px 0 }
+            if {$px+$pw > $screenw} { set px [expr {$screenw-$pw}] }
+            if {$py < 0} { set ph [expr {$ph+$py}]; set py 0 }
         }
         below {
             set sx [expr {$x-$sw/2}]
             set sy $y
-            set px [expr {$x-[winfo reqwidth $p]/2}]
+            set px [expr {$x-$pw/2}]
             set py [expr {$y+$sh-3}]
+
+            # make sure that the panel doesn't go off-screen
+            if {$px < 0} { set px 0 }
+            if {$px+$pw > $screenw} { set px [expr {$screenw-$pw}] }
+            if {$py+$ph > $screenh} { set ph [expr {$screenh-$py)}] }
         }
     }
@@ -134 +213 @@
     }
 
-    wm geometry $p +$px+$py
+    wm geometry $p ${pw}x${ph}+$px+$py
     wm deiconify $p
     raise $p
@@ -408 +487 @@
     }
 }
+
+# ----------------------------------------------------------------------
+# CONFIGURATION OPTION: -dismissbutton
+# ----------------------------------------------------------------------
+itcl::configbody Rappture::Balloon::dismissbutton {
+    if {![string is boolean $itk_option(-dismissbutton)]} {
+        error "bad value \"$itk_option(-dismissbutton)\": should be on/off, 1/0, true/false, yes/no"
+    }
+    if {$itk_option(-dismissbutton)} {
+        pack $itk_component(titlebar) -before $itk_component(inner) \
+            -side top -fill x
+        pack $itk_component(dismiss) -side right -padx 4
+    } elseif {"" != $itk_option(-title)} {
+        pack $itk_component(titlebar) -before $itk_component(inner) \
+            -side top -fill x
+        pack forget $itk_component(dismiss)
+    } else {
+        pack forget $itk_component(titlebar)
+    }
+}
+
+# ----------------------------------------------------------------------
+# CONFIGURATION OPTION: -padx
+# ----------------------------------------------------------------------
+itcl::configbody Rappture::Balloon::padx {
+    pack $itk_component(inner) -padx $itk_option(-padx)
+}
+
+# ----------------------------------------------------------------------
+# CONFIGURATION OPTION: -pady
+# ----------------------------------------------------------------------
+itcl::configbody Rappture::Balloon::pady {
+    pack $itk_component(inner) -pady $itk_option(-pady)
+}
+
+# ----------------------------------------------------------------------
+# CONFIGURATION OPTION: -title
+# ----------------------------------------------------------------------
+itcl::configbody Rappture::Balloon::title {
+    if {"" != $itk_option(-title) || $itk_option(-dismissbutton)} {
+        pack $itk_component(titlebar) -before $itk_component(inner) \
+            -side top -fill x
+        if {$itk_option(-dismissbutton)} {
+            pack $itk_component(dismiss) -side right -padx 4
+        } else {
+            pack forget $itk_component(dismiss)
+        }
+    } else {
+        pack forget $itk_component(titlebar)
+    }
+}

trunk/gui/scripts/contourresult.tcl

@@ -18 +18 @@
 package require BLT
 package require Img
-
-blt::bitmap define ContourResult-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 ContourResult-zoomin {
-#define zoomin_width 12
-#define zoomin_height 12
-static unsigned char zoomin_bits[] = {
-   0x7c, 0x00, 0x82, 0x00, 0x11, 0x01, 0x11, 0x01, 0x7d, 0x01, 0x11, 0x01,
-   0x11, 0x01, 0x82, 0x03, 0xfc, 0x07, 0x80, 0x0f, 0x00, 0x0f, 0x00, 0x06};
-}
-
-blt::bitmap define ContourResult-zoomout {
-#define zoomout_width 12
-#define zoomout_height 12
-static unsigned char zoomout_bits[] = {
-   0x7c, 0x00, 0x82, 0x00, 0x01, 0x01, 0x01, 0x01, 0x7d, 0x01, 0x01, 0x01,
-   0x01, 0x01, 0x82, 0x03, 0xfc, 0x07, 0x80, 0x0f, 0x00, 0x0f, 0x00, 0x06};
-}
-
-blt::bitmap define ContourResult-xslice {
-#define x_width 12
-#define x_height 12
-static unsigned char x_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x9c, 0x03, 0x98, 0x01, 0xf0, 0x00, 0x60, 0x00,
-   0x60, 0x00, 0xf0, 0x00, 0x98, 0x01, 0x9c, 0x03, 0x00, 0x00, 0x00, 0x00};
-}
-
-blt::bitmap define ContourResult-yslice {
-#define y_width 12
-#define y_height 12
-static unsigned char y_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x0e, 0x07, 0x0c, 0x03, 0x98, 0x01, 0xf0, 0x00,
-   0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00};
-}
-blt::bitmap define ContourResult-zslice {
-#define z_width 12
-#define z_height 12
-static unsigned char z_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0xfc, 0x03, 0x84, 0x03, 0xc0, 0x01, 0xe0, 0x00,
-   0x70, 0x00, 0x38, 0x00, 0x1c, 0x02, 0xfc, 0x03, 0x00, 0x00, 0x00, 0x00};
-}
 
 option add *ContourResult.width 4i widgetDefault
@@ -157 +110 @@
         button $itk_component(zoom).reset \
             -borderwidth 1 -padx 1 -pady 1 \
-            -bitmap ContourResult-reset \
+            -bitmap [Rappture::icon reset] \
             -command [itcl::code $this _zoom reset]
     } {
@@ -170 +123 @@
         button $itk_component(zoom).zin \
             -borderwidth 1 -padx 1 -pady 1 \
-            -bitmap ContourResult-zoomin \
+            -bitmap [Rappture::icon zoomin] \
             -command [itcl::code $this _zoom in]
     } {
@@ -183 +136 @@
         button $itk_component(zoom).zout \
             -borderwidth 1 -padx 1 -pady 1 \
-            -bitmap ContourResult-zoomout \
+            -bitmap [Rappture::icon zoomout] \
             -command [itcl::code $this _zoom out]
     } {
@@ -211 +164 @@
         label $itk_component(slicers).xslice \
             -borderwidth 1 -relief raised -padx 1 -pady 1 \
-            -bitmap ContourResult-xslice
+            -bitmap [Rappture::icon x]
     } {
         usual
@@ -245 +198 @@
         label $itk_component(slicers).yslice \
             -borderwidth 1 -relief raised -padx 1 -pady 1 \
-            -bitmap ContourResult-yslice
+            -bitmap [Rappture::icon y]
     } {
         usual
@@ -279 +232 @@
         label $itk_component(slicers).zslice \
             -borderwidth 1 -relief raised -padx 1 -pady 1 \
-            -bitmap ContourResult-zslice
+            -bitmap [Rappture::icon z]
     } {
         usual

trunk/gui/scripts/curve.tcl

@@ -194 +194 @@
             style   about.style
             xlabel  xaxis.label
+            xdesc   xaxis.description
             xunits  xaxis.units
             xscale  xaxis.scale
@@ -199 +200 @@
             xmax    xaxis.max
             ylabel  yaxis.label
+            ydesc   yaxis.description
             yunits  yaxis.units
             yscale  yaxis.scale

trunk/gui/scripts/energyLevels.tcl

@@ -28 +28 @@
 option add *EnergyLevels.font \
     -*-helvetica-medium-r-normal-*-*-120-* widgetDefault
-
-blt::bitmap define EnergyLevels-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 EnergyLevels-zoomin {
-#define zoomin_width 12
-#define zoomin_height 12
-static unsigned char zoomin_bits[] = {
-   0x7c, 0x00, 0x82, 0x00, 0x11, 0x01, 0x11, 0x01, 0x7d, 0x01, 0x11, 0x01,
-   0x11, 0x01, 0x82, 0x03, 0xfc, 0x07, 0x80, 0x0f, 0x00, 0x0f, 0x00, 0x06};
-}
-
-blt::bitmap define EnergyLevels-zoomout {
-#define zoomout_width 12
-#define zoomout_height 12
-static unsigned char zoomout_bits[] = {
-   0x7c, 0x00, 0x82, 0x00, 0x01, 0x01, 0x01, 0x01, 0x7d, 0x01, 0x01, 0x01,
-   0x01, 0x01, 0x82, 0x03, 0xfc, 0x07, 0x80, 0x0f, 0x00, 0x0f, 0x00, 0x06};
-}
-
-blt::bitmap define EnergyLevels-rdiag {
-#define rdiag_width 8
-#define rdiag_height 8
-static unsigned char rdiag_bits[] = {
-   0x66, 0x33, 0x99, 0xcc, 0x66, 0x33, 0x99, 0xcc};
-}
-
 
 itcl::class Rappture::EnergyLevels {
@@ -132 +100 @@
         button $itk_component(controls).reset \
             -borderwidth 1 -padx 1 -pady 1 \
-            -bitmap EnergyLevels-reset \
+            -bitmap [Rappture::icon reset] \
             -command [itcl::code $this _zoom reset]
     } {
@@ -144 +112 @@
         button $itk_component(controls).zin \
             -borderwidth 1 -padx 1 -pady 1 \
-            -bitmap EnergyLevels-zoomin \
+            -bitmap [Rappture::icon zoomin] \
             -command [itcl::code $this _zoom in]
     } {
@@ -157 +125 @@
         button $itk_component(controls).zout \
             -borderwidth 1 -padx 1 -pady 1 \
-            -bitmap EnergyLevels-zoomout \
+            -bitmap [Rappture::icon zoomout] \
             -command [itcl::code $this _zoom out]
     } {
@@ -508 +476 @@
                 set y [expr {($_ehomo-$_emin)*$e2y + $yzoom0}]
                 set id [$c create rectangle $xx0 $y $xx1 $y0 \
-                    -stipple EnergyLevels-rdiag \
+                    -stipple [Rappture::icon rdiag] \
                     -outline "" -fill $itk_option(-shadecolor)]
                 $c lower $id
@@ -623 +591 @@
             if {$yy0 < $y0} {
                 set id [$c create rectangle $xx2 $yy0 $xx3 $y0 \
-                    -stipple EnergyLevels-rdiag \
+                    -stipple [Rappture::icon rdiag] \
                     -outline "" -fill $itk_option(-shadecolor) \
                     -tags zlabels]

trunk/gui/scripts/filexfer.tcl

@@ -27 +27 @@
 namespace eval Rappture::filexfer {
     variable enabled 0                 ;# set to 1 when this is running
-    variable port 9001                 ;# start server on this port
+    variable port 0                    ;# start server on this port
     variable cookie ""                 ;# magic cookie for applet auth
     variable restrictClientAddress ""  ;# allow clients only from this addr
@@ -75 +75 @@
     }
 
-    #
-    # Set up a safe interpreter for loading filexfer options...
-    #
-    variable optionParser [interp create -safe]
-    foreach cmd [$optionParser eval {info commands}] {
-        $optionParser hide $cmd
-    }
-    # this lets us ignore unrecognized commands in the file:
-    $optionParser invokehidden proc unknown {args} {}
-
-    $optionParser alias filexfer_port Rappture::filexfer::option_port
-    $optionParser alias filexfer_cookie Rappture::filexfer::option_cookie
-    $optionParser alias filexfer_sitelogo Rappture::filexfer::option_sitelogo
-    $optionParser alias filexfer_stylesheet Rappture::filexfer::option_stylesheet
+}
+
+# must use this name -- plugs into Rappture::resources::load
+proc filexfer_init_resources {} {
+    Rappture::resources::register \
+        filexfer_port Rappture::filexfer::option_port \
+        filexfer_cookie Rappture::filexfer::option_cookie \
+        filexfer_sitelogo Rappture::filexfer::option_sitelogo \
+        filexfer_stylesheet Rappture::filexfer::option_stylesheet
 }
 
@@ -99 +94 @@
 # ----------------------------------------------------------------------
 proc Rappture::filexfer::init {} {
-    global env
-    variable optionParser
     variable enabled
     variable port
@@ -109 +102 @@
 
     #
-    # Look for a $SESSION variable and a file called
-    # ~/data/sessions/$SESSION/resources.  If found, then
-    # load the settings from that file and start a server
-    # for filexfer.
-    #
-    if {[info exists env(SESSION)]} {
-        set file ~/data/sessions/$env(SESSION)/resources
-        if {![file exists $file]} {
-            return 0
-        }
-        if {[catch {
-            set fid [open $file r]
-            set info [read $fid]
-            close $fid
-            $optionParser eval $info
-        } result]} {
-            after 1 [list tk_messageBox -title Error -icon error -message "Error in resources file:\n$reslt"]
-            return 0
-        }
-
+    # The port setting should have been set properly in the
+    # "resources" file loaded at the beginning of the app.
+    # If it wasn't, then don't do any filexfer.
+    #
+    if {$port > 0} {
         #
         # If the prescribed port is busy, then exit with a special

trunk/gui/scripts/imageresult.tcl

@@ -22 +22 @@
     -*-helvetica-medium-r-normal-*-*-120-* widgetDefault
 
-blt::bitmap define ImageResult-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 ImageResult-zoomin {
-#define zoomin_width 12
-#define zoomin_height 12
-static unsigned char zoomin_bits[] = {
-   0x7c, 0x00, 0x82, 0x00, 0x11, 0x01, 0x11, 0x01, 0x7d, 0x01, 0x11, 0x01,
-   0x11, 0x01, 0x82, 0x03, 0xfc, 0x07, 0x80, 0x0f, 0x00, 0x0f, 0x00, 0x06};
-}
-
-blt::bitmap define ImageResult-zoomout {
-#define zoomout_width 12
-#define zoomout_height 12
-static unsigned char zoomout_bits[] = {
-   0x7c, 0x00, 0x82, 0x00, 0x01, 0x01, 0x01, 0x01, 0x7d, 0x01, 0x01, 0x01,
-   0x01, 0x01, 0x82, 0x03, 0xfc, 0x07, 0x80, 0x0f, 0x00, 0x0f, 0x00, 0x06};
-}
-
-
 itcl::class Rappture::ImageResult {
     inherit itk::Widget
@@ -105 +80 @@
         button $itk_component(controls).reset \
             -borderwidth 1 -padx 1 -pady 1 \
-            -bitmap ImageResult-reset \
+            -bitmap [Rappture::icon reset] \
             -command [itcl::code $this _zoom reset]
     } {
@@ -118 +93 @@
         button $itk_component(controls).zin \
             -borderwidth 1 -padx 1 -pady 1 \
-            -bitmap ImageResult-zoomin \
+            -bitmap [Rappture::icon zoomin] \
             -command [itcl::code $this _zoom in]
     } {
@@ -131 +106 @@
         button $itk_component(controls).zout \
             -borderwidth 1 -padx 1 -pady 1 \
-            -bitmap ImageResult-zoomout \
+            -bitmap [Rappture::icon zoomout] \
             -command [itcl::code $this _zoom out]
     } {

trunk/gui/scripts/meshresult.tcl

@@ -22 +22 @@
 option add *MeshResult.font \
     -*-helvetica-medium-r-normal-*-*-120-* widgetDefault
-
-blt::bitmap define MeshResult-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};
-}
 
 itcl::class Rappture::MeshResult {
@@ -85 +77 @@
         button $itk_component(controls).reset \
             -borderwidth 1 -padx 1 -pady 1 \
-            -bitmap MeshResult-reset \
+            -bitmap [Rappture::icon reset] \
             -command [itcl::code $this _zoom reset]
     } {

trunk/gui/scripts/moleculeViewer.tcl

@@ -22 +22 @@
 option add *MoleculeViewer.backdrop black widgetDefault
 
-blt::bitmap define MoleculeViewer-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 MoleculeViewer-zoomin {
-#define zoomin_width 12
-#define zoomin_height 12
-static unsigned char zoomin_bits[] = {
-   0x7c, 0x00, 0x82, 0x00, 0x11, 0x01, 0x11, 0x01, 0x7d, 0x01, 0x11, 0x01,
-   0x11, 0x01, 0x82, 0x03, 0xfc, 0x07, 0x80, 0x0f, 0x00, 0x0f, 0x00, 0x06};
-}
-
-blt::bitmap define MoleculeViewer-zoomout {
-#define zoomout_width 12
-#define zoomout_height 12
-static unsigned char zoomout_bits[] = {
-   0x7c, 0x00, 0x82, 0x00, 0x01, 0x01, 0x01, 0x01, 0x7d, 0x01, 0x01, 0x01,
-   0x01, 0x01, 0x82, 0x03, 0xfc, 0x07, 0x80, 0x0f, 0x00, 0x0f, 0x00, 0x06};
-}
-
-blt::bitmap define MoleculeViewer-atoms {
-#define atoms_width 12
-#define atoms_height 12
-static unsigned char atoms_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x02, 0x4c, 0x02, 0xc8, 0x03,
-   0x48, 0x02, 0x48, 0x02, 0x5c, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-}
-
 itcl::class Rappture::MoleculeViewer {
     inherit itk::Widget
@@ -138 +106 @@
         button $itk_component(controls).reset \
             -borderwidth 1 -padx 1 -pady 1 \
-            -bitmap MoleculeViewer-reset \
+            -bitmap [Rappture::icon reset] \
             -command [itcl::code $this _zoom reset]
     } {
@@ -151 +119 @@
         button $itk_component(controls).zin \
             -borderwidth 1 -padx 1 -pady 1 \
-            -bitmap MoleculeViewer-zoomin \
+            -bitmap [Rappture::icon zoomin] \
             -command [itcl::code $this _zoom in]
     } {
@@ -164 +132 @@
         button $itk_component(controls).zout \
             -borderwidth 1 -padx 1 -pady 1 \
-            -bitmap MoleculeViewer-zoomout \
+            -bitmap [Rappture::icon zoomout] \
             -command [itcl::code $this _zoom out]
     } {
@@ -177 +145 @@
         label $itk_component(controls).labels \
             -borderwidth 1 -padx 1 -pady 1 \
-            -bitmap MoleculeViewer-atoms
+            -bitmap [Rappture::icon atoms]
     } {
         usual

trunk/gui/scripts/panes.tcl

@@ -16 +16 @@
 option add *Panes.width 3i widgetDefault
 option add *Panes.height 3i widgetDefault
+option add *Panes.sashRelief sunken widgetDefault
+option add *Panes.sashWidth 2 widgetDefault
+option add *Panes.sashPadding 4 widgetDefault
 option add *Panes.sashCursor sb_v_double_arrow
 
@@ -22 +25 @@
 
     itk_option define -sashcursor sashCursor SashCursor ""
+    itk_option define -sashrelief sashRelief SashRelief ""
+    itk_option define -sashwidth sashWidth SashWidth 0
+    itk_option define -sashpadding sashPadding SashPadding 0
 
     constructor {args} { # defined below }
@@ -33 +39 @@
     protected method _drop {pane X Y}
     protected method _fixLayout {args}
+    protected method _fixSashes {args}
 
     private variable _dispatcher ""  ;# dispatcher for !events
@@ -54 +61 @@
     $_dispatcher register !layout
     $_dispatcher dispatch $this !layout [itcl::code $this _fixLayout]
+    $_dispatcher register !sashes
+    $_dispatcher dispatch $this !sashes [itcl::code $this _fixSashes]
 
     # fix the layout whenever the window size changes
@@ -94 +103 @@
 
     itk_component add ${sash}ridge {
-        frame $itk_component($sash).ridge \
-            -height 2 -borderwidth 1 -relief sunken
+        frame $itk_component($sash).ridge
     } {
         usual
         rename -cursor -sashcursor sashCursor SashCursor
-    }
-    pack $itk_component(${sash}ridge) -fill x -pady 4
+        rename -relief -sashrelief sashRelief SashRelief
+        ignore -borderwidth
+    }
+    pack $itk_component(${sash}ridge) -fill x
 
     foreach comp [list $sash ${sash}ridge] {
@@ -120 +130 @@
     set f $params(-fraction)
     set _frac [list [expr {1-$f}] $f]
+
+    # fix sash characteristics
+    $_dispatcher event -idle !sashes
 
     # make sure we fix up the layout at some point
@@ -238 +251 @@
     }
 }
+
+# ----------------------------------------------------------------------
+# USAGE: _fixSashes
+#
+# Used internally to fix the appearance of sashes whenever a new
+# sash appears or the controlling configuration options change.
+# ----------------------------------------------------------------------
+itcl::body Rappture::Panes::_fixSashes {args} {
+    set ht [winfo pixels $itk_component(hull) $itk_option(-sashwidth)]
+    set bd [expr {$ht/2}]
+    foreach pane $_panes {
+        set sash "${pane}sashridge"
+        if {[info exists itk_component($sash)]} {
+            $itk_component($sash) configure -height $ht -borderwidth $bd
+            if {$itk_option(-sashrelief) == "solid"} {
+                $itk_component($sash) configure -background black
+            } else {
+                $itk_component($sash) configure \
+                    -background $itk_option(-background)
+            }
+            pack $itk_component($sash) -pady $itk_option(-sashpadding)
+        }
+    }
+}
+
+# ----------------------------------------------------------------------
+# CONFIGURATION OPTION: -sashrelief
+# ----------------------------------------------------------------------
+itcl::configbody Rappture::Panes::sashrelief {
+    $_dispatcher event -idle !sashes
+}
+
+# ----------------------------------------------------------------------
+# CONFIGURATION OPTION: -sashwidth
+# ----------------------------------------------------------------------
+itcl::configbody Rappture::Panes::sashwidth {
+    $_dispatcher event -idle !sashes
+}
+
+# ----------------------------------------------------------------------
+# CONFIGURATION OPTION: -sashpadding
+# ----------------------------------------------------------------------
+itcl::configbody Rappture::Panes::sashpadding {
+    $_dispatcher event -idle !sashes
+}

trunk/gui/scripts/postern.tcl

@@ -16 +16 @@
 package require Itk
 
-blt::bitmap define Postern-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};
-}
-
 option add *Postern.size 2 widgetDefault
 option add *Postern.activeColor gray widgetDefault
@@ -86 +78 @@
     #
     Rappture::Balloon $itk_component(hull).popup \
+        -title "Secret Command Console" \
         -deactivatecommand [itcl::code $this activate off]
-
     set inner [$itk_component(hull).popup component inner]
-    set inner [frame $inner.bd -borderwidth 4 -relief flat]
-    pack $inner -expand yes -fill both
-
-    button $inner.dismiss -bitmap Postern-dismiss \
-        -relief flat -overrelief raised \
-        -command [itcl::code $this close]
-    pack $inner.dismiss -anchor e
 
     Rappture::Scroller $inner.area
@@ -203 +188 @@
             $itk_component(hull) $itk_option(-popup)
 
-        set text [$itk_component(hull).popup component inner].bd.area.text
+        set text [$itk_component(hull).popup component inner].area.text
         focus $text
 
@@ -226 +211 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::Postern::command {option} {
-    set text [$itk_component(hull).popup component inner].bd.area.text
+    set text [$itk_component(hull).popup component inner].area.text
 
     switch -- $option {
@@ -331 +316 @@
     }
 
-    set text [$itk_component(hull).popup component inner].bd.area.text
+    set text [$itk_component(hull).popup component inner].area.text
     if {$channel == "stdout" || $channel == "stderr"} {
         $text insert end $string $channel

trunk/gui/scripts/radiodial.tcl

@@ -29 +29 @@
     itk_option define -min min Min ""
     itk_option define -max max Max ""
+    itk_option define -variable variable Variable ""
+
     itk_option define -thickness thickness Thickness 0
     itk_option define -length length Length 0
@@ -50 +52 @@
     public method color {value}
                                                                                 
+    protected method _setCurrent {val}
     protected method _redraw {}
     protected method _click {x y}
@@ -55 +58 @@
     protected method _limits {}
     protected method _fixSize {}
+    protected method _fixValue {args}
 
     private variable _values ""       ;# list of all values on the dial
     private variable _val2label       ;# maps value => label
     private variable _current ""      ;# current value (where pointer is)
+    private variable _variable ""     ;# variable associated with -variable
 
     private variable _spectrum ""     ;# width allocated for values
@@ -103 +108 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::Radiodial::destructor {} {
+    configure -variable ""  ;# remove variable trace
     after cancel [itcl::code $this _redraw]
 }
@@ -123 +129 @@
 
     if {"" == $_current} {
-        set _current $value
+        _setCurrent $value
     }
 
@@ -137 +143 @@
 itcl::body Rappture::Radiodial::clear {} {
     set _values ""
-    set _current ""
+    _setCurrent ""
     catch {unset _val2label}
 
@@ -168 +174 @@
         set ilist ""
         for {set i 0} {$i < [llength $_values]} {incr i} {
-            append ilist $i
+            lappend ilist $i
         }
     } elseif {"current" == $index} {
@@ -235 +241 @@
             error "bad value \"$newval\""
         }
-        set _current $newval
+        _setCurrent $newval
 
         after cancel [itcl::code $this _redraw]
@@ -277 +283 @@
     }
     return $color
+}
+
+# ----------------------------------------------------------------------
+# USAGE: _setCurrent <value>
+#
+# Called automatically whenever the widget changes size to redraw
+# all elements within it.
+# ----------------------------------------------------------------------
+itcl::body Rappture::Radiodial::_setCurrent {value} {
+    set _current $value
+    if {"" != $_variable} {
+        upvar #0 $_variable var
+        if {[info exists _val2label($value)]} {
+            set var $_val2label($value)
+        } else {
+            set var $value
+        }
+    }
 }
 
@@ -389 +413 @@
 
         if {$vnearest != $_current} {
-            set _current $vnearest
+            _setCurrent $vnearest
             _redraw
 
@@ -417 +441 @@
         set newval [lindex $_values $index]
         if {$newval != $_current} {
-            set _current $newval
+            _setCurrent $newval
             _redraw
 
@@ -482 +506 @@
 
 # ----------------------------------------------------------------------
+# USAGE: _fixValue ?<name1> <name2> <op>?
+#
+# Invoked automatically whenever the -variable associated with this
+# widget is modified.  Copies the value to the current settings for
+# the widget.
+# ----------------------------------------------------------------------
+itcl::body Rappture::Radiodial::_fixValue {args} {
+    if {"" == $itk_option(-variable)} {
+        return
+    }
+    upvar #0 $itk_option(-variable) var
+
+    set newval $var
+    set found 0
+    foreach v $_values {
+        if {[string equal $_val2label($v) $newval]} {
+            set newval $v
+            set found 1
+            break
+        }
+    }
+    if {!$found && "" != $newval} {
+        error "bad value \"$newval\""
+    }
+    set _current $newval  ;# set current directly, so we don't trigger again
+
+    after cancel [itcl::code $this _redraw]
+    after idle [itcl::code $this _redraw]
+    event generate $itk_component(hull) <<Value>>
+}
+
+# ----------------------------------------------------------------------
 # CONFIGURE: -thickness
 # ----------------------------------------------------------------------
@@ -509 +565 @@
         error "bad value \"$itk_option(-valuewidth)\": should be integer"
     }
+    _fixSize
     after cancel [itcl::code $this _redraw]
     after idle [itcl::code $this _redraw]
@@ -554 +611 @@
     after idle [itcl::code $this _redraw]
 }
+
+# ----------------------------------------------------------------------
+# CONFIGURE: -variable
+# ----------------------------------------------------------------------
+itcl::configbody Rappture::Radiodial::variable {
+    if {"" != $_variable} {
+        upvar #0 $_variable var
+        trace remove variable var write [itcl::code $this _fixValue]
+    }
+
+    set _variable $itk_option(-variable)
+
+    if {"" != $_variable} {
+        upvar #0 $_variable var
+        trace add variable var write [itcl::code $this _fixValue]
+
+        # sync to the current value of this variable
+        if {[info exists var]} {
+            _fixValue
+        }
+    }
+}

trunk/gui/scripts/resultset.tcl

@@ -17 +17 @@
 option add *ResultSet.height 4i widgetDefault
 option add *ResultSet.missingData skip widgetDefault
+option add *ResultSet.controlbarBackground gray widgetDefault
+option add *ResultSet.controlbarForeground white widgetDefault
+option add *ResultSet.activeControlBackground #ffffcc widgetDefault
+option add *ResultSet.activeControlForeground black widgetDefault
+option add *ResultSet.controlActiveForeground blue widgetDefault
 option add *ResultSet.toggleBackground gray widgetDefault
 option add *ResultSet.toggleForeground white widgetDefault
@@ -27 +32 @@
     inherit itk::Widget
 
+    itk_option define -activecontrolbackground activeControlBackground Background ""
+    itk_option define -activecontrolforeground activeControlForeground Foreground ""
+    itk_option define -controlactiveforeground controlActiveForeground Foreground ""
     itk_option define -togglebackground toggleBackground Background ""
     itk_option define -toggleforeground toggleForeground Foreground ""
     itk_option define -textfont textFont Font ""
     itk_option define -boldfont boldFont Font ""
+    itk_option define -foreground foreground Foreground ""
     itk_option define -missingdata missingData MissingData ""
     itk_option define -clearcommand clearCommand ClearCommand ""
@@ -41 +50 @@
     public method add {xmlobj}
     public method clear {}
+    public method activate {column}
     public method contains {xmlobj}
     public method size {{what -results}}
@@ -46 +56 @@
     protected method _doClear {}
     protected method _doSettings {{cmd ""}}
+    protected method _doPrompt {state}
+    protected method _control {option args}
     protected method _fixControls {args}
+    protected method _fixLayout {args}
     protected method _fixSettings {args}
-    protected method _doPrompt {state}
-    protected method _toggleAll {path widget}
+    protected method _fixExplore {}
+    protected method _fixValue {column why}
+    protected method _drawValue {column widget wmax}
+    protected method _toggleAll {{column "current"}}
+    protected method _getTooltip {role column}
 
     private variable _dispatcher ""  ;# dispatchers for !events
     private variable _results ""     ;# tuple of known results
     private variable _recent ""      ;# most recent result in _results
-    private variable _plotall ""     ;# column with "All" active
-    private variable _col2widget     ;# maps column name => control widget
+    private variable _active ""      ;# column with active control
+    private variable _plotall 0      ;# non-zero => plot all active results
+    private variable _layout         ;# info used in _fixLayout
     private variable _counter 0      ;# counter for unique control names
+    private variable _settings 0     ;# non-zero => _fixSettings in progress
+    private variable _explore 0      ;# non-zero => explore all parameters
+
+    private common _cntlInfo         ;# maps column name => control info
 }
                                                                                 
@@ -75 +96 @@
     $_dispatcher dispatch $this !fixcntls \
         [itcl::code $this _fixControls]
+    $_dispatcher register !layout
+    $_dispatcher dispatch $this !layout \
+        [itcl::code $this _fixLayout]
     $_dispatcher register !settings
     $_dispatcher dispatch $this !settings \
         [itcl::code $this _fixSettings]
 
+    # initialize controls info
+    set _cntlInfo($this-all) ""
+
+    # initialize layout info
+    set _layout(mode) "usual"
+    set _layout(active) ""
+
     # create a list of tuples for data
     set _results [Rappture::Tuples ::#auto]
@@ -86 +117 @@
     itk_component add cntls {
         frame $itk_interior.cntls
-    }
-    pack $itk_component(cntls) -fill x
+    } {
+        usual
+        rename -background -controlbarbackground controlbarBackground Background
+        rename -highlightbackground -controlbarbackground controlbarBackground Background
+    }
+    pack $itk_component(cntls) -fill x -pady {0 2}
 
     itk_component add clear {
         button $itk_component(cntls).clear -text "Clear" -state disabled \
+            -padx 1 -pady 1 \
             -relief flat -overrelief raised \
             -command [itcl::code $this _doClear]
-    }
-    pack $itk_component(clear) -side right
+    } {
+        usual
+        rename -background -controlbarbackground controlbarBackground Background
+        rename -foreground -controlbarforeground controlbarForeground Foreground
+        rename -highlightbackground -controlbarbackground controlbarBackground Background
+    }
+    pack $itk_component(clear) -side right -padx 2 -pady 1
     Rappture::Tooltip::for $itk_component(clear) \
         "Clears all results collected so far."
 
     itk_component add status {
-        label $itk_component(cntls).status -anchor w -text "No results"
-    }
-    pack $itk_component(status) -side left -expand yes -fill x
-
-    itk_component add scroller {
-        Rappture::Scroller $itk_interior.scroller \
-            -xscrollmode off -yscrollmode auto -height 1i
-    }
-    pack $itk_component(scroller) -expand yes -fill both
+        label $itk_component(cntls).status -anchor w \
+            -text "No results" -padx 0 -pady 0
+    } {
+        usual
+        rename -background -controlbarbackground controlbarBackground Background
+        rename -foreground -controlbarforeground controlbarForeground Foreground
+        rename -highlightbackground -controlbarbackground controlbarBackground Background
+    }
+    pack $itk_component(status) -side left -padx 2 -pady {2 0}
+
+    itk_component add parameters {
+        button $itk_component(cntls).params -text "Parameters..." \
+            -state disabled -padx 1 -pady 1 \
+            -relief flat -overrelief raised \
+            -command [list $itk_component(hull).popup activate $itk_component(cntls).params above]
+    } {
+        usual
+        rename -background -controlbarbackground controlbarBackground Background
+        rename -foreground -controlbarforeground controlbarForeground Foreground
+        rename -highlightbackground -controlbarbackground controlbarBackground Background
+    }
+    pack $itk_component(parameters) -side left -padx 8 -pady 1
+    Rappture::Tooltip::for $itk_component(parameters) \
+        "Click to access all parameters."
+
+    itk_component add dials {
+        frame $itk_interior.dials
+    }
+    pack $itk_component(dials) -expand yes -fill both
+    bind $itk_component(dials) <Configure> \
+        [list $_dispatcher event -after 10 !layout why resize]
+
+    # create the permanent controls in the "short list" area
+    set dials $itk_component(dials)
+    frame $dials.bg
+    Rappture::Radiodial $dials.dial -valuewidth 0
+    Rappture::Tooltip::for $dials.dial \
+        "@[itcl::code $this _getTooltip dial active]"
+
+    set fn [option get $itk_component(hull) textFont Font]
+    label $dials.all -text "All" -padx 8 \
+        -borderwidth 1 -relief raised -font $fn
+    Rappture::Tooltip::for $dials.all \
+        "@[itcl::code $this _getTooltip all active]"
+    bind $dials.all <ButtonRelease> [itcl::code $this _toggleAll]
+
+    frame $dials.labelmore
+    label $dials.labelmore.arrow -bitmap [Rappture::icon empty] -borderwidth 0
+    pack $dials.labelmore.arrow -side left -fill y
+    _control bind $dials.labelmore.arrow @more
+    label $dials.labelmore.name -text "more parameters..." -font $fn \
+        -borderwidth 0 -padx 0 -pady 1
+    pack $dials.labelmore.name -side left
+    label $dials.labelmore.value
+    pack $dials.labelmore.value -side left
+    _control bind $dials.labelmore.name @more
+    Rappture::Tooltip::for $dials.labelmore \
+        "@[itcl::code $this _getTooltip more more]"
+
+    # use this pop-up for access to all controls
+    Rappture::Balloon $itk_component(hull).popup \
+        -title "Change Parameters" -padx 0 -pady 0
+    set inner [$itk_component(hull).popup component inner]
+
+    frame $inner.cntls
+    pack $inner.cntls -side bottom -fill x
+    frame $inner.cntls.sep -height 2 -borderwidth 1 -relief sunken
+    pack $inner.cntls.sep -side top -fill x -padx 4 -pady 4
+    checkbutton $inner.cntls.explore -font $fn \
+        -text "Explore combinations with no results" \
+        -variable [itcl::scope _explore] \
+        -command [itcl::code $this _fixExplore]
+    pack $inner.cntls.explore -side top -anchor w
+    Rappture::Tooltip::for $inner.cntls.explore \
+        "When this option is turned on, you can set parameters to various combinations that have not yet been simulated.  The Simulate button will light up, and you can simulate these missing combinations.\n\nWhen turned off, controls will avoid missing combinations, and automatically snap to the closest available dataset."
+
+    itk_component add options {
+        Rappture::Scroller $inner.scrl -xscrollmode auto -yscrollmode auto
+    }
+    pack $itk_component(options) -expand yes -fill both
+
+    set popup [$itk_component(options) contents frame]
+    frame $popup.bg
 
     eval itk_initialize $args
@@ -143 +258 @@
         $itk_component(status) configure -text "1 result"
         $itk_component(clear) configure -state normal
+        if {[$_results size] >= 2} {
+            $itk_component(parameters) configure -state normal
+        } else {
+            $itk_component(parameters) configure -state disabled
+        }
         return 0
     }
@@ -204 +324 @@
     } else {
         $itk_component(status) configure -text "[$_results size] results"
+        $itk_component(parameters) configure -state normal
     }
     $itk_component(clear) configure -state normal
@@ -219 +340 @@
 
     # delete all adjuster controls
-    set f [$itk_component(scroller) contents frame]
-    foreach w [winfo children $f] {
-        destroy $w
-    }
-    catch {unset _col2widget}
-    set _plotall ""
+    set popup [$itk_component(options) contents frame]
+    set shortlist $itk_component(dials)
+    foreach col $_cntlInfo($this-all) {
+        set id $_cntlInfo($this-$col-id)
+        destroy $popup.label$id $popup.dial$id $popup.all$id
+        destroy $shortlist.label$id
+    }
+
+    # clean up control info
+    foreach key [array names _cntlInfo $this-*] {
+        catch {unset _cntlInfo($key)}
+    }
+    set _cntlInfo($this-all) ""
     set _counter 0
-
-    # don't need to scroll adjustor controls right now
-    $itk_component(scroller) configure -yscrollmode off
 
     # clear out all results
@@ -234 +359 @@
     eval $_results column delete [lrange [$_results column names] 1 end]
     set _recent ""
+    set _active ""
+
+    set _plotall 0
+    $itk_component(dials).all configure -relief raised \
+        -background $itk_option(-background) \
+        -foreground $itk_option(-foreground)
 
     # update status and Clear button
     $itk_component(status) configure -text "No results"
+    $itk_component(parameters) configure -state disabled
     $itk_component(clear) configure -state disabled
     $_dispatcher event -idle !fixcntls
+
+    # let clients know that the number of controls has changed
+    event generate $itk_component(hull) <<Control>>
+}
+
+# ----------------------------------------------------------------------
+# USAGE: activate <column>
+#
+# Clients use this to activate a particular column in the set of
+# controls.  When a column is active, its label is bold and its
+# value has a radiodial in the "short list" area.
+# ----------------------------------------------------------------------
+itcl::body Rappture::ResultSet::activate {column} {
+    if {$column == "@more"} {
+        $itk_component(hull).popup activate \
+            $itk_component(dials).labelmore.name above
+        return
+    }
+
+    set allowed [$_results column names]
+    if {[lsearch $allowed $column] < 0} {
+        error "bad value \"$column\": should be one of [join $allowed {, }]"
+    }
+
+    # column is now active
+    set _active $column
+
+    # keep track of usage, so we know which controls are popular
+    incr _cntlInfo($this-$column-usage)
+
+    # fix controls at next idle point
+    $_dispatcher event -idle !layout why data
+    $_dispatcher event -idle !settings column $_active
 }
 
@@ -310 +475 @@
 
 # ----------------------------------------------------------------------
-# USAGE: size ?-results|-controls?
-#
-# Returns the number of results or the number of controls in this
-# result set.
+# USAGE: size ?-results|-controls|-controlarea?
+#
+# Returns various measures for the size of this area:
+#   -results ....... number of results loaded
+#   -controls ...... number of distinct control parameters
+#   -controlarea ... minimum size of usable control area, in pixels
 # ----------------------------------------------------------------------
 itcl::body Rappture::ResultSet::size {{what -results}} {
@@ -321 +488 @@
         }
         -controls {
-            return [array size _col2widget]
+            return [llength $_cntlInfo($this-all)]
+        }
+        -controlarea {
+            set ht [winfo reqheight $itk_component(cntls)]
+            incr ht 2  ;# padding below controls
+
+            set normalLine [font metrics $itk_option(-textfont) -linespace]
+            incr normalLine 2  ;# padding
+            set boldLine [font metrics $itk_option(-boldfont) -linespace]
+            incr boldLine 2  ;# padding
+
+            set numcntls [llength $_cntlInfo($this-all)]
+            switch -- $numcntls {
+                0 - 1 {
+                    # 0 = no controls (no data at all)
+                    # 1 = run control, but only 1 run so far
+                    # add nothing
+                }
+                default {
+                    # non-active controls
+                    incr ht [expr {($numcntls-1)*$normalLine}]
+                    # active control
+                    incr ht $boldLine
+                    # dial for active control
+                    incr ht [winfo reqheight $itk_component(dials).dial]
+                    # padding around active control
+                    incr ht 4
+                }
+            }
+            return $ht
         }
         default {
-            error "bad option \"$what\": should be -results or -controls"
+            error "bad option \"$what\": should be -results, -controls, or -controlarea"
         }
     }
@@ -356 +552 @@
 
 # ----------------------------------------------------------------------
+# USAGE: _doPrompt <state>
+#
+# Used internally whenever the current settings represent a point
+# with no data.  Invokes the -promptcommand with an explanation of
+# the missing data, prompting the user to simulate it.
+# ----------------------------------------------------------------------
+itcl::body Rappture::ResultSet::_doPrompt {state} {
+    if {[string length $itk_option(-promptcommand)] > 0} {
+        if {$state} {
+            set message "No data for these settings"
+            set settings ""
+            foreach col [lrange [$_results column names] 1 end] {
+                set val $_cntlInfo($this-$col-value)
+                lappend settings $col $val
+            }
+            uplevel #0 $itk_option(-promptcommand) [list on $message $settings]
+        } else {
+            uplevel #0 $itk_option(-promptcommand) off
+        }
+    }
+}
+
+# ----------------------------------------------------------------------
+# USAGE: _control bind <widget> <column>
+# USAGE: _control hilite <state> <column> <panel>
+# USAGE: _control load <widget> <column>
+#
+# Used internally to manage the interactivity of controls.  The "bind"
+# operation sets up bindings on the label/value for each control, so
+# you can mouse over and click on a control to activate it.  The
+# "hilite" operation controls highlighting of the control.  The "load"
+# operation loads data into the specified radiodial <widget>.
+# ----------------------------------------------------------------------
+itcl::body Rappture::ResultSet::_control {option args} {
+    switch -- $option {
+        bind {
+            if {[llength $args] != 2} {
+                error "wrong # args: should be _control bind widget column"
+            }
+            set widget [lindex $args 0]
+            set col [lindex $args 1]
+
+            set panel [winfo parent $widget]
+            if {[string match label* [winfo name $panel]]} {
+                set panel [winfo parent $panel]
+            }
+
+            bind $widget <Enter> \
+                [itcl::code $this _control hilite on $col $panel]
+            bind $widget <Leave> \
+                [itcl::code $this _control hilite off $col $panel]
+            bind $widget <ButtonRelease> [itcl::code $this activate $col]
+        }
+        hilite {
+            if {[llength $args] != 3} {
+                error "wrong # args: should be _control hilite state column panel"
+            }
+            if {$_layout(mode) != "usual"} {
+                # abbreviated controls? then skip highlighting
+                return
+            }
+            set state [lindex $args 0]
+            set col [lindex $args 1]
+            set panel [lindex $args 2]
+
+            if {[string index $col 0] == "@"} {
+                # handle artificial names like "@more"
+                set id [string range $col 1 end]
+            } else {
+                # get id for ordinary columns
+                set id $_cntlInfo($this-$col-id)
+            }
+
+            # highlight any non-active entries
+            if {$col != $_active} {
+                if {$state} {
+                    set fg $itk_option(-controlactiveforeground)
+                    $panel.label$id.name configure -fg $fg
+                    $panel.label$id.value configure -fg $fg
+                    $panel.label$id.arrow configure -fg $fg \
+                        -bitmap [Rappture::icon rarrow2]
+                } else {
+                    set fg $itk_option(-foreground)
+                    $panel.label$id.name configure -fg $fg
+                    $panel.label$id.value configure -fg $fg
+                    $panel.label$id.arrow configure -fg $fg \
+                        -bitmap [Rappture::icon empty]
+                }
+            }
+        }
+        load {
+            if {[llength $args] != 2} {
+                error "wrong # args: should be _control load widget column"
+            }
+            set dial [lindex $args 0]
+            set col [lindex $args 1]
+
+            if {$col == "xmlobj"} {
+                 # load the Simulation # control
+                 set nruns [$_results size]
+
+                 # load the results into the control
+                 $dial clear
+                 for {set n 0} {$n < $nruns} {incr n} {
+                     $dial add "#[expr {$n+1}]" $n
+                 }
+                 return
+            }
+
+            set havenums 1
+            set vlist ""
+            foreach rec [$_results get -format [list xmlobj $col]] {
+                set xo [lindex $rec 0]
+                set v [lindex $rec 1]
+
+                if {![info exists values($v)]} {
+                    lappend vlist $v
+                    foreach {raw norm} [Rappture::LibraryObj::value $xo $col] break
+                    set values($v) $norm
+
+                    if {$havenums && ![string is double $norm]} {
+                        set havenums 0
+                    }
+                }
+            }
+
+            if {!$havenums} {
+                # don't have normalized nums? then sort and create nums
+                catch {unset values}
+
+                set n 0
+                foreach v [lsort $vlist] {
+                    set values($v) [incr n]
+                }
+            }
+
+            # load the results into the control
+            $dial clear
+            foreach v [array names values] {
+                $dial add $v $values($v)
+            }
+        }
+        default {
+            error "bad option \"$option\": should be bind, hilite, or load"
+        }
+    }
+}
+
+# ----------------------------------------------------------------------
 # USAGE: _fixControls ?<eventArgs...>?
 #
@@ -363 +708 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::ResultSet::_fixControls {args} {
-    set f [$itk_component(scroller) contents frame]
-    grid columnconfigure $f 1 -weight 1
-
     if {[$_results size] == 0} {
         return
     }
 
+    set popup [$itk_component(options) contents frame]
+    grid columnconfigure $popup 0 -minsize 16
+    grid columnconfigure $popup 1 -weight 1
+
+    set shortlist $itk_component(dials)
+    grid columnconfigure $shortlist 1 -weight 1
+
     #
     # Scan through all columns in the data and create any
     # controls that just appeared.
     #
-    foreach col [lrange [$_results column names] 1 end] {
+    set nadded 0
+    foreach col [$_results column names] {
         set xmlobj [$_results get -format xmlobj 0]
 
@@ -381 +731 @@
         # create one.
         #
-        if {![info exists _col2widget($col)]} {
-            # add an "All" button to plot all results
-            label $f.all$_counter -text "All" -padx 8 \
-                -borderwidth 1 -relief raised -font $itk_option(-textfont)
-            grid $f.all$_counter -row $_counter -column 0 \
-                -padx 8 -pady 2 -sticky nsew
-            Rappture::Tooltip::for $f.all$_counter "Plot all values for this quantity"
-
-            bind $f.all$_counter <ButtonPress> \
-                [itcl::code $this _toggleAll $col $f.all$_counter]
-
-            # search for the first XML object with this element defined
-            foreach xmlobj [$_results get -format xmlobj] {
-                set str [$xmlobj get $col.about.label]
-                if {"" == $str} {
-                    set str [$xmlobj element -as id $col]
+        if {![info exists _cntlInfo($this-$col-id)]} {
+            set row [lindex [grid size $popup] 1]
+            set row2 [expr {$row+1}]
+
+            set tip ""
+            if {$col == "xmlobj"} {
+                set quantity "Simulation"
+                set tip "List of all simulations that you have performed so far."
+            } else {
+                # search for the first XML object with this element defined
+                foreach xmlobj [$_results get -format xmlobj] {
+                    set quantity [$xmlobj get $col.about.label]
+                    set tip [$xmlobj get $col.about.description]
+                    if {"" != $quantity} {
+                        break
+                    }
                 }
-                if {"" != $str} {
-                    break
+                if {"" == $quantity && "" != $xmlobj} {
+                    set quantity [$xmlobj element -as id $col]
                 }
             }
 
-            if {"" != $str} {
-                set w $f.label$_counter
-                label $w -text $str -anchor w -font $itk_option(-boldfont)
-                grid $w -row $_counter -column 1 -sticky w
-
-                grid $f.all$_counter -rowspan 2
-                Rappture::Tooltip::for $f.all$_counter "Plot all values for $str"
-                incr _counter
-            }
-
-            set w $f.cntl$_counter
-            Rappture::Radiodial $w
-            grid $w -row $_counter -column 1 -sticky ew
-            bind $w <<Value>> \
-                [itcl::code $_dispatcher event -after 100 !settings column $col widget $w]
-            set _col2widget($col) $w
+            #
+            # Build the main control in the pop-up panel.
+            #
+            set fn $itk_option(-textfont)
+            set w $popup.label$_counter
+            frame $w
+            grid $w -row $row -column 2 -sticky ew -padx 4 -pady {4 0}
+            label $w.arrow -bitmap [Rappture::icon empty] -borderwidth 0
+            pack $w.arrow -side left -fill y
+            _control bind $w.arrow $col
+
+            label $w.name -text $quantity -anchor w \
+                -borderwidth 0 -padx 0 -pady 1 -font $fn
+            pack $w.name -side left
+            bind $w.name <Configure> [itcl::code $this _fixValue $col resize]
+            _control bind $w.name $col
+
+            label $w.value -anchor w \
+                -borderwidth 0 -padx 0 -pady 1 -font $fn
+            pack $w.value -side left
+            bind $w.value <Configure> [itcl::code $this _fixValue $col resize]
+            _control bind $w.value $col
+
+            Rappture::Tooltip::for $w \
+                "@[itcl::code $this _getTooltip label $col]"
+
+            set w $popup.dial$_counter
+            Rappture::Radiodial $w -valuewidth 0
+            grid $w -row $row2 -column 2 -sticky ew -padx 4 -pady {0 4}
+            $w configure -variable ::Rappture::ResultSet::_cntlInfo($this-$col-value)
+            Rappture::Tooltip::for $w \
+                "@[itcl::code $this _getTooltip dial $col]"
+
+            set w $popup.all$_counter
+            label $w -text "All" -padx 8 \
+                -borderwidth 1 -relief raised -font $fn
+            grid $w -row $row -rowspan 2 -column 1 -sticky nsew -padx 2 -pady 4
+            Rappture::Tooltip::for $w \
+                "@[itcl::code $this _getTooltip all $col]"
+            bind $w <ButtonRelease> [itcl::code $this _toggleAll $col]
+
+            # Create the controls for the "short list" area.
+            set w $shortlist.label$_counter
+            frame $w
+            grid $w -row $row -column 1 -sticky ew
+            label $w.arrow -bitmap [Rappture::icon empty] -borderwidth 0
+            pack $w.arrow -side left -fill y
+            _control bind $w.arrow $col
+
+            label $w.name -text $quantity -anchor w \
+                -borderwidth 0 -padx 0 -pady 1 -font $fn
+            pack $w.name -side left
+            bind $w.name <Configure> [itcl::code $this _fixValue $col resize]
+            _control bind $w.name $col
+
+            label $w.value -anchor w \
+                -borderwidth 0 -padx 0 -pady 1 -font $fn
+            pack $w.value -side left
+            bind $w.value <Configure> [itcl::code $this _fixValue $col resize]
+            _control bind $w.value $col
+
+            Rappture::Tooltip::for $w \
+                "@[itcl::code $this _getTooltip label $col]"
+
+            # if this is the "Simulation #" control, add a separator
+            if {$col == "xmlobj"} {
+                grid $popup.all$_counter -column 0
+                grid $popup.label$_counter -column 1 -columnspan 2
+                grid $popup.dial$_counter -column 1 -columnspan 2
+
+                if {![winfo exists $popup.sep]} {
+                    frame $popup.sep -height 1 -borderwidth 0 -background black
+                }
+                grid $popup.sep -row [expr {$row+2}] -column 0 \
+                    -columnspan 3 -sticky ew -pady 4
+
+                if {![winfo exists $popup.paraml]} {
+                    label $popup.paraml -text "Parameters:" -font $fn
+                }
+                grid $popup.paraml -row [expr {$row+3}] -column 0 \
+                    -columnspan 3 -sticky w -padx 4 -pady {0 4}
+            }
+
+            # create a record for this control
+            lappend _cntlInfo($this-all) $col
+            set _cntlInfo($this-$col-id) $_counter
+            set _cntlInfo($this-$col-label) $quantity
+            set _cntlInfo($this-$col-tip) $tip
+            set _cntlInfo($this-$col-value) ""
+            set _cntlInfo($this-$col-usage) 0
+            set _cntlInfo($this-$col) ""
+
+            trace add variable _cntlInfo($this-$col-value) write \
+                "[itcl::code $this _fixValue $col value]; list"
 
             incr _counter
-            grid rowconfigure $f $_counter -minsize 4
-            incr _counter
-
-            $itk_component(scroller) configure -yscrollmode auto
+
+            # fix the shortlist layout to show as many controls as we can
+            $_dispatcher event -now !layout why data
 
             # let clients know that a new control appeared
@@ -435 +862 @@
         # them into the control.
         #
-        catch {unset values}
-        set havenums 1
-        set vlist ""
-        foreach rec [$_results get -format [list xmlobj $col]] {
-            set xo [lindex $rec 0]
-            set v [lindex $rec 1]
-
-            if {![info exists values($v)]} {
-                lappend vlist $v
-                foreach {raw norm} [Rappture::LibraryObj::value $xo $col] break
-                set values($v) $norm
-
-                if {$havenums && ![string is double $norm]} {
-                    set havenums 0
+        set id $_cntlInfo($this-$col-id)
+        set popup [$itk_component(options) contents frame]
+        set dial $popup.dial$id
+
+        _control load $popup.dial$id $col
+
+        if {$col == $_layout(active)} {
+            $shortlist.dial configure -variable ""
+            _control load $shortlist.dial $col
+            $shortlist.dial configure -variable \
+                "::Rappture::ResultSet::_cntlInfo($this-$col-value)"
+        }
+        incr nadded
+    }
+
+    #
+    # Activate the most recent control.  If a bunch of controls
+    # were just added, then activate the "Simulation" control,
+    # since that's the easiest way to page through results.
+    #
+    if {$nadded > 0} {
+        if {[$_results column names] == 2 || $nadded == 1} {
+            activate [lindex $_cntlInfo($this-all) end]
+        } else {
+            activate xmlobj
+        }
+    }
+
+    #
+    # Set all controls to the settings of the most recent addition.
+    # Setting the value slot will trigger the !settings event, which
+    # will then fix all other controls to match the one that changed.
+    #
+    if {"" != $_recent} {
+        set raw [lindex [$_results find -format xmlobj $_recent] 0]
+        set raw "#[expr {$raw+1}]"
+        set _cntlInfo($this-xmlobj-value) $raw
+    }
+}
+
+# ----------------------------------------------------------------------
+# USAGE: _fixLayout ?<eventArgs...>?
+#
+# Called automatically at the idle point after the controls have
+# changed, or the size of the window has changed.  Fixes the layout
+# so that the active control is displayed, and other recent controls
+# are shown above and/or below.  At the very least, we must show the
+# "more options..." control, which pops up a panel of all controls.
+# ----------------------------------------------------------------------
+itcl::body Rappture::ResultSet::_fixLayout {args} {
+    array set eventdata $args
+
+    set popup [$itk_component(options) contents frame]
+    set shortlist $itk_component(dials)
+
+    # clear out the short list area
+    foreach w [grid slaves $shortlist] {
+        grid forget $w
+    }
+
+    # reset all labels back to an ordinary font/background
+    set fn $itk_option(-textfont)
+    set bg $itk_option(-background)
+    set fg $itk_option(-foreground)
+    foreach col $_cntlInfo($this-all) {
+        set id $_cntlInfo($this-$col-id)
+        $popup.label$id configure -background $bg
+        $popup.label$id.arrow configure -background $bg \
+            -bitmap [Rappture::icon empty]
+        $popup.label$id.name configure -font $fn -background $bg
+        $popup.label$id.value configure -background $bg
+        $popup.all$id configure -background $bg -foreground $fg \
+            -relief raised
+        $popup.dial$id configure -background $bg
+        $shortlist.label$id configure -background $bg
+        $shortlist.label$id.arrow configure -background $bg \
+            -bitmap [Rappture::icon empty]
+        $shortlist.label$id.name configure -font $fn -background $bg
+        $shortlist.label$id.value configure -background $bg
+    }
+
+    # only 1 result? then we don't need any controls
+    if {[$_results size] < 2} {
+        return
+    }
+
+    # compute the number of controls that will fit in the shortlist area
+    set dials $itk_component(dials)
+    set h [winfo height $dials]
+    set normalLine [font metrics $itk_option(-textfont) -linespace]
+    set boldLine [font metrics $itk_option(-boldfont) -linespace]
+    set active [expr {$boldLine+[winfo reqheight $dials.dial]+4}]
+
+    if {$h < $active+$normalLine} {
+        # active control kinda big? then show parameter values only
+        set _layout(mode) abbreviated
+        set ncntls [expr {int(floor(double($h)/$normalLine))}]
+    } else {
+        set _layout(mode) usual
+        set ncntls [expr {int(floor(double($h-$active)/$normalLine))+1}]
+    }
+
+    # find the controls with the most usage
+    set order ""
+    foreach col $_cntlInfo($this-all) {
+        lappend order [list $col $_cntlInfo($this-$col-usage)]
+    }
+    set order [lsort -integer -decreasing -index 1 $order]
+
+    set mostUsed ""
+    if {[llength $order] <= $ncntls} {
+        # plenty of space? then show all controls
+        foreach item $order {
+            lappend mostUsed [lindex $item 0]
+        }
+    } else {
+        # otherwise, limit to the most-used controls
+        foreach item [lrange $order 0 [expr {$ncntls-1}]] {
+            lappend mostUsed [lindex $item 0]
+        }
+
+        # make sure the active control is included
+        if {"" != $_active && [lsearch -exact $mostUsed $_active] < 0} {
+            set mostUsed [lreplace [linsert $mostUsed 0 $_active] end end]
+        }
+
+        # if there are more controls, add the "more parameters..." entry
+        if {$ncntls > 2} {
+            set mostUsed [lreplace $mostUsed end end @more]
+            set rest [expr {[llength $order]-($ncntls-1)}]
+            if {$rest == 1} {
+                $dials.labelmore.name configure -text "1 more parameter..."
+            } else {
+                $dials.labelmore.name configure -text "$rest more parameters..."
+            }
+        }
+    }
+
+    # draw the active control
+    set row 0
+    foreach col [concat $_cntlInfo($this-all) @more] {
+        # this control not on the short list? then ignore it
+        if {[lsearch $mostUsed $col] < 0} {
+            continue
+        }
+
+        if {[string index $col 0] == "@"} {
+            set id [string range $col 1 end]
+        } else {
+            set id $_cntlInfo($this-$col-id)
+        }
+        grid $shortlist.label$id -row $row -column 1 -sticky ew -padx 4
+
+        if {$col == $_active} {
+            # put the background behind the active control in the popup
+            set id $_cntlInfo($this-$_active-id)
+            array set ginfo [grid info $popup.label$id]
+            grid $popup.bg -row $ginfo(-row) -rowspan 2 \
+                -column 0 -columnspan 3 -sticky nsew
+            lower $popup.bg
+
+            if {$_layout(mode) == "usual"} {
+                # put the background behind the active control in the shortlist
+                grid $shortlist.bg -row $row -rowspan 2 \
+                    -column 0 -columnspan 2 -sticky nsew
+                lower $shortlist.bg
+
+                # place the All and dial in the shortlist area
+                grid $shortlist.all -row $row -rowspan 2 -column 0 \
+                    -sticky nsew -padx 2 -pady 2
+                grid $shortlist.dial -row [expr {$row+1}] -column 1 \
+                    -sticky ew -padx 4
+                incr row
+
+                if {$_layout(active) != $_active} {
+                    $shortlist.dial configure -variable ""
+                    _control load $shortlist.dial $col
+                    $shortlist.dial configure -variable \
+                        "::Rappture::ResultSet::_cntlInfo($this-$col-value)"
+                    set _layout(active) $_active
                 }
             }
         }
-
-        if {!$havenums} {
-            # don't have normalized nums? then sort and create nums
-            catch {unset values}
-
-            set n 0
-            foreach v [lsort $vlist] {
-                set values($v) [incr n]
-            }
-        }
-
-        # load the results into the control
-        set w $_col2widget($col)
-        $w clear
-        foreach v [array names values] {
-            $w add $v $values($v)
-        }
-    }
-
-    #
-    # Set all controls to the settings of the most recent
-    # addition.
-    #
-    if {"" != $_recent} {
-        foreach col [array names _col2widget] {
-            set raw [lindex [Rappture::LibraryObj::value $_recent $col] 0]
-            $_col2widget($col) current $raw
-        }
-    }
-
-    # fix the settings after everything settles
-    $_dispatcher event -after 100 !settings
+        incr row
+    }
+
+    # highlight the active control
+    if {[info exists _cntlInfo($this-$_active-id)]} {
+        set id $_cntlInfo($this-$_active-id)
+        set bf $itk_option(-boldfont)
+        set fg $itk_option(-activecontrolforeground)
+        set bg $itk_option(-activecontrolbackground)
+
+        $popup.label$id configure -background $bg
+        $popup.label$id.arrow configure -foreground $fg -background $bg \
+            -bitmap [Rappture::icon rarrow]
+        $popup.label$id.name configure -foreground $fg -background $bg \
+            -font $bf
+        $popup.label$id.value configure -foreground $fg -background $bg
+        $popup.dial$id configure -background $bg
+        $popup.bg configure -background $bg
+
+        if {$_plotall} {
+            $popup.all$id configure -relief sunken \
+                -background $itk_option(-togglebackground) \
+                -foreground $itk_option(-toggleforeground)
+        } else {
+            $popup.all$id configure -relief raised \
+                -background $itk_option(-activecontrolbackground) \
+                -foreground $itk_option(-activecontrolforeground)
+        }
+
+        if {$_layout(mode) == "usual"} {
+            $shortlist.label$id configure -background $bg
+            $shortlist.label$id.arrow configure -foreground $fg \
+                -background $bg -bitmap [Rappture::icon rarrow]
+            $shortlist.label$id.name configure -foreground $fg \
+                -background $bg -font $bf
+            $shortlist.label$id.value configure -foreground $fg \
+                -background $bg
+            $shortlist.dial configure -background $bg
+            $shortlist.bg configure -background $bg
+
+            if {[$shortlist.all cget -relief] == "raised"} {
+                $shortlist.all configure -foreground $fg -background $bg
+            }
+        }
+    }
 }
 
@@ -497 +1103 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::ResultSet::_fixSettings {args} {
+    array set eventdata $args
+    if {[info exists eventdata(column)]} {
+        set changed $eventdata(column)
+    } else {
+        set changed ""
+    }
     _doPrompt off
 
@@ -512 +1124 @@
 
     #
+    # Find the selected run.  If the run setting changed, then
+    # look at its current value.  Otherwise, search the results
+    # for a tuple that matches the current settings.
+    #
+    if {$changed == "xmlobj"} {
+        # value is "#2" -- skip # and adjust range starting from 0
+        set irun [string range $_cntlInfo($this-xmlobj-value) 1 end]
+        if {"" != $irun} { set irun [expr {$irun-1}] }
+    } else {
+        set format ""
+        set tuple ""
+        foreach col [lrange [$_results column names] 1 end] {
+            lappend format $col
+            lappend tuple $_cntlInfo($this-$col-value)
+        }
+        set irun [lindex [$_results find -format $format -- $tuple] 0]
+
+        if {"" == $irun && "" != $changed
+             && $itk_option(-missingdata) == "skip"} {
+            #
+            # No data for these settings.  Try leaving the next
+            # column open, then the next, and so forth, until
+            # we find some data.
+            #
+            # allcols:  foo bar baz qux
+            #               ^^^changed
+            #
+            # search:   baz qux foo
+            #
+            set val $_cntlInfo($this-$changed-value)
+            set allcols [lrange [$_results column names] 1 end]
+            set i [lsearch -exact $allcols $changed]
+            set search [concat \
+                [lrange $allcols [expr {$i+1}] end] \
+                [lrange $allcols 0 [expr {$i-1}]] \
+            ]
+            set nsearch [llength $search]
+
+            for {set i 0} {$i < $nsearch} {incr i} {
+                set format $changed
+                set tuple [list $val]
+                for {set j [expr {$i+1}]} {$j < $nsearch} {incr j} {
+                    set col [lindex $search $j]
+                    lappend format $col
+                    lappend tuple $_cntlInfo($this-$col-value)
+                }
+                set irun [lindex [$_results find -format $format -- $tuple] 0]
+                if {"" != $irun} {
+                    break
+                }
+            }
+        }
+    }
+
+    #
+    # If we found a particular run, then load its values into all
+    # controls.
+    #
+    if {"" != $irun} {
+        # stop reacting to value changes
+        set _settings 1
+
+        set format [lrange [$_results column names] 1 end]
+        set data [lindex [$_results get -format $format $irun] 0]
+        foreach col $format val $data {
+            set _cntlInfo($this-$col-value) $val
+        }
+        set _cntlInfo($this-xmlobj-value) "#[expr {$irun+1}]"
+
+        # okay, react to value changes again
+        set _settings 0
+    }
+
+    #
     # Search for tuples matching the current setting and
     # plot them.
     #
-    set format ""
-    set tuple ""
-    foreach col [lrange [$_results column names] 1 end] {
-        if {$col != $_plotall} {
-            lappend format $col
-            set w $_col2widget($col)
-            lappend tuple [$w get current]
+    if {$_plotall && $_active == "xmlobj"} {
+        set format ""
+    } else {
+        set format ""
+        set tuple ""
+        foreach col [lrange [$_results column names] 1 end] {
+            if {!$_plotall || $col != $_active} {
+                lappend format $col
+                lappend tuple $_cntlInfo($this-$col-value)
+            }
         }
     }
@@ -537 +1226 @@
         foreach col [lrange [$_results column names] 1 end] {
             lappend format $col
-            set w $_col2widget($col)
-            lappend tuple [$w get current]
+            lappend tuple $_cntlInfo($this-$col-value)
         }
         set icurr [$_results find -format $format -- $tuple]
@@ -570 +1258 @@
         #
         _doSettings $plist
-    } elseif {$itk_option(-missingdata) == "skip"} {
-        #
-        # No data for these settings.  Try leaving the next
-        # column open, then the next, and so forth, until
-        # we find some data.
-        #
-        array set eventdata $args
-        if {[info exists eventdata(column)]} {
-            set changed $eventdata(column)
-            set allcols [lrange [$_results column names] 1 end]
-            set i [lsearch -exact $allcols $changed]
-            set search [concat \
-                [lrange $allcols [expr {$i+1}] end] \
-                [lrange $allcols 0 [expr {$i-1}]] \
-            ]
-            set nsearch [llength $search]
-
-            set tweak(widget) ""
-            set tweak(value) ""
-            for {set i 0} {$i < $nsearch} {incr i} {
-                set format $eventdata(column)
-                set tuple [list [$eventdata(widget) get current]]
-                for {set j [expr {$i+1}]} {$j < $nsearch} {incr j} {
-                    set col [lindex $search $j]
-                    set w $_col2widget($col)
-                    lappend format $col
-                    lappend tuple [$w get current]
-                }
-                set ilist [$_results find -format $format -- $tuple]
-                if {[llength $ilist] > 0} {
-                    set col [lindex $search $i]
-                    set tweak(widget) $_col2widget($col)
-                    set first [lindex $ilist 0]
-                    set tweak(value) [lindex [$_results get -format $col -- $first] 0]
-                    break
-                }
-            }
-
-            # set the value to the next valid result
-            if {$tweak(widget) != ""} {
-                $tweak(widget) current $tweak(value)
-            }
-        }
 
     } elseif {$itk_option(-missingdata) == "prompt"} {
         # prompt the user to simulate these settings
         _doPrompt on
-    }
-}
-
-# ----------------------------------------------------------------------
-# USAGE: _doPrompt <state>
-#
-# Used internally whenever the current settings represent a point
-# with no data.  Invokes the -promptcommand with an explanation of
-# the missing data, prompting the user to simulate it.
-# ----------------------------------------------------------------------
-itcl::body Rappture::ResultSet::_doPrompt {state} {
-    if {[string length $itk_option(-promptcommand)] > 0} {
-        if {$state} {
-            set message "No data for these settings"
-            set settings ""
-            foreach col [lrange [$_results column names] 1 end] {
-                set w $_col2widget($col)
-                set val [$w get current]
-                lappend settings $col $val
-            }
-            uplevel #0 $itk_option(-promptcommand) [list on $message $settings]
+        _doSettings  ;# clear plotting area
+
+        # clear the current run selection -- there is no run for this
+        set _settings 1
+        set _cntlInfo($this-xmlobj-value) ""
+        set _settings 0
+    }
+}
+
+# ----------------------------------------------------------------------
+# USAGE: _fixExplore
+#
+# Called automatically whenever the user toggles the "Explore" button
+# on the parameter popup.  Changes the -missingdata option back and
+# forth, to allow for missing data or skip it.
+# ----------------------------------------------------------------------
+itcl::body Rappture::ResultSet::_fixExplore {} {
+    if {$_explore} {
+        configure -missingdata prompt
+    } else {
+        configure -missingdata skip
+    }
+}
+
+# ----------------------------------------------------------------------
+# USAGE: _fixValue <columnName> <why>
+#
+# Called automatically whenver a value for a parameter dial changes.
+# Updates the interface to display the new value.  The <why> is a
+# reason for the change, which may be "resize" (draw old value in
+# new size) or "value" (value changed).
+# ----------------------------------------------------------------------
+itcl::body Rappture::ResultSet::_fixValue {col why} {
+    if {[info exists _cntlInfo($this-$col-id)]} {
+        set id $_cntlInfo($this-$col-id)
+
+        set popup [$itk_component(options) contents frame]
+        set widget $popup.label$id
+        set wmax [winfo width $popup.dial$id]
+        _drawValue $col $widget $wmax
+
+        set widget $itk_component(dials).label$id
+        set wmax [winfo width $itk_component(dials).dial]
+        if {$wmax <= 1} {
+            set wmax [expr {round(0.9*[winfo width $itk_component(cntls)])}]
+        }
+        _drawValue $col $widget $wmax
+
+        if {$why == "value" && !$_settings} {
+            # keep track of usage, so we know which controls are popular
+            incr _cntlInfo($this-$col-usage)
+
+            # adjust the settings according to the value in the column
+            $_dispatcher event -idle !settings column $col
+        }
+    }
+}
+
+# ----------------------------------------------------------------------
+# USAGE: _drawValue <columnName> <widget> <widthMax>
+#
+# Used internally to fix the rendering of a "quantity = value" display.
+# If the name/value in <widget> are smaller than <widthMax>, then the
+# full "quantity = value" string is displayed.  Otherwise, an
+# abbreviated form is displayed.
+# ----------------------------------------------------------------------
+itcl::body Rappture::ResultSet::_drawValue {col widget wmax} {
+    set quantity $_cntlInfo($this-$col-label)
+    regsub -all {\n} $quantity " " quantity  ;# take out newlines
+
+    set newval $_cntlInfo($this-$col-value)
+    regsub -all {\n} $newval " " newval  ;# take out newlines
+
+    set lfont [$widget.name cget -font]
+    set vfont [$widget.value cget -font]
+
+    set wn [font measure $lfont $quantity]
+    set wv [font measure $lfont " = $newval"]
+    set w [expr {$wn + $wv}]
+
+    if {$w <= $wmax} {
+        # if the text fits, then shown "quantity = value"
+        $widget.name configure -text $quantity
+        $widget.value configure -text " = $newval"
+    } else {
+        # Otherwise, we'll have to appreviate.
+        # If the value is really long, then just show a little bit
+        # of it.  Otherwise, show as much of the value as we can.
+        if {[string length $newval] > 30} {
+            set frac 0.8
         } else {
-            uplevel #0 $itk_option(-promptcommand) off
-        }
-    }
-}
-
-# ----------------------------------------------------------------------
-# USAGE: _toggleAll <path> <widget>
+            set frac 0.2
+        }
+        set wNameSpace [expr {round($frac*$wmax)}]
+        set wValueSpace [expr {$wmax-$wNameSpace}]
+
+        # fit as much of the "quantity" label in the space available
+        if {$wn < $wNameSpace} {
+            $widget.name configure -text $quantity
+            set wValueSpace [expr {$wmax-$wn}]
+        } else {
+            set wDots [font measure $lfont "..."]
+            set wchar [expr {double($wn)/[string length $quantity]}]
+            while {1} {
+                # figure out a good size for the abbreviated string
+                set cmax [expr {round(($wNameSpace-$wDots)/$wchar)}]
+                if {$cmax < 0} {set cmax 0}
+                set str "[string range $quantity 0 $cmax]..."
+                if {[font measure $lfont $str] <= $wNameSpace
+                      || $wDots >= $wNameSpace} {
+                    break
+                }
+                # we're measuring with average chars, so we may have
+                # to shave a little off and do this again
+                set wDots [expr {$wDots+2*$wchar}]
+            }
+            $widget.name configure -text $str
+            set wValueSpace [expr {$wmax-[font measure $lfont $str]}]
+        }
+
+        if {$wv < $wValueSpace} {
+            $widget.value configure -text " = $newval"
+        } else {
+            set wDots [font measure $vfont "..."]
+            set wEq [font measure $vfont " = "]
+            set wchar [expr {double($wv)/[string length " = $newval"]}]
+            while {1} {
+                # figure out a good size for the abbreviated string
+                set cmax [expr {round(($wValueSpace-$wDots-$wEq)/$wchar)}]
+                if {$cmax < 0} {set cmax 0}
+                set str " = [string range $newval 0 $cmax]..."
+                if {[font measure $vfont $str] <= $wValueSpace
+                      || $wDots >= $wValueSpace} {
+                    break
+                }
+                # we're measuring with average chars, so we may have
+                # to shave a little off and do this again
+                set wDots [expr {$wDots+2*$wchar}]
+            }
+            $widget.value configure -text $str
+        }
+    }
+}
+
+# ----------------------------------------------------------------------
+# USAGE: _toggleAll ?<columnName>?
 #
 # Called automatically whenever the user clicks on an "All" button.
 # Toggles the button between its on/off states.  In the "on" state,
-# all results associated with the <path> are sent to the result viewer.
-# ----------------------------------------------------------------------
-itcl::body Rappture::ResultSet::_toggleAll {path widget} {
-    if {[$widget cget -relief] == "sunken"} {
-        $widget configure -relief raised \
+# all results associated with the current control are sent to the
+# result viewer.
+# ----------------------------------------------------------------------
+itcl::body Rappture::ResultSet::_toggleAll {{col "current"}} {
+    if {$col == "current"} {
+        set col $_active
+    }
+    if {![info exists _cntlInfo($this-$col-id)]} {
+        return
+    }
+    set id $_cntlInfo($this-$col-id)
+    set popup [$itk_component(options) contents frame]
+    set pbutton $popup.all$id
+    set current [$pbutton cget -relief]
+    set sbutton $itk_component(dials).all
+
+    foreach c $_cntlInfo($this-all) {
+        set id $_cntlInfo($this-$c-id)
+        $popup.all$id configure -relief raised \
             -background $itk_option(-background) \
             -foreground $itk_option(-foreground)
-
-        set _plotall ""
+    }
+
+    if {$current == "sunken"} {
+        $pbutton configure -relief raised \
+            -background $itk_option(-activecontrolbackground) \
+            -foreground $itk_option(-activecontrolforeground)
+        $sbutton configure -relief raised \
+            -background $itk_option(-activecontrolbackground) \
+            -foreground $itk_option(-activecontrolforeground)
+        set _plotall 0
     } else {
-        # pop out all other "All" buttons
-        set f [$itk_component(scroller) contents frame]
-        for {set i 0} {$i < $_counter} {incr i} {
-            if {[winfo exists $f.all$i]} {
-                $f.all$i configure -relief raised \
-                    -background $itk_option(-background) \
-                    -foreground $itk_option(-foreground)
-            }
-        }
-
-        # push this one in
-        $widget configure -relief sunken \
+        $pbutton configure -relief sunken \
             -background $itk_option(-togglebackground) \
             -foreground $itk_option(-toggleforeground)
-
-        # switch the "All" context to this path
-        set _plotall $path
+        $sbutton configure -relief sunken \
+            -background $itk_option(-togglebackground) \
+            -foreground $itk_option(-toggleforeground)
+        set _plotall 1
+
+        if {$col != $_active} {
+            # clicked on an inactive "All" button? then activate that column
+            activate $col
+        }
     }
     $_dispatcher event -idle !settings
+}
+
+# ----------------------------------------------------------------------
+# USAGE: _getTooltip <role> <column>
+#
+# Called automatically whenever the user hovers a control within
+# this widget.  Returns the tooltip associated with the control.
+# ----------------------------------------------------------------------
+itcl::body Rappture::ResultSet::_getTooltip {role column} {
+    set label ""
+    set tip ""
+    if {$column == "active"} {
+        set column $_active
+    }
+    if {[info exists _cntlInfo($this-$column-label)]} {
+        set label $_cntlInfo($this-$column-label)
+    }
+    if {[info exists _cntlInfo($this-$column-tip)]} {
+        set tip $_cntlInfo($this-$column-tip)
+    }
+
+    switch -- $role {
+        label {
+            if {$column != $_active} {
+                append tip "\n\nClick to activate this control."
+            }
+        }
+        dial {
+            append tip "\n\nClick to change the value of this parameter."
+        }
+        all {
+            if {$label == ""} {
+                set tip "Plot all values for this quantity."
+            } else {
+                set tip "Plot all values for $label."
+            }
+            if {$_plotall} {
+                set what "all values"
+            } else {
+                set what "one value"
+            }
+            append tip "\n\nCurrently, plotting $what.  Click to toggle."
+        }
+        more {
+            set tip "Click to access all parameters."
+        }
+    }
+    return $tip
 }
 
@@ -688 +1515 @@
         error "bad value \"$itk_option(-missingdata)\": should be [join $opts {, }]"
     }
-}
+    set _explore [expr {$itk_option(-missingdata) != "skip"}]
+}
+
+# ----------------------------------------------------------------------
+# OPTION: -activecontrolbackground
+# ----------------------------------------------------------------------
+itcl::configbody Rappture::ResultSet::activecontrolbackground {
+    $_dispatcher event -idle !layout
+}
+
+# ----------------------------------------------------------------------
+# OPTION: -activecontrolforeground
+# ----------------------------------------------------------------------
+itcl::configbody Rappture::ResultSet::activecontrolforeground {
+    $_dispatcher event -idle !layout
+}

trunk/gui/scripts/textresult.tcl

@@ -36 +36 @@
     public method find {option}
 
-    set _dataobj ""  ;# data object currently being displayed
-
-    private common icons
-    set dir [file dirname [info script]]
-    set icons(up) [image create photo -file [file join $dir images findup.gif]]
-    set icons(down) [image create photo -file [file join $dir images finddn.gif]]
+    private variable _dataobj ""  ;# data object currently being displayed
+    private variable _raised      ;# maps all data objects => -raise param
 }
                                                                                 
@@ -80 +76 @@
 
     itk_component add finddown {
-        button $itk_component(controls).finddown -image $icons(down) \
+        button $itk_component(controls).finddown \
+            -image [Rappture::icon finddn] \
             -relief flat -overrelief raised \
             -command [itcl::code $this find down]
@@ -90 +87 @@
 
     itk_component add findup {
-        button $itk_component(controls).findup -image $icons(up) \
+        button $itk_component(controls).findup \
+            -image [Rappture::icon findup] \
             -relief flat -overrelief raised \
             -command [itcl::code $this find up]
@@ -153 +151 @@
         -width ""
         -linestyle ""
-        -raise ""
+        -raise 0
     }
     foreach {opt val} $settings {
@@ -162 +160 @@
     }
 
-    $itk_component(text) configure -state normal
-    $itk_component(text) delete 1.0 end
-
+    set replace 0
     if {"" != $dataobj} {
+        set _raised($dataobj) $params(-raise)
+        if {"" == $_dataobj} {
+            set replace 1
+        } elseif {$_raised($_dataobj) == 0 && $params(-raise)} {
+            set replace 1
+        }
+    }
+
+    if {$replace} {
+        $itk_component(text) configure -state normal
+        $itk_component(text) delete 1.0 end
+
         if {[$dataobj element -as type] == "log"} {
             # log output -- remove special =RAPPTURE-???=> messages
@@ -204 +212 @@
             $itk_component(text) insert end [$dataobj get]
         }
-    }
-
-    $itk_component(text) configure -state disabled
-    set _dataobj $dataobj
+        $itk_component(text) configure -state disabled
+
+        set _dataobj $dataobj
+    }
 }
 
@@ -227 +235 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::TextResult::delete {args} {
-    $itk_component(text) configure -state normal
-    $itk_component(text) delete 1.0 end
-    $itk_component(text) configure -state disabled
-    set _dataobj ""
+    if {[llength $args] == 0} {
+        # delete everything
+        catch {unset _raised}
+        set _dataobj ""
+        $itk_component(text) configure -state normal
+        $itk_component(text) delete 1.0 end
+        $itk_component(text) configure -state disabled
+    } else {
+        # delete these specific objects
+        foreach obj $args {
+            catch {unset _raised($obj)}
+            if {$obj == $_dataobj} {
+                set _dataobj ""
+                $itk_component(text) configure -state normal
+                $itk_component(text) delete 1.0 end
+                $itk_component(text) configure -state disabled
+            }
+        }
+    }
 }
 

trunk/gui/scripts/tool.tcl

@@ -35 +35 @@
     private common job               ;# array var used for blt::bgexec jobs
     private common jobnum 0          ;# counter for unique job number
+
+    # resources file tells us the application name
+    public common _appname ""
+    public proc setAppName {name} { set _appname $name }
+}
+
+# must use this name -- plugs into Rappture::resources::load
+proc tool_init_resources {} {
+    Rappture::resources::register \
+        application_name Rappture::Tool::setAppName
 }
                                                                                 
@@ -79 +89 @@
 itcl::body Rappture::Tool::run {args} {
     global errorInfo
+
+    # make sure that we save the proper application name
+    if {"" != $_appname} {
+        $_xmlobj put tool.name $_appname
+    }
 
     # sync all widgets to the XML tree

trunk/gui/scripts/tooltip.tcl

@@ -59 +59 @@
     bind RapptureTooltip <KeyPress> \
         [list ::Rappture::Tooltip::tooltip cancel]
-
-    private common icons
-    set dir [file dirname [info script]]
-    set icons(cue) [image create photo -file [file join $dir images cue24.gif]]
 }
 
@@ -141 +137 @@
 
     # strings can't be too big, or they'll go off screen!
-    if {[string length $mesg] > 1000} {
-        set mesg "[string range $mesg 0 1000]..."
-    }
     set pos 0
     ::for {set i 0} {$pos >= 0 && $i < 20} {incr i} {
@@ -152 +145 @@
         set mesg "[string range $mesg 0 $pos]..."
     }
+    if {[string length $mesg] > 1000} {
+        set mesg "[string range $mesg 0 1500]..."
+    }
     $itk_component(text) configure -text $mesg
 
     #
-    # Make sure the tooltip doesn't go off screen.  Then, put it up.
+    # Make sure the tooltip doesn't go off screen.
     #
     update idletasks
@@ -182 +178 @@
     }
 
+    #
+    # Will the tooltip pop up under the mouse pointer?  If so, then
+    # it will just disappear.  Doh!  We should figure out a better
+    # place to pop it up.
+    #
+    set px [winfo pointerx $hull]
+    set py [winfo pointery $hull]
+    if {$px >= $xpos && $px <= $xpos+[winfo reqwidth $hull]
+          && $py >= $ypos && $py <= $ypos+[winfo reqheight $hull]} {
+
+        if {$px > [winfo screenwidth $hull]/2} {
+            set signx "-"
+            set xpos [expr {[winfo screenwidth $hull]-$px+4}]
+        } else {
+            set signx "+"
+            set xpos [expr {$px+4}]
+        }
+        if {$py > [winfo screenheight $hull]/2} {
+            set signy "-"
+            set ypos [expr {[winfo screenheight $hull]-$py+4}]
+        } else {
+            set signy "+"
+            set ypos [expr {$py+4}]
+        }
+    }
+
+    #
+    # Finally, put it up.
+    #
     wm geometry $hull $signx$xpos$signy$ypos
     update
@@ -276 +301 @@
                 error "wrong # args: should be \"tooltip pending widget ?@x,y?\""
             }
-            set widget [lindex $args 0]
+            set tag [lindex $args 0]
             set loc [lindex $args 1]
 
-            if {[winfo exists $widget]} {
-                .rappturetooltip configure -message $catalog($widget)
+            # tag name may be .g-axis -- get widget ".g" part
+            set widget $tag
+            if {[regexp {^(\.[^-]+)-[^\.]+$} $widget match wname]} {
+                set widget $wname
+            }
+
+            if {[winfo exists $widget] && [info exists catalog($tag)]} {
+                .rappturetooltip configure -message $catalog($tag)
                 if {[string index $loc 0] == "@"} {
                     .rappturetooltip show $loc
@@ -381 +412 @@
 # create a tooltip widget to show error cues
 Rappture::Tooltip .rappturetoolcue \
-    -icon $Rappture::Tooltip::icons(cue) \
+    -icon [Rappture::icon cue24] \
     -background black -outline #333333 -foreground white
 

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 {

trunk/src2/core/Makefile

@@ -10 +10 @@
 test: test.o RpOutcome.o RpMesh1D.o RpField1D.o RpMeshTri2D.o RpFieldTri2D.o RpMeshRect3D.o RpFieldRect3D.o RpMeshPrism3D.o RpFieldPrism3D.o RpSerialBuffer.o RpSerializer.o RpSerializable.o
         g++ $(CFLAGS) -o test test.o RpOutcome.o RpMesh1D.o RpField1D.o RpMeshTri2D.o RpFieldTri2D.o RpMeshRect3D.o RpFieldRect3D.o RpMeshPrism3D.o RpFieldPrism3D.o RpSerialBuffer.o RpSerializer.o RpSerializable.o
+
+docs:
+        if test ! -d ../../docs/rappture2; then \
+          mkdir ../../docs; \
+          mkdir ../../docs/rappture2; \
+        fi
+        doxygen
 
 test.o: test.cc RpPtr.h

trunk/src2/core/RpSerialBuffer.cc

@@ -1 +1 @@
 /*
+ * ======================================================================
+ *  Rappture::SerialBuffer
+ *
+ *  AUTHOR:  Michael McLennan, Purdue University
+ *           Carol X Song, Purdue University
+ *
+ *  Copyright (c) 2004-2006  Purdue Research Foundation
  * ----------------------------------------------------------------------
- *  Rappture::SerialBuffer
- *    Used by the Serializer to build up the buffer of serialized
- *    data.  Similar to a string, but it handles nulls and other
- *    control characters.  Also handles big/little endian order
- *    properly.
- *
- * ======================================================================
- *  AUTHOR:  Carol X Song, Purdue University
- *           Michael McLennan, Purdue University
- *  Copyright (c) 2004-2006  Purdue Research Foundation
- *
  *  See the file "license.terms" for information on usage and
  *  redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -28 +24 @@
 using namespace Rappture;
 
+/**
+ * Construct an empty SerialBuffer.
+ */
 SerialBuffer::SerialBuffer()
   : _buffer(),
@@ -34 +33 @@
 }
 
+/**
+ * Construct a SerialBuffer loaded with bytes produced by another
+ * SerialBuffer.  This is used to decode information from the buffer.
+ *
+ * @param bytes pointer to bytes being decoded.
+ * @param nbytes number of bytes being decoded.
+ */
 SerialBuffer::SerialBuffer(const char* bytes, int nbytes)
   : _buffer(),
@@ -44 +50 @@
 }
 
+/**
+ * Copy constructor
+ */
 SerialBuffer::SerialBuffer(const SerialBuffer& sb)
   : _buffer(sb._buffer),
@@ -50 +59 @@
 }
 
+/**
+ * Assignment operator
+ */
 SerialBuffer&
 SerialBuffer::operator=(const SerialBuffer& sb)
@@ -61 +73 @@
 }
 
+/**
+ * Get the bytes currently stored in the buffer.  These bytes can
+ * be stored, and used later to construct another SerialBuffer to
+ * decode the information.
+ *
+ * @return Pointer to the bytes in the buffer.
+ */
 const char*
 SerialBuffer::bytes() const
@@ -67 +86 @@
 }
 
+/**
+ * Get the number of bytes currently stored in the buffer.
+ * @return Number of the bytes in the buffer.
+ */
 int
 SerialBuffer::size() const
@@ -73 +96 @@
 }
 
+/**
+ * Clear the buffer, making it empty.
+ */
 SerialBuffer&
 SerialBuffer::clear()

trunk/src2/core/RpSerialBuffer.h

@@ -1 +1 @@
 /*
+ * ======================================================================
+ *  Rappture::SerialBuffer
+ *
+ *  AUTHOR:  Michael McLennan, Purdue University
+ *           Carol X Song, Purdue University
+ *
+ *  Copyright (c) 2004-2006  Purdue Research Foundation
  * ----------------------------------------------------------------------
- *  Rappture::SerialBuffer
- *    Used by the Serializer to build up the buffer of serialized
- *    data.  Similar to a string, but it handles nulls and other
- *    control characters.  Also handles big/little endian order
- *    properly.
- *
- * ======================================================================
- *  AUTHOR:  Carol X Song, Purdue University
- *           Michael McLennan, Purdue University
- *  Copyright (c) 2004-2006  Purdue Research Foundation
- *
  *  See the file "license.terms" for information on usage and
  *  redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -24 +20 @@
 namespace Rappture {
 
+/**
+ * Used by the Serializer to build up the buffer of serialized
+ * data.  Similar to a string, but it handles nulls and other
+ * control characters.  Also handles big/little endian order
+ * properly.
+ */
 class SerialBuffer {
 public:
@@ -51 +53 @@
 
 private:
-    std::vector<char> _buffer;  // data within this buffer
-    int _pos;                   // position for read functions
+    /// Contains the actual data within this buffer.
+    std::vector<char> _buffer;
+
+    /// Position for the various readXyz() functions.
+    int _pos;
 };
 

trunk/src2/core/RpSerializable.cc

@@ -1 +1 @@
 /*
+ * ======================================================================
+ *  Rappture::Serializable
+ *
+ *  AUTHOR:  Michael McLennan, Purdue University
+ *           Carol X Song, Purdue University
+ *
+ *  Copyright (c) 2004-2006  Purdue Research Foundation
  * ----------------------------------------------------------------------
- *  Rappture::Serializable
- *    Base class for any object that can be serialized into a stream,
- *    then saved to a file or written to a socket, and reconstituted
- *    into its original form.  Serializable objects can be added to
- *    a serializer, which handles the overall conversion.
- *
- * ======================================================================
- *  AUTHOR:  Carol X Song, Purdue University
- *           Michael McLennan, Purdue University
- *  Copyright (c) 2004-2006  Purdue Research Foundation
- *
  *  See the file "license.terms" for information on usage and
  *  redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.

trunk/src2/core/RpSerializable.h

@@ -1 +1 @@
 /*
+ * ======================================================================
+ *  Rappture::Serializable
+ *
+ *  AUTHOR:  Michael McLennan, Purdue University
+ *           Carol X Song, Purdue University
+ *
+ *  Copyright (c) 2004-2006  Purdue Research Foundation
  * ----------------------------------------------------------------------
- *  Rappture::Serializable
- *    Base class for any object that can be serialized into a stream,
- *    then saved to a file or written to a socket, and reconstituted
- *    into its original form.  Serializable objects can be added to
- *    a serializer, which handles the overall conversion.
- *
- * ======================================================================
- *  AUTHOR:  Carol X Song, Purdue University
- *           Michael McLennan, Purdue University
- *  Copyright (c) 2004-2006  Purdue Research Foundation
- *
  *  See the file "license.terms" for information on usage and
  *  redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -29 +25 @@
 class SerialConversion;  // see below
 
+/**
+ * Base class for any object that can be serialized into a stream,
+ * then saved to a file or written to a socket, and reconstituted
+ * into its original form.  Serializable objects can be added to
+ * a serializer, which handles the overall conversion.
+ */
 class Serializable {
 public:
@@ -59 +61 @@
 };
 
+/**
+ * Each class derived from Serializable should have a SerialConversion
+ * stored as a static data member.  This declares information needed
+ * to serialize/deserialize the class, making objects in that class
+ * serializable.
+ */
 class SerialConversion {
 public: