Changeset 3029 for branches/blt4

Timestamp:

Jun 10, 2012, 9:04:26 PM (12 years ago)

Author:

gah

Message:

 

Location:

branches/blt4/gui/scripts

Files:

• Makefile.in (modified) (2 diffs)
• analyzer.tcl (modified) (22 diffs)
• field.tcl (modified) (13 diffs)
• radiodial.tcl (modified) (2 diffs)
• resultselector.tcl (added)
• resultset.tcl (modified) (12 diffs)
• resultviewer.tcl (modified) (3 diffs)
• visviewer.tcl (modified) (1 diff)
• vtkcontourviewer.tcl (modified) (36 diffs)

branches/blt4/gui/scripts/Makefile.in

@@ -45 +45 @@
                 $(srcdir)/drawingentry.tcl \
                 $(srcdir)/drawingcontrols.tcl \
+                $(srcdir)/drawingentry.tcl \
                 $(srcdir)/dropdown.tcl \
                 $(srcdir)/dropdownlist.tcl \
@@ -97 +98 @@
                 $(srcdir)/resources.tcl \
                 $(srcdir)/resultset.tcl \
+                $(srcdir)/resultselector.tcl \
                 $(srcdir)/resultviewer.tcl \
                 $(srcdir)/scroller.tcl \

branches/blt4/gui/scripts/analyzer.tcl

@@ -59 +59 @@
     public method reset {{when -eventually}}
     public method load {xmlobj}
-    public method clear {{xmlobj ""}}
+    public method clear {{xmlobj "all"}}
     public method download {option args}
 
@@ -66 +66 @@
     protected method _autoLabel {xmlobj path title cntVar}
     protected method _fixResult {}
+    protected method _fixResultSet {args}
     protected method _fixSize {}
     protected method _fixSimControl {}
@@ -81 +82 @@
     private variable _appName ""       ;# Name of application
     private variable _control "manual" ;# start mode
-    private variable _runs ""          ;# list of XML objects with results
+    private variable _resultset ""     ;# ResultSet object with all results
     private variable _pages 0          ;# number of pages for result sets
     private variable _label2page       ;# maps output label => result set
@@ -104 +105 @@
     set _tool $tool
 
+    # use this to store all simulation results
+    set _resultset [Rappture::ResultSet ::#auto]
+    $_resultset notify add $this [itcl::code $this _fixResultSet]
+
+    # widget settings...
     itk_option add hull.width hull.height
     pack propagate $itk_component(hull) no
@@ -267 +273 @@
     pack $w.top.l -side left
 
-    itk_component add resultselector {
+    itk_component add viewselector {
         Rappture::Combobox $w.top.sel -width 10 -editable no
     } {
@@ -273 +279 @@
         rename -font -textfont textFont Font
     }
-    pack $itk_component(resultselector) -side left -expand yes -fill x
-    bind $itk_component(resultselector) <<Value>> [itcl::code $this _fixResult]
-    bind $itk_component(resultselector) <Enter> \
+    pack $itk_component(viewselector) -side left -expand yes -fill x
+    bind $itk_component(viewselector) <<Value>> [itcl::code $this _fixResult]
+    bind $itk_component(viewselector) <Enter> \
         [itcl::code $this download coming]
 
-    Rappture::Tooltip::for $itk_component(resultselector) \
+    Rappture::Tooltip::for $itk_component(viewselector) \
         "@[itcl::code $this _resultTooltip]"
 
-    $itk_component(resultselector) choices insert end \
+    $itk_component(viewselector) choices insert end \
         --- "---"
 
@@ -293 +299 @@
         [itcl::code $this download coming]
 
-    $itk_component(resultselector) choices insert end \
+    $itk_component(viewselector) choices insert end \
         @download [Rappture::filexfer::label download]
 
@@ -316 +322 @@
 
     set f [$itk_component(results) insert end -fraction 0.1]
-    itk_component add resultset {
-        Rappture::ResultSet $f.rset \
-            -clearcommand [itcl::code $this clear] \
-            -settingscommand [itcl::code $this _plot] \
-            -promptcommand [itcl::code $this _simState]
-    }
-    pack $itk_component(resultset) -expand yes -fill both
-    bind $itk_component(resultset) <<Control>> [itcl::code $this _fixSize]
+    itk_component add resultselector {
+        Rappture::ResultSelector $f.rsel -resultset $_resultset \
+            -settingscommand [itcl::code $this _plot]
+    }
+    pack $itk_component(resultselector) -expand yes -fill both
+    bind $itk_component(resultselector) <<Layout>> [itcl::code $this _fixSize]
     bind $itk_component(results) <Configure> [itcl::code $this _fixSize]
 
@@ -367 +371 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::Analyzer::destructor {} {
-    foreach obj $_runs {
-        itcl::delete object $obj
-    }
     after cancel [itcl::code $this simulate]
+    itcl::delete object $_resultset
 }
 
@@ -387 +389 @@
         # check to see if simulation is really needed
         $_tool sync
-        if {[$itk_component(resultset) contains [$_tool xml object]]
+        if {[$_resultset contains [$_tool xml object]]
               && ![string equal $_control "manual-resim"]} {
             # not needed -- show results and return
@@ -475 +477 @@
     # check to see if simulation is really needed
     $_tool sync
-    if {![$itk_component(resultset) contains [$_tool xml object]]
+    if {![$_resultset contains [$_tool xml object]]
           || [string equal $_control "manual-resim"]} {
         # if control mode is "auto", then simulate right away
@@ -532 +534 @@
     }
 
-    lappend _runs $xmlobj
-
-    # Detect molecule elements that contain trajectory data and convert
-    # to sequences.
-    _trajToSequence $xmlobj output
-
-    # Go through the analysis and find all result sets.
-    set haveresults 0
-    foreach item [_reorder [$xmlobj children output]] {
-        switch -glob -- $item {
-            log* {
-                _autoLabel $xmlobj output.$item "Output Log" counters
-            }
-            number* {
-                _autoLabel $xmlobj output.$item "Number" counters
-            }
-            integer* {
-                _autoLabel $xmlobj output.$item "Integer" counters
-            }
-            string* {
-                _autoLabel $xmlobj output.$item "String" counters
-            }
-            histogram* - curve* - field* {
-                _autoLabel $xmlobj output.$item "Plot" counters
-            }
-            drawing* {
-                _autoLabel $xmlobj output.$item "Drawing" counters
-            }
-            structure* {
-                _autoLabel $xmlobj output.$item "Structure" counters
-            }
-            table* {
-                _autoLabel $xmlobj output.$item "Energy Levels" counters
-            }
-            sequence* {
-                _autoLabel $xmlobj output.$item "Sequence" counters
-            }
-            default {
-                if 0 {
-                    puts stderr "unknown output $item"
-                }
-            }
-        }
-        set label [$xmlobj get output.$item.about.group]
-        if {"" == $label} {
-            set label [$xmlobj get output.$item.about.label]
-        }
-
-        set hidden [$xmlobj get output.$item.hide]
-        set hidden [expr {"" != $hidden && $hidden}]
-
-        if {"" != $label && !$hidden} {
-            set haveresults 1
-        }
-    }
-    # if there are any valid results, add them to the resultset
-    if {$haveresults} {
-        set index [$itk_component(resultset) add $xmlobj]
-
-        # add each result to a result viewer
-        foreach item [_reorder [$xmlobj children output]] {
-            set label [$xmlobj get output.$item.about.group]
-            if {"" == $label} {
-                set label [$xmlobj get output.$item.about.label]
-            }
-            set hidden [$xmlobj get output.$item.hide]
-            if { $hidden == "" } {
-                set hidden 0
-            }
-            if {"" != $label && !$hidden} {
-                if {![info exists _label2page($label)]} {
-                    set name "page[incr _pages]"
-                    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
-
-                    set end [$itk_component(resultselector) \
-                        choices index -value ---]
-                    if {$end < 0} {
-                        set end "end"
-                    }
-                    $itk_component(resultselector) choices insert $end \
-                        $name $label
-                }
-
-                # add/replace the latest result into this viewer
-                set page $_label2page($label)
-
-                if {![info exists reset($page)]} {
-                    $page.rviewer clear $index
-                    set reset($page) 1
-                }
-                $page.rviewer add $index $xmlobj output.$item
-            }
-        }
-    }
-
-    # show the first page by default
-    set max [$itk_component(resultselector) choices size]
-    for {set i 0} {$i < $max} {incr i} {
-        set first [$itk_component(resultselector) choices get -label $i]
-        if {$first != ""} {
-            set page [$itk_component(resultselector) choices get -value $i]
-            set char [string index $page 0]
-            if {$char != "@" && $char != "-"} {
-                $itk_component(resultpages) current $page
-                $itk_component(resultselector) value $first
-                set _lastlabel $first
-                break
-            }
-        }
-    }
+    $_resultset add $xmlobj
+
+    # NOTE: Adding will trigger a !change event on the ResultSet
+    # object, which will trigger calls to _fixResultSet to add
+    # the results to display.
 }
 
@@ -656 +548 @@
 # Otherwise, all results are cleared.
 # ----------------------------------------------------------------------
-itcl::body Rappture::Analyzer::clear {{xmlobj ""}} {
-    if {$xmlobj ne ""} {
-        set i [lsearch -exact $_runs $xmlobj]
-        if {$i >= 0} {
-            itcl::delete object $xmlobj
-            set _runs [lreplace $_runs $i $i]
-
-            # delete this result from all viewers
-            foreach label [array names _label2page] {
-                set page $_label2page($label)
-                $page.rviewer clear $xmlobj
-            }
-        }
+itcl::body Rappture::Analyzer::clear {{xmlobj "all"}} {
+    if {$xmlobj eq "" || $xmlobj eq "all"} {
+        $_resultset clear
     } else {
-        # clear everything
-        foreach obj $_runs {
-            itcl::delete object $obj
-        }
-        set _runs ""
-    }
-
-    if {[llength $_runs] == 0} {
-        # 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] {
-            set page $_label2page($label)
-            destroy $page.rviewer
-        }
-        $itk_component(resultselector) value ""
-        $itk_component(resultselector) choices delete 0 end
-        catch {unset _label2page}
-        catch {unset _label2desc}
-        set _plotlist ""
-
-        $itk_component(resultselector) choices insert end --- "---"
-        $itk_component(resultselector) choices insert end \
-            @download [Rappture::filexfer::label download]
-        set _lastlabel ""
-    }
-
-    #
-    # HACK ALERT!!
-    # The following statement should be in place, but it causes
-    # vtk to dump core.  Leave it out until we can fix the core dump.
-    # In the mean time, we leak memory...
-    #
-    #$itk_component(resultpages) delete -all
-    #set _pages 0
-
-    _simState on
-    _fixSimControl
-    reset
+        $_resultset clear $xmlobj
+    }
+
+    # NOTE: Clearing will trigger a !change event on the ResultSet
+    # object, which will trigger calls to _fixResultSet to clean up
+    # the results being displayed.
 }
 
@@ -723 +569 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::Analyzer::download {option args} {
-    set title [$itk_component(resultselector) value]
-    set page [$itk_component(resultselector) translate $title]
+    set title [$itk_component(viewselector) value]
+    set page [$itk_component(viewselector) translate $title]
 
     switch -- $option {
@@ -784 +630 @@
                 set ext ""
                 set f [$itk_component(resultpages) page $page]
-                set item [$itk_component(resultselector) value]
+                set item [$itk_component(viewselector) value]
                 set result [$f.rviewer download now $widget $_appName $item]
                 if { $result == "" } {
@@ -820 +666 @@
 #
 # Used internally to update the plot shown in the current result
-# viewer whenever the resultset settings have changed.  Causes the
+# viewer whenever the resultselector settings have changed.  Causes the
 # desired results to show up on screen.
 # ----------------------------------------------------------------------
@@ -826 +672 @@
     set _plotlist $args
 
-    set page [$itk_component(resultselector) value]
-    set page [$itk_component(resultselector) translate $page]
+    set page [$itk_component(viewselector) value]
+    set page [$itk_component(viewselector) translate $page]
     if {"" != $page} {
         set f [$itk_component(resultpages) page $page]
@@ -906 +752 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::Analyzer::_fixResult {} {
-    set name [$itk_component(resultselector) value]
+    set name [$itk_component(viewselector) value]
     set page ""
     if {"" != $name} {
-        set page [$itk_component(resultselector) translate $name]
+        set page [$itk_component(viewselector) translate $name]
     }
     if {$page == "@download"} {
         # put the combobox back to its last value
-        $itk_component(resultselector) component entry configure -state normal
-        $itk_component(resultselector) component entry delete 0 end
-        $itk_component(resultselector) component entry insert end $_lastlabel
-        $itk_component(resultselector) component entry configure -state disabled
+        $itk_component(viewselector) component entry configure -state normal
+        $itk_component(viewselector) component entry delete 0 end
+        $itk_component(viewselector) component entry insert end $_lastlabel
+        $itk_component(viewselector) component entry configure -state disabled
         # perform the actual download
         download start $itk_component(download)
     } elseif {$page == "---"} {
         # put the combobox back to its last value
-        $itk_component(resultselector) component entry configure -state normal
-        $itk_component(resultselector) component entry delete 0 end
-        $itk_component(resultselector) component entry insert end $_lastlabel
-        $itk_component(resultselector) component entry configure -state disabled
+        $itk_component(viewselector) component entry configure -state normal
+        $itk_component(viewselector) component entry delete 0 end
+        $itk_component(viewselector) component entry insert end $_lastlabel
+        $itk_component(viewselector) component entry configure -state disabled
     } elseif {$page != ""} {
         set _lastlabel $name
@@ -939 +785 @@
 
 # ----------------------------------------------------------------------
+# USAGE: _fixResultSet ?<eventData>...?
+#
+# Used internally to react to changes within the ResultSet.  When a
+# result is added, a new result viewer is created for the object.
+# When all results are cleared, the viewers are deleted.
+# ----------------------------------------------------------------------
+itcl::body Rappture::Analyzer::_fixResultSet {args} {
+    array set eventData $args
+    switch -- $eventData(op) {
+        add {
+            set xmlobj $eventData(what)
+
+            # Detect molecule elements that contain trajectory data
+            # and convert to sequences.
+            _trajToSequence $xmlobj output
+
+            # Go through the analysis and find all result sets.
+            set haveresults 0
+            foreach item [_reorder [$xmlobj children output]] {
+                switch -glob -- $item {
+                    log* {
+                        _autoLabel $xmlobj output.$item "Output Log" counters
+                    }
+                    number* {
+                        _autoLabel $xmlobj output.$item "Number" counters
+                    }
+                    integer* {
+                        _autoLabel $xmlobj output.$item "Integer" counters
+                    }
+                    string* {
+                        _autoLabel $xmlobj output.$item "String" counters
+                    }
+                    histogram* - curve* - field* {
+                        _autoLabel $xmlobj output.$item "Plot" counters
+                    }
+                    drawing* {
+                        _autoLabel $xmlobj output.$item "Drawing" counters
+                    }
+                    structure* {
+                        _autoLabel $xmlobj output.$item "Structure" counters
+                    }
+                    table* {
+                        _autoLabel $xmlobj output.$item "Energy Levels" counters
+                    }
+                    sequence* {
+                        _autoLabel $xmlobj output.$item "Sequence" counters
+                    }
+                }
+                set label [$xmlobj get output.$item.about.group]
+                if {"" == $label} {
+                    set label [$xmlobj get output.$item.about.label]
+                }
+
+                set hidden [$xmlobj get output.$item.hide]
+                set hidden [expr {"" != $hidden && $hidden}]
+
+                if {"" != $label && !$hidden} {
+                    set haveresults 1
+                }
+            }
+
+            # if there are any valid results, add them to the resultset
+            if {$haveresults} {
+                set index [$_resultset get simnum $xmlobj]
+
+                # add each result to a result viewer
+                foreach item [_reorder [$xmlobj children output]] {
+                    set label [$xmlobj get output.$item.about.group]
+                    if {"" == $label} {
+                        set label [$xmlobj get output.$item.about.label]
+                    }
+                    set hidden [$xmlobj get output.$item.hide]
+                    if { $hidden == "" } {
+                        set hidden 0
+                    }
+                    if {"" != $label && !$hidden} {
+                        if {![info exists _label2page($label)]} {
+                            set name "page[incr _pages]"
+                            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
+
+                            set end [$itk_component(viewselector) \
+                                choices index -value ---]
+                            if {$end < 0} {
+                                set end "end"
+                            }
+                            $itk_component(viewselector) choices insert $end \
+                                $name $label
+                        }
+
+                        # add/replace the latest result into this viewer
+                        set page $_label2page($label)
+
+                        if {![info exists reset($page)]} {
+                            $page.rviewer clear $index
+                            set reset($page) 1
+                        }
+                        $page.rviewer add $index $xmlobj output.$item
+                    }
+                }
+            }
+
+            # show the first page by default
+            set max [$itk_component(viewselector) choices size]
+            for {set i 0} {$i < $max} {incr i} {
+                set first [$itk_component(viewselector) choices get -label $i]
+                if {$first != ""} {
+                    set page [$itk_component(viewselector) choices get -value $i]
+                    set char [string index $page 0]
+                    if {$char != "@" && $char != "-"} {
+                        $itk_component(resultpages) current $page
+                        $itk_component(viewselector) value $first
+                        set _lastlabel $first
+                        break
+                    }
+                }
+            }
+        }
+        clear {
+            set xmlobj $eventData(what)
+            if {$xmlobj ne "all"} {
+                # delete this result from all viewers
+                foreach label [array names _label2page] {
+                    set page $_label2page($label)
+                    $page.rviewer clear $xmlobj
+                }
+            }
+
+            if {[$_resultset size] == 0} {
+                # reset the size of the controls area
+                set ht [winfo height $itk_component(results)]
+                set cntlht [$itk_component(resultselector) size -controlarea]
+                set frac [expr {double($cntlht)/$ht}]
+                $itk_component(results) fraction end $frac
+
+                foreach label [array names _label2page] {
+                    set page $_label2page($label)
+                    destroy $page.rviewer
+                }
+                $itk_component(resultpages) delete -all
+                set _pages 0
+
+                $itk_component(viewselector) value ""
+                $itk_component(viewselector) choices delete 0 end
+                catch {unset _label2page}
+                catch {unset _label2desc}
+                set _plotlist ""
+
+                $itk_component(viewselector) choices insert end --- "---"
+                $itk_component(viewselector) choices insert end \
+                    @download [Rappture::filexfer::label download]
+                set _lastlabel ""
+            }
+
+            # fix Simulate button state
+            reset
+        }
+        default {
+            error "don't know how to handle op \"$eventData(op)\""
+        }
+    }
+}
+
+# ----------------------------------------------------------------------
 # USAGE: _fixSize
 #
@@ -948 +963 @@
     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 cntlht [$itk_component(resultselector) size -controlarea]
     set frac [expr {double($cntlht)/$ht}]
 
@@ -1119 +1134 @@
 itcl::body Rappture::Analyzer::_resultTooltip {} {
     set tip ""
-    set name [$itk_component(resultselector) value]
+    set name [$itk_component(viewselector) value]
     if {[info exists _label2desc($name)] &&
          [string length $_label2desc($name)] > 0} {
@@ -1151 +1166 @@
             # with no data, requiring simulation.
             #
-            if {[$itk_component(resultset) size -controls] >= 2} {
+            if {[$itk_component(resultselector) size -controls] >= 2} {
                 pack $itk_interior.simol -fill x -before $itk_interior.nb
             } else {

branches/blt4/gui/scripts/field.tcl

@@ -22 +22 @@
     destructor { # defined below }
 
+    public method blob {{what -overall}}
     public method components {args}
-    public method mesh {{what -overall}}
-    public method values {{what -overall}}
-    public method blob {{what -overall}}
-    public method limits {axis}
     public method controls {option args}
+    public method extents {{what -overall}}
+    public method flowhints { cname }
     public method hints {{key ""}}
-    public method style { cname }
     public method isunirect2d {}
     public method isunirect3d {}
+    public method limits {axis}
+    public method mesh {{what -overall}}
+    public method style { cname }
+    public method typeof { cname }
+    public method values {{what -overall}}
     public method viewer {}
-    public method datatype { cname }
-    public method extents {{what -overall}}
-    public method flowhints { cname }
     public method vtkdata {{what -overall}}
-
+    
     protected method _build {}
     protected method _getValue {expr}
@@ -61 +61 @@
     private variable _comp2cntls ;# maps component name => x,y control points
     private variable _comp2extents 
+    private variable _comp2limits 
     private variable _type "" 
     private variable _comp2flowhints 
@@ -66 +67 @@
 
     private method ConvertToVtkData { cname } 
+    private method ReadVtkDataSet { cname contents } 
+    private variable _fields {}
 }
 
@@ -201 +204 @@
         return [$mobj mesh]
     }
-    if { $_type == "vtkcontour" } {
+    if { [info exists _comp2vtkcontour($what)] } {
         error "method \"mesh\" is not implemented for vtkcontour"
     }
@@ -240 +243 @@
     }
     if { [info exists _comp2vtkcontour($what)] } {
-        error "values: not implemented for contours"
+        error "method \"values\" is not implemented for vtkcontour"
     }
     if { [info exists _comp2vtkstreamlines($what)] } {
@@ -299 +302 @@
     error "bad option \"$what\": should be [join [lsort [array names _comp2dims]] {, }]"
 }
+
 
 # ----------------------------------------------------------------------
@@ -823 +827 @@
                     error "bad redirection path \"$path\""
                 }
-                puts stderr path=$path
                 set element [$_xmlobj element -as type $path]
                 if { $element != "vtk" } {
@@ -835 +838 @@
             set _comp2dims($cname) "2D"
             # Allow redirects to another element.
-            set vtkdata [$_field get $cname.vtk]
-            set _comp2vtkcontour($cname) $vtkdata
+
+            set data [$_field get $cname.vtk]
+            ReadVtkDataSet $cname $data
+            set _comp2vtkcontour($cname) $data
             set _comp2style($cname) [$_field get $cname.style]
             incr _counter
@@ -998 +1003 @@
 
 #
-# type  --
+# typeof  --
 #
 # Returns the style associated with a component of the field.  
@@ -1032 +1037 @@
 }
 
-itcl::body Rappture::Field::viewer { what } {
+itcl::body Rappture::Field::viewer { } {
     return $_type
 }
@@ -1078 +1083 @@
     }
     if { [info exists _comp2vtkcontour($what)] } {
-        return $_comp2vtkcontour($what)
+        return [blob $what]
     }
     if { [info exists _comp2vtkstreamlines($what)] } {
@@ -1091 +1096 @@
 itcl::body Rappture::Field::ConvertToVtkData { comp } {
     set ds ""
-    puts stderr "dataobj type =[$dataobj typeof $comp]"
     switch -- [typeof $comp] {
         "unirect2d" {
@@ -1180 +1184 @@
     return $out
 }
+
+itcl::body Rappture::Field::ReadVtkDataSet { comp contents } {
+    package require vtk
+
+    set reader $this-datasetreader
+    vtkDataSetReader $reader
+
+    # Write the contents to a file just in case it's binary.
+    set tmpfile file[pid].vtk
+    set f [open "$tmpfile" "w"]
+    fconfigure $f -translation binary -encoding binary
+    puts $f $contents 
+    close $f
+    $reader SetFileName $tmpfile
+    $reader ReadAllScalarsOn
+    $reader ReadAllVectorsOn
+    $reader ReadAllFieldsOn
+    $reader Update
+    set dataset [$reader GetOutput]
+    set limits {}
+    foreach {xmin xmax ymin ymax zmin zmax} [$dataset GetBounds] break
+    lappend limits xmin $xmin xmax $xmax ymin $ymin ymax $ymax  
+    set dataAttrs [$dataset GetPointData]
+    if { $dataAttrs == ""} {
+        puts stderr "No point data"
+    }
+    for {set i 0} {$i < [$dataAttrs GetNumberOfArrays] } {incr i} {
+        set array [$dataAttrs GetArray $i]
+        set name  [$dataAttrs GetArrayName $i]
+        foreach {min max} [$array GetRange] break
+        lappend limits $name-min $min $name-max $max
+        lappend _fields $name
+    }
+    set _comp2limits($comp) $limits
+    puts stderr limits=$limits
+    $reader Delete
+    file delete $tmpfile
+}
+

branches/blt4/gui/scripts/radiodial.tcl

@@ -559 +559 @@
         return -1
     }
+    # FIXME:
+    set str [list $str]
     for {set nv 0} {$nv < [llength $_values]} {incr nv} {
         set v [lindex $_values $nv]
@@ -565 +567 @@
         }
     }
-    error "bad value \"$str\": should be something matching the raw values \"[join $_values ,]\""
+
+    # didn't match -- build a return string of possible values
+    set labels ""
+    foreach vlist $_values {
+        foreach v $vlist {
+            lappend labels "\"$_val2label($v)\""
+        }
+    }
+    error "bad value \"$str\": should be one of [join $labels ,]"
 }
 

branches/blt4/gui/scripts/resultset.tcl

@@ -1 @@
-
-# ----------------------------------------------------------------------
-#  COMPONENT: ResultSet - controls for a collection of related results
-#
-#  This widget stores a collection of results that all represent
-#  the same quantity, but for various ranges of input values.
-#  It also manages the controls to select and visualize the data.
+# ----------------------------------------------------------------------
+#  COMPONENT: ResultSet - set of XML objects for simulated results
+#
+#  This data structure collects all of the simulated results
+#  produced by a series of tool runs.  It is used by the Analyzer,
+#  ResultSelector, and other widgets to keep track of all known runs
+#  and visualize the result that is currently selected.  Each run
+#  has an index number ("#1", "#2", "#3", etc.) that can be used to
+#  label the run and refer to it later.
 # ======================================================================
 #  AUTHOR:  Michael McLennan, Purdue University
-#  Copyright (c) 2004-2005  Purdue Research Foundation
+#  Copyright (c) 2004-2012  Purdue Research Foundation
 #
 #  See the file "license.terms" for information on usage and
 #  redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # ======================================================================
-package require Itk
-
-option add *ResultSet.width 4i widgetDefault
-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
-option add *ResultSet.textFont \
-    -*-helvetica-medium-r-normal-*-12-* widgetDefault
-option add *ResultSet.boldFont \
-    -*-helvetica-bold-r-normal-*-12-* widgetDefault
+package require Itcl
 
 itcl::class Rappture::ResultSet {
-    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 -clearcommand clearCommand ClearCommand ""
-    itk_option define -settingscommand settingsCommand SettingsCommand ""
-    itk_option define -promptcommand promptCommand PromptCommand ""
-
     constructor {args} { # defined below }
     destructor { # defined below }
@@ -50 +23 @@
     public method add {xmlobj}
     public method clear {{xmlobj ""}}
-    public method Activate {column}
+    public method diff {option args}
+    public method find {collist vallist}
+    public method get {collist xmlobj}
     public method contains {xmlobj}
-    public method size {{what -results}}
-
-    protected method _doClear {what}
-    protected method _doSettings {{cmd ""}}
-    protected method _control {option args}
-    protected method _fixControls {args}
-    protected method _fixLayout {args}
-    protected method _fixNumResults {}
-    protected method _fixSettings {args}
-    protected method _fixValue {column why}
-    protected method _drawValue {column widget wmax}
-    protected method _toggleAll {{column "current"}}
-    protected method _getValues {column {which ""}}
-    protected method _getTooltip {role column}
-    protected method _getParamDesc {which {index "current"}}
+    public method size {}
+
+    public method notify {option args}
+    protected method _notifyHandler {args}
+
     protected method _addOneResult {tuples xmlobj {simnum ""}}
 
@@ -72 +37 @@
     private variable _results ""     ;# tuple of known results
     private variable _resultnum 0    ;# counter for result #1, #2, etc.
-    private variable _recent ""      ;# most recent result in _results
-    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 common _cntlInfo         ;# maps column name => control info
+    private variable _notify         ;# info used for notify command
 }
                                                                                 
-itk::usual ResultSet {
-    keep -background -foreground -cursor -font
-}
-
 # ----------------------------------------------------------------------
 # CONSTRUCTOR
 # ----------------------------------------------------------------------
 itcl::body Rappture::ResultSet::constructor {args} {
-    option add hull.width hull.height
-    pack propagate $itk_component(hull) no
-
     # create a dispatcher for events
     Rappture::dispatcher _dispatcher
-    $_dispatcher register !fixcntls
-    $_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) ""
+    $_dispatcher register !change
+    $_dispatcher dispatch $this !change \
+        [itcl::code $this _notifyHandler]
 
     # create a list of tuples for data
@@ -117 +55 @@
     $_results column insert end -name simnum -label "simulation number"
 
-
-    itk_component add cntls {
-        frame $itk_interior.cntls
-    } {
-        usual
-        rename -background -controlbarbackground controlbarBackground Background
-        rename -highlightbackground -controlbarbackground controlbarBackground Background
-    }
-    pack $itk_component(cntls) -fill x -pady {0 2}
-
-    itk_component add clearall {
-        button $itk_component(cntls).clearall -text "Clear" -state disabled \
-            -padx 1 -pady 1 \
-            -relief flat -overrelief raised \
-            -command [itcl::code $this _doClear all]
-    } {
-        usual
-        rename -background -controlbarbackground controlbarBackground Background
-        rename -foreground -controlbarforeground controlbarForeground Foreground
-        rename -highlightbackground -controlbarbackground controlbarBackground Background
-    }
-    pack $itk_component(clearall) -side right -padx 2 -pady 1
-    Rappture::Tooltip::for $itk_component(clearall) \
-        "Clears all results collected so far."
-
-    itk_component add clear {
-        button $itk_component(cntls).clear -text "Clear One" -state disabled \
-            -padx 1 -pady 1 \
-            -relief flat -overrelief raised \
-            -command [itcl::code $this _doClear current]
-    } {
-        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 the result that is currently selected."
-
-    itk_component add status {
-        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 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
-    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
-
-    eval itk_initialize $args
+    # clear notification info
+    set _notify(ALL) ""
+
+    eval configure $args
 }
 
@@ -205 +65 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::ResultSet::destructor {} {
+    clear
     itcl::delete object $_results
 }
@@ -218 +79 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::ResultSet::add {xmlobj} {
-    # make sure we fix up controls at some point
-    $_dispatcher event -idle !fixcntls
-
-    #
-    # If this is the first result, then there are no diffs.
-    # Add it right in.
-    #
     set xmlobj0 [$_results get -format xmlobj end]
-    if {"" == $xmlobj0} {
-        # first element -- always add
+    if {$xmlobj0 eq ""} {
+        #
+        # If this is the first result, then there are no diffs.
+        # Add it right in.
+        #
         set simnum "#[incr _resultnum]"
         $_results insert end [list $xmlobj $simnum]
-        _fixNumResults
-        set _recent $xmlobj
-        return $simnum
-    }
-
-    #
-    # For all later results, find the diffs and add any new columns
-    # into the results tuple.  The latest result is the most recent.
-    #
-    set simnum [_addOneResult $_results $xmlobj]
-    set _recent $xmlobj
-    _fixNumResults
+    } else {
+        #
+        # For all later results, find the diffs and add any new columns
+        # into the results tuple.  The latest result is the most recent.
+        #
+        set simnum [_addOneResult $_results $xmlobj]
+    }
+
+    # make sure we fix up associated controls
+    $_dispatcher event -now !change op add what $xmlobj
 
     return $simnum
@@ -253 +108 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::ResultSet::clear {{xmlobj ""}} {
-    set shortlist $itk_component(dials)
-    set controlsChanged 0
-
-    # clear any currently highlighted result
-    _doSettings
-
     if {$xmlobj ne ""} {
         #
@@ -269 +118 @@
         set irun [$_results find -format xmlobj $xmlobj]
         if {[llength $irun] == 1} {
-            # figure out where we are in the active control, and
-            # what value we should display after this one is deleted
-            set vlist ""
-            foreach {label val} [_getValues $_active all] {
-                lappend vlist $label
-            }
-            set ipos [lsearch $vlist $_cntlInfo($this-$_active-value)]
-
-            set vcurr ""
-            set vnext ""
-            if {$ipos >= 0} {
-                # try to stay at this value, if we can
-                set vcurr [lindex $vlist $ipos]
-
-                # fall back to this value, if we have to
-                if {$ipos > 0} { incr ipos -1 } else { incr ipos }
-                set vnext [lindex $vlist $ipos]
-            }
-
-            # delete the value from the tuples of all results
+            # grab a description of what we're about to delete
+            set dlist [list simnum [$_results get -format simnum $irun]]
+            foreach col [lrange [$_results column names] 2 end] {
+                set raw [lindex [Rappture::LibraryObj::value $xmlobj $col] 0]
+                lappend dlist $col $raw  ;# use "raw" (user-readable) label
+            }
+
+            # delete this from the tuples of all results
+            itcl::delete object $xmlobj
             $_results delete $irun
 
@@ -309 +147 @@
             set _results $new
 
-            # delete any adjuster controls that disappeared
-            foreach col $_cntlInfo($this-all) {
-                if {[$_results column names $col] eq ""} {
-                    set id $_cntlInfo($this-$col-id)
-                    destroy $shortlist.label$id
-                    array unset _cntlInfo $this-$col*
-
-                    set i [lsearch -exact $_cntlInfo($this-all) $col]
-                    if {$i >= 0} {
-                        set _cntlInfo($this-all) [lreplace $_cntlInfo($this-all) $i $i]
+            # make sure we fix up associated controls at some point
+            $_dispatcher event -now !change op clear what $dlist
+        }
+    } else {
+        #
+        # Delete all results.
+        #
+        for {set irun 0} {$irun < [$_results size]} {incr irun} {
+            set xo [$_results get -format xmlobj $irun]
+            itcl::delete object $xo
+        }
+        $_results delete 0 end
+
+        # make sure we fix up associated controls at some point
+        $_dispatcher event -now !change op clear what all
+    }
+
+    if {[$_results size] == 0} {
+        # no results left?  then reset to a clean state
+        eval $_results column delete [lrange [$_results column names] 2 end]
+        set _resultnum 0
+    }
+}
+
+# ----------------------------------------------------------------------
+# USAGE: diff names
+# USAGE: diff values <column> ?<which>?
+#
+# Returns information about the diffs in the current set of known
+# results.  The "diff names" returns a list of column names for
+# parameters that have diffs.  (These are the columns in the tuples.)
+#
+# The "diff values" returns the various values associated with a
+# particular <column> name.  If the optional <which> is specified,
+# then it is treated as an index into the list of values--0 for the
+# first value, 1 for the second, etc.  Each value is returned as
+# a list with two words.  The first is the the label associated with
+# the value.  The second is the normalized (numeric) value, which can
+# be sorted to get a particular ordering.
+# ----------------------------------------------------------------------
+itcl::body Rappture::ResultSet::diff {option args} {
+    switch -- $option {
+        names {
+            return [$_results column names]
+        }
+        values {
+            if {[llength $args] < 1} {
+                error "wrong # args: should be \"diff values col ?which?\""
+            }
+            set col [lindex $args 0]
+
+            set which "all"
+            if {[llength $args] > 1} {
+                set which [lindex $args 1]
+            }
+
+            if {$which eq "all"} {
+                set rlist ""
+                # build an array of normalized values and their labels
+                if {$col == "simnum"} {
+                    set nruns [$_results size]
+                    for {set n 0} {$n < $nruns} {incr n} {
+                        set simnum [$_results get -format simnum $n]
+                        lappend rlist $simnum $n
                     }
-
-                    if {$col == $_active} {
-                        # control is going away -- switch to sim # control
-                        set simnum0 [$_results get -format simnum 0]
-                        set _cntlInfo($this-simnum-value) $simnum0
-                        Activate simnum
+                } else {
+                    set havenums 1
+                    foreach rec [$_results get -format [list xmlobj $col]] {
+                        set xo [lindex $rec 0]
+                        set v [lindex $rec 1]
+                        foreach {raw norm} \
+                            [Rappture::LibraryObj::value $xo $col] break
+
+                        if {![info exists unique($v)]} {
+                            # keep only unique label strings
+                            set unique($v) $norm
+                        }
+                        if {$havenums && ![string is double $norm]} {
+                            set havenums 0
+                        }
                     }
-                    set controlsChanged 1
-                }
-            }
-
-            # can we find a tuple with the desired value for the active col?
-            if {$_active ne "" && $vcurr ne ""} {
-                set found ""
-                if {[$_results find -format $_active $vcurr] ne ""} {
-                    set found $vcurr
-                } elseif {$vnext ne "" && [$_results find -format $_active $vnext] ne ""} {
-                    set found $vnext
-                }
-
-                if {$found ne ""} {
-                    # set the control to a value we were able to find
-                    # this will trigger !settings and other adjustments
-                    set _cntlInfo($this-$_active-value) $found
+
+                    if {!$havenums} {
+                        # don't have normalized nums? then sort and create nums
+                        set rlist ""
+                        set n 0
+                        foreach val [lsort -dictionary [array names unique]] {
+                            lappend rlist $val [incr n]
+                        }
+                    } else {
+                        set rlist [array get unique]
+                    }
+                }
+                return $rlist
+            }
+
+            # treat the "which" parameter as an XML object
+            set irun [lindex [$_results find -format xmlobj $which] 0]
+            if {$irun ne ""} {
+                if {$col == "simnum"} {
+                    set val [$_results get -format simnum $irun]
                 } else {
-                    # if all else fails, show solution #1
-                    set simnum0 [$_results get -format simnum 0]
-                    set _cntlInfo($this-simnum-value) $simnum0
-                    Activate simnum
-                }
-            }
-        }
-    } else {
-        #
-        # Delete all results.
-        #
-        $_results delete 0 end
-
-        # delete all adjuster controls
-        foreach col $_cntlInfo($this-all) {
-            set id $_cntlInfo($this-$col-id)
-            destroy $shortlist.label$id
-        }
-        set controlsChanged 1
-    }
-
-    if {[$_results size] == 0} {
-        #
-        # No results left?  Then clean everything up.
-        #
-
-        array unset _cntlInfo $this-*
-        # clean up control info
-        foreach key [array names _cntlInfo $this-*] {
-            catch {unset _cntlInfo($key)}
-        }
-        set _cntlInfo($this-all) ""
-        set _counter 0
-        set _resultnum 0
-
-        # clear out all results
-        eval $_results column delete [lrange [$_results column names] 2 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
-    _fixNumResults
-    $_dispatcher event -idle !fixcntls
-
-    # let clients know that the number of controls has changed
-    if {$controlsChanged} {
-        event generate $itk_component(hull) <<Control>>
-    }
-
-    # if there's a callback for clearing, invoke it now...
-    if {[string length $itk_option(-clearcommand)] > 0} {
-        uplevel #0 $itk_option(-clearcommand) $xmlobj
-    }
-}
-
-# ----------------------------------------------------------------------
-# 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} {
-    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
+                    # Be careful giving singleton elements as the
+                    # "columns" argument to "Tuples::get". It is
+                    # expecting a list.
+                    foreach {raw norm} \
+                        [Rappture::LibraryObj::value $which $col] break
+                    return [list $norm $raw]
+                }
+            }
+        }
+        default {
+            error "bad option \"$option\": should be names or values"
+        }
+    }
+}
+
+# ----------------------------------------------------------------------
+# USAGE: find <columnList> <valueList>
+#
+# Searches through the results for a set of tuple values that match
+# the <valueList> for the given <columnList>.  Returns a list of
+# matching xml objects or "" if there is no match.  If the <valueList>
+# is *, then it returns a list of all xml objects.
+# ----------------------------------------------------------------------
+itcl::body Rappture::ResultSet::find {collist vallist} {
+    if {$vallist eq "*"} {
+        return [$_results get -format xmlobj]
+    }
+
+    set rlist ""
+    foreach irun [$_results find -format $collist $vallist] {
+        lappend rlist [$_results get -format xmlobj $irun]
+    }
+    return $rlist
+}
+
+# ----------------------------------------------------------------------
+# USAGE: get <columnList> <xmlobj>
+#
+# Returns values for the specified <columnList> for the given <xmlobj>.
+# This is a way of querying associated data for the given object.
+# ----------------------------------------------------------------------
+itcl::body Rappture::ResultSet::get {collist xmlobj} {
+    set irun [lindex [$_results find -format xmlobj $xmlobj] 0]
+    if {$irun ne ""} {
+        return [lindex [$_results get -format $collist $irun] 0]
+    }
+    return ""
 }
 
@@ -499 +367 @@
 
 # ----------------------------------------------------------------------
-# 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}} {
-    switch -- $what {
-        -results {
-            return [$_results size]
-        }
-        -controls {
-            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
+# USAGE: size
+#
+# Returns the number of results currently stored in the set.
+# ----------------------------------------------------------------------
+itcl::body Rappture::ResultSet::size {} {
+    return [$_results size]
+}
+
+# ----------------------------------------------------------------------
+# USAGE: notify add <client> ?!event !event ...? <command>
+# USAGE: notify get ?<client>? ?!event?
+# USAGE: notify remove <client> ?!event !event ...?
+#
+# Clients use this to add/remove requests for notifications about
+# various events that signal changes to the data in each ResultSet.
+#
+# The "notify add" operation takes a <client> name (any unique string
+# identifying the client), an optional list of events, and the <command>
+# that should be called for the callback.
+#
+# The "notify get" command returns information about clients and their
+# registered callbacks.  With no args, it returns a list of <client>
+# names.  If the <client> is specified, it returns a list of !events.
+# If the <client> and !event is specified, it returns the <command>.
+#
+# The "notify remove" command removes any callback associated with
+# a given <client>.  If no particular !events are specified, then it
+# removes callbacks for all events.
+# ----------------------------------------------------------------------
+itcl::body Rappture::ResultSet::notify {option args} {
+    set allEvents {!change}
+    switch -- $option {
+        add {
+            if {[llength $args] < 2} {
+                error "wrong # args: should be \"notify add caller ?!event !event ...? command"
+            }
+            set caller [lindex $args 0]
+            set command [lindex $args end]
+            if {[llength $args] > 2} {
+                set events [lrange $args 1 end-1]
+            } else {
+                set events $allEvents
+            }
+
+            foreach name $events {
+                if {[lsearch -exact $allEvents $name] < 0} {
+                    error "bad event \"$name\": should be [join $allEvents ,]"
+                }
+                if {[lsearch $_notify(ALL) $caller] < 0} {
+                    lappend _notify(ALL) $caller
+                }
+                set _notify($caller-$name) $command
+            }
+        }
+        get {
+            switch -- [llength $args] {
+                0 {
+                    return $_notify(ALL)
+                }
+                1 {
+                    set caller [lindex $args 0]
+                    set rlist ""
+                    foreach key [array names _notify $caller-*] {
+                        lappend rlist [lindex [split $key -] end]
+                    }
+                    return $rlist
+                }
+                2 {
+                    set caller [lindex $args 0]
+                    set name [lindex $args 1]
+                    if {[info exists _notify($caller-$name)]} {
+                        return $_notify($caller-$name)
+                    }
+                    return ""
                 }
                 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
+                    error "wrong # args: should be \"notify get ?caller? ?!event?\""
+                }
+            }
+        }
+        remove {
+            if {[llength $args] < 1} {
+                error "wrong # args: should be \"notify remove caller ?!event !event ...?"
+            }
+            set caller [lindex $args 0]
+            if {[llength $args] > 1} {
+                set events [lrange $args 1 end]
+            } else {
+                set events $allEvents
+            }
+
+            foreach name $events {
+                catch {unset _notify($caller-$name)}
+            }
+            if {[llength [array names _notify $caller-*]] == 0} {
+                set i [lsearch $_notify(ALL) $caller]
+                if {$i >= 0} {
+                    set _notify(ALL) [lreplace $_notify(ALL) $i $i]
+                }
+            }
         }
         default {
-            error "bad option \"$what\": should be -results, -controls, or -controlarea"
-        }
-    }
-}
-
-# ----------------------------------------------------------------------
-# USAGE: _doClear all|current
-#
-# Invoked automatically when the user presses the "Clear One" or
-# "Clear All" buttons.  Invokes the -clearcommand to clear all data
-# from this resultset and all other resultsets in an Analyzer.
-# ----------------------------------------------------------------------
-itcl::body Rappture::ResultSet::_doClear {what} {
-    switch -- $what {
-        current {
-            set xmlobj ""
-            # value of xmlobj control is something like "#1" or "#2"
-            set irun [$_results find -format simnum $_cntlInfo($this-simnum-value)]
-            if {$irun ne ""} {
-                # convert index to a real xmlobj object
-                set xmlobj [$_results get -format xmlobj $irun]
-            }
-            clear $xmlobj
-        }
-        all {
-            clear
-        }
-        default { error "bad option \"$what\": should be current or all" }
-    }
-}
-
-# ----------------------------------------------------------------------
-# USAGE: _doSettings ?<command>?
-#
-# Used internally whenever the result selection changes to invoke
-# the -settingscommand.  This will notify some external widget, which
-# with perform the plotting action specified in the <command>.
-# ----------------------------------------------------------------------
-itcl::body Rappture::ResultSet::_doSettings {{cmd ""}} {
-    if {[string length $itk_option(-settingscommand)] > 0} {
-        uplevel #0 $itk_option(-settingscommand) $cmd
-    }
-}
-
-# ----------------------------------------------------------------------
-# 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]
-
-            $dial clear
-            foreach {label val} [_getValues $col all] {
-                $dial add $label $val
-            }
-        }
-        default {
-            error "bad option \"$option\": should be bind, hilite, or load"
-        }
-    }
-}
-
-# ----------------------------------------------------------------------
-# USAGE: _fixControls ?<eventArgs...>?
-#
-# Called automatically at the idle point after one or more results
-# have been added to this result set.  Scans through all existing
-# data and updates controls used to select the data.
-# ----------------------------------------------------------------------
-itcl::body Rappture::ResultSet::_fixControls {args} {
-    if {[$_results size] == 0} {
-        return
-    }
-
-    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.
-    #
-    $shortlist.dial configure -variable ""
-
-    set nadded 0
-    foreach col [$_results column names] {
-        set xmlobj [$_results get -format xmlobj 0]
-
-        #
-        # If this column doesn't have a control yet, then
-        # create one.
-        #
-        if {![info exists _cntlInfo($this-$col-id)]} {
-            set tip ""
-            if {$col eq "xmlobj"} {
-                continue
-            } elseif {$col eq "simnum"} {
-                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 {"" == $quantity && "" != $xmlobj} {
-                    set quantity [$xmlobj element -as id $col]
-                }
-            }
-
-            # Create the controls for the "short list" area.
-            set fn $itk_option(-textfont)
-            set w $shortlist.label$_counter
-            set row [lindex [grid size $shortlist] 1]
-            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]"
-
-            # 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
-
-            # 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
-            # so they can fix the overall size accordingly
-            event generate $itk_component(hull) <<Control>>
-
-            incr nadded
-        }
-
-        #
-        # Determine the unique values for this column and load
-        # them into the control.
-        #
-        set id $_cntlInfo($this-$col-id)
-
-        if {$col == $_layout(active)} {
-            _control load $shortlist.dial $col
-            $shortlist.dial configure -variable \
-                "::Rappture::ResultSet::_cntlInfo($this-$col-value)"
-        }
-    }
-
-    #
-    # 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] == 3 || $nadded == 1} {
-            Activate [lindex $_cntlInfo($this-all) end]
-        } else {
-            Activate simnum
-        }
-    }
-
-    #
-    # 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.
-    #
-    set irun [lindex [$_results find -format xmlobj $_recent] 0]
-    if {$irun ne ""} {
-        set simnum [$_results get -format simnum $irun]
-        set _cntlInfo($this-simnum-value) $simnum
-    }
-}
-
-# ----------------------------------------------------------------------
-# 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.
-# ----------------------------------------------------------------------
-itcl::body Rappture::ResultSet::_fixLayout {args} {
-    array set eventdata $args
-
-    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)
-        $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} {
-            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
-                }
-            }
-        }
-        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)
-
-        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
-            }
-        }
-    }
-}
-
-# ----------------------------------------------------------------------
-# USAGE: _fixNumResults
-#
-# Used internally to update the number of results displayed near the
-# top of this widget.  If there is only 1 result, then there is also
-# a single "Clear" button.  If there are no results, the clear button
-# is diabled.
-# ----------------------------------------------------------------------
-itcl::body Rappture::ResultSet::_fixNumResults {} {
-    switch [$_results size] {
-        0 {
-            $itk_component(status) configure -text "No results"
-            $itk_component(clearall) configure -state disabled -text "Clear"
-            pack forget $itk_component(clear)
-        }
-        1 {
-            $itk_component(status) configure -text "1 result"
-            $itk_component(clearall) configure -state normal -text "Clear"
-            pack forget $itk_component(clear)
-        }
-        default {
-            $itk_component(status) configure -text "[$_results size] results"
-            $itk_component(clearall) configure -state normal -text "Clear All"
-            $itk_component(clear) configure -state normal
-            pack $itk_component(clear) -side right \
-                -after $itk_component(clearall) -padx {0 6}
-        }
-    }
-}
-
-# ----------------------------------------------------------------------
-# USAGE: _fixSettings ?<eventArgs...>?
-#
-# Called automatically at the idle point after a control has changed
-# to load new data into the plotting area at the top of this result
-# set.  Extracts the current tuple of control values from the control
-# area, then finds the corresponding data values.  Loads the data
-# by invoking a -settingscommand callback with parameters that
-# describe what data should be plotted.
-# ----------------------------------------------------------------------
-itcl::body Rappture::ResultSet::_fixSettings {args} {
-    array set eventdata $args
-    if {[info exists eventdata(column)]} {
-        set changed $eventdata(column)
-    } else {
-        set changed ""
-    }
-
-    if {[info exists _cntlInfo($this-$_active-label)]} {
-        lappend params $_cntlInfo($this-$_active-label)
-    } else {
-        lappend params "???"
-    }
-    if { $_active == "" } {
-        return;                         # Nothing active. Don't do anything.
-    }
-    eval lappend params [_getValues $_active all]
-
-    switch -- [$_results size] {
-        0 {
-            # no data? then do nothing
-            return
-        }
-        1 {
-            # only one data set? then plot it
-            set simnum [$_results get -format simnum 0]
-            _doSettings [list \
-                $simnum [list -width 2 \
-                        -param [_getValues $_active current] \
-                        -description [_getParamDesc all] \
-                  ] \
-                params $params \
-            ]
-            return
-        }
-    }
-
-    #
-    # 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" || $changed == "simnum"} {
-        set irun [$_results find -format simnum $_cntlInfo($this-simnum-value)]
-    } else {
-        set format ""
-        set tuple ""
-        foreach col [lrange [$_results column names] 2 end] {
-            lappend format $col
-            lappend tuple $_cntlInfo($this-$col-value)
-        }
-        set irun [lindex [$_results find -format $format -- $tuple] 0]
-
-        if {"" == $irun && "" != $changed} {
-            #
-            # 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] 2 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] 2 end]
-        if {[llength $format] == 1} {
-            set data [$_results get -format $format $irun]
-        } else {
-            set data [lindex [$_results get -format $format $irun] 0]
-        }
-
-        foreach col $format val $data {
-            set _cntlInfo($this-$col-value) $val
-        }
-        set simnum [$_results get -format simnum $irun]
-        set _cntlInfo($this-simnum-value) $simnum
-
-        # okay, react to value changes again
-        set _settings 0
-    }
-
-    #
-    # Search for tuples matching the current setting and
-    # plot them.
-    #
-    if {$_plotall && $_active == "simnum"} {
-        set format ""
-    } else {
-        set format ""
-        set tuple ""
-        foreach col [lrange [$_results column names] 2 end] {
-            if {!$_plotall || $col != $_active} {
-                lappend format $col
-                lappend tuple $_cntlInfo($this-$col-value)
-            }
-        }
-    }
-
-    if {"" != $format} {
-        set ilist [$_results find -format $format -- $tuple]
-    } else {
-        set ilist [$_results find]
-    }
-
-    if {[llength $ilist] > 0} {
-        # search for the result for these settings
-        set format ""
-        set tuple ""
-        foreach col [lrange [$_results column names] 2 end] {
-            lappend format $col
-            lappend tuple $_cntlInfo($this-$col-value)
-        }
-        set icurr [$_results find -format $format -- $tuple]
-
-        if {[llength $ilist] == 1} {
-            # single result -- always use active color
-            set i [lindex $ilist 0]
-            set simnum [$_results get -format simnum $i]
-            set plist [list \
-                $simnum [list -width 2 \
-                         -param [_getValues $_active $i] \
-                         -description [_getParamDesc all $i] \
-                   ] \
-                params $params \
-            ]
-        } else {
-            #
-            # Get the color for all points according to
-            # the color spectrum.
-            #
-            set plist [list params $params]
-            foreach i $ilist {
-                set simnum [$_results get -format simnum $i]
-                if {$i == $icurr} {
-                    lappend plist $simnum [list -width 3 -raise 1 \
-                        -param [_getValues $_active $i] \
-                        -description [_getParamDesc all $i]]
-                } else {
-                    lappend plist $simnum [list -brightness 0.7 -width 1 \
-                        -param [_getValues $_active $i] \
-                        -description [_getParamDesc all $i]]
-                }
-            }
-        }
-
-        #
-        # Load up the matching plots
-        #
-        _doSettings $plist
-    }
-}
-
-# ----------------------------------------------------------------------
-# 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 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 {
-            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 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 sbutton $itk_component(dials).all
-    set current [$sbutton cget -relief]
-
-    if {$current == "sunken"} {
-        $sbutton configure -relief raised \
-            -background $itk_option(-activecontrolbackground) \
-            -foreground $itk_option(-activecontrolforeground)
-        set _plotall 0
-    } else {
-        $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: _getValues <column> ?<which>?
-#
-# Called automatically whenever the user hovers a control within
-# this widget.  Returns the tooltip associated with the control.
-# ----------------------------------------------------------------------
-itcl::body Rappture::ResultSet::_getValues {col {which ""}} {
-    if {$col == "simnum"} {
-        # load the Simulation # control
-        set nruns [$_results size]
-        for {set n 0} {$n < $nruns} {incr n} {
-            set v [$_results get -format simnum $n]
-            set label2val($v) $n
-        }
-    } else {
-        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 label2val($v)]} {
-                lappend vlist $v
-                foreach {raw norm} [Rappture::LibraryObj::value $xo $col] break
-                set label2val($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 label2val}
-
-            set n 0
-            foreach v [lsort $vlist] {
-                incr n
-                set label2val($v) $n
-            }
-        }
-    }
-
-    switch -- $which {
-        current {
-            set curr $_cntlInfo($this-$col-value)
-            if {[info exists label2val($curr)]} {
-                return [list $curr $label2val($curr)]
-            }
-            return ""
-        }
-        all {
-            return [array get label2val]
-        }
-        default {
-            if {[string is integer $which]} {
-                if {$col == "simnum"} {
-                    set val [$_results get -format simnum $which]
-                } else { 
-                    # Be careful giving singleton elements as the "columns"
-                    # argument to "Tuples::get". It is expecting a list.
-                    set val [lindex [$_results get -format [list $col] $which] 0]
-                }
-                if {[info exists label2val($val)]} {
-                    return [list $val $label2val($val)]
-                }
-                return ""
-            }
-            error "bad option \"$which\": should be all, current, or an integer index"
-        }
-    }
-}
-
-# ----------------------------------------------------------------------
-# 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."
-        }
-    }
-    return [string trim $tip]
-}
-
-# ----------------------------------------------------------------------
-# USAGE: _getParamDesc <which> ?<index>?
-#
-# Used internally to build a descripton of parameters for the data
-# tuple at the specified <index>.  This is passed on to the underlying
-# results viewer, so it will know what data is being viewed.
-# ----------------------------------------------------------------------
-itcl::body Rappture::ResultSet::_getParamDesc {which {index "current"}} {
-    if {$index == "current"} {
-        # search for the result for these settings
-        set format ""
-        set tuple ""
-        foreach col [lrange [$_results column names] 2 end] {
-            lappend format $col
-            lappend tuple $_cntlInfo($this-$col-value)
-        }
-        set index [$_results find -format $format -- $tuple]
-        if {"" == $index} {
-            return ""  ;# somethings wrong -- bail out!
-        }
-    }
-
-    switch -- $which {
-        active {
-            if {"" == $_active} {
-                return ""
-            }
-        }
-        all {
-            set desc ""
-            foreach col $_cntlInfo($this-all) {
-                set quantity $_cntlInfo($this-$col-label)
-                # Be careful giving singleton elements as the "columns"
-                # argument to "Tuples::get". It is expecting a list.
-                set val [lindex [$_results get -format [list $col] $index] 0]
-                if {$col == "simnum"} {
-                    set irun [lindex [$_results find -format xmlobj $val] 0]
-                    set val [$_results get -format simnum $irun]
-                }
-                append desc "$quantity = $val\n"
-            }
-            return [string trim $desc]
-        }
-        default {
-            error "bad value \"$which\": should be active or all"
+            error "wrong # args: should be add, get, remove"
+        }
+    }
+}
+
+# ----------------------------------------------------------------------
+# USAGE: _notifyHandler ?<eventArgs>...?
+#
+# Called automatically whenever a !change event is triggered in this
+# object.  Scans through the list of clients that want to receive this
+# event and executes each of their callbacks.
+# ----------------------------------------------------------------------
+itcl::body Rappture::ResultSet::_notifyHandler {args} {
+    array set data $args
+    set event $data(event)
+
+    foreach caller $_notify(ALL) {
+        if {[info exists _notify($caller-$event)]} {
+            if {[catch {uplevel #0 $_notify($caller-$event) $args} result]} {
+                # anything go wrong? then throw a background error
+                bgerror "$result\n(while dispatching $event to $caller)"
+            }
         }
     }
@@ -1575 +558 @@
 
         # overwrite the first matching entry
+        # start by freeing the old result
         set index [lindex $ilist 0]
+        set xo [$tuples get -format xmlobj $index]
+        itcl::delete object $xo
+
+        # put this new result in its place
         $tuples put -format $cols $index $tuple
+        set simnum [$tuples get -format simnum $index]
     } else {
         if {$simnum eq ""} {
@@ -1586 +575 @@
     return $simnum
 }
-
-# ----------------------------------------------------------------------
-# OPTION: -activecontrolbackground
-# ----------------------------------------------------------------------
-itcl::configbody Rappture::ResultSet::activecontrolbackground {
-    $_dispatcher event -idle !layout
-}
-
-# ----------------------------------------------------------------------
-# OPTION: -activecontrolforeground
-# ----------------------------------------------------------------------
-itcl::configbody Rappture::ResultSet::activecontrolforeground {
-    $_dispatcher event -idle !layout
-}
-

branches/blt4/gui/scripts/resultviewer.tcl

@@ +1 @@
+
 # ----------------------------------------------------------------------
 #  COMPONENT: ResultViewer - plots a collection of related results
@@ -297 +298 @@
                     if {![info exists _mode2widget($mode)]} {
                         global env
-                        switch -- [$dataobj type] {
+                        switch -- [$dataobj viewer] {
                             "unirect2d" {
                                 if { [info exists env(VTKHEIGHTMAP)] } {
@@ -327 +328 @@
                     set mode "field3D"
                     if {![info exists _mode2widget($mode)]} {
-                        switch -- [$dataobj type] {
+                        switch -- [$dataobj viewer] {
                             "vtk" {
                                 set fmt "vtk"

branches/blt4/gui/scripts/visviewer.tcl

@@ -164 +164 @@
     if { [info exists env(VISRECORDER)] } {
         set _logging 1
+        if { [file exists /tmp/recording.log] } {
+            file delete /tmp/recording.log
+        }
     }
     eval itk_initialize $args

branches/blt4/gui/scripts/vtkcontourviewer.tcl

@@ -32 +32 @@
         vtkvis_server Rappture::VtkContourViewer::SetServerList
 }
-
 itcl::class Rappture::VtkContourViewer {
     inherit Rappture::VisViewer
@@ -65 +64 @@
 
     protected method Connect {}
-    protected method CurrentDatasets {{what -all}}
+    protected method CurrentDatasets { args }
     protected method Disconnect {}
     protected method DoResize {}
     protected method FixLegend {}
-    protected method FixSettings {what {value ""}}
+    protected method InitSettings { args }
+    protected method AdjustSetting {what {value ""}}
     protected method Pan {option x y}
     protected method Pick {x y}
@@ -75 +75 @@
     protected method ReceiveDataset { args }
     protected method ReceiveImage { args }
-    protected method DrawLegend {}
+    protected method DrawLegend { name }
     protected method ReceiveLegend { colormap title vmin vmax size }
     protected method Rotate {option x y}
@@ -89 +89 @@
     # The following methods are only used by this class.
     private method BuildCameraTab {}
+    private method BuildColormap { name colors }
+    private method BuildDownloadPopup { widget command } 
     private method BuildViewTab {}
-    private method BuildColormap { colormap dataobj comp }
+    private method ChangeColormap { dataobj comp color }
+    private method ColorsToColormap { color }
+    private method FieldMenu { option }
+    private method EnterLegend { x y } 
     private method EventuallyResize { w h } 
     private method EventuallyResizeLegend { } 
-    private method SetStyles { dataobj comp }
-    private method PanCamera {}
     private method GetImage { args } 
     private method GetVtkData { args } 
-    private method BuildDownloadPopup { widget command } 
+    private method LeaveLegend {}
+    private method MotionLegend { x y } 
+    private method PanCamera {}
+    private method SetColormap { dataobj comp }
+    private method SetLegendTip { x y }
+    private method SetObjectStyle { dataobj comp }
 
     private variable _arcball ""
@@ -113 +121 @@
                                     # dataobj-components using the tf.
 
+    private variable _style        ;# Array of current component styles.
     private variable _click        ;# info used for rotate operations
     private variable _limits       ;# autoscale min/max for all axes
     private variable _view         ;# view params for 3D view
-    private common   _settings
+    private variable   _settings
     # Array of transfer functions in server.  If 0 the transfer has been
     # defined but not loaded.  If 1 the transfer function has been named
@@ -132 +141 @@
     private variable _resizeLegendPending 0
     private variable _outline
+    private variable _title ""
+    private variable _currentField ""
+    private variable _scalarFields {}
+    private variable _fields
+    private variable _afterId -1
 }
 
@@ -137 +151 @@
     keep -background -foreground -cursor -font
     keep -plotbackground -plotforeground
+}
+itk::usual BltComboButton {
+    keep -background -foreground -cursor -font
 }
 
@@ -197 +214 @@
 
     array set _settings [subst {
-        $this-axes              1
-        $this-edges             0
-        $this-lighting          1
-        $this-opacity           100
-        $this-volume            1
-        $this-isolines          1
-        $this-wireframe         0
-        $this-legend            1
-        $this-colormap          1
+        axes              1
+        edges             0
+        lighting          1
+        opacity           100
+        volume            1
+        isolines          1
+        wireframe         0
+        legend-visible    1
+        contour-field     ""
+        contour-palette   BCGYR
+        colormap          1
     }]
 
     itk_component add view {
         canvas $itk_component(plotarea).view \
-            -highlightthickness 0 -borderwidth 0
+            -highlightthickness 0 -borderwidth 0 -background black
     } {
         usual
         ignore -highlightthickness -borderwidth  -background
     }
-
+    itk_component add fieldmenu {
+        blt::combomenu $itk_component(plotarea).menu -bg black \
+            -fg white -relief flat \
+            -textvariable [itcl::scope _currentField] \
+            -command [itcl::code $this FieldMenu invoke]
+    } {
+        usual
+        ignore -background -foreground -relief 
+    }
     set c $itk_component(view)
     bind $c <Configure> [itcl::code $this EventuallyResize %w %h]
@@ -275 +302 @@
     Rappture::Tooltip::for $itk_component(zoomout) "Zoom out"
 
-    BuildViewTab
+    if { [catch BuildViewTab errs] != 0 } {
+        puts stderr "errs=$errs"
+    }
     BuildCameraTab
 
-    # Legend
-
     set _image(legend) [image create picture]
-    itk_component add legend {
-        canvas $itk_component(plotarea).legend -width 50 -highlightthickness 0
-    } {
-        usual
-        ignore -highlightthickness
-        rename -background -plotbackground plotBackground Background
-    }
-    bind $itk_component(legend) <Configure> \
+    bind $itk_component(plotarea) <Configure> \
         [itcl::code $this EventuallyResizeLegend]
 
@@ -297 +317 @@
     pack forget $itk_component(view)
     blt::table $itk_component(plotarea) \
-        0,0 $itk_component(view) -fill both -reqwidth $w \
-        1,0 $itk_component(legend) -fill x 
-    blt::table $itk_component(plotarea) \
-        0,0 $itk_component(view) -fill both -reqwidth $w \
-        0,1 $itk_component(legend) -fill y 
-    blt::table configure $itk_component(plotarea) c1 -resize none
-
-    if 0 {
-    bind $itk_component(view) <Configure> \
-        [itcl::code $this EventuallyResize %w %h]
-    }
+        0,0 $itk_component(view) -fill both -reqwidth $w 
+
     # Bindings for panning via mouse
     bind $itk_component(view) <ButtonPress-2> \
@@ -367 +378 @@
     image delete $_image(legend)
     image delete $_image(download)
-    array unset _settings $this-*
+    array unset _settings 
     catch { blt::arcball destroy $_arcball}
 }
 
 itcl::body Rappture::VtkContourViewer::DoResize {} {
-    if { $_width < 2 } {
-        set _width 500
+    set w [expr $_width - 12]
+    if { $w < 2 } {
+        set w 500
     }
     if { $_height < 2 } {
         set _height 500
     }
-    SendCmd "screen size $_width $_height"
-    if { $_settings($this-legend) } {
-        EventuallyResizeLegend
+    SendCmd "screen size $w $_height"
+    if { $_settings(legend-visible) } {
+        FixLegend
     }
     set _resizePending 0
@@ -707 +719 @@
         $_image(plot) configure -data $bytes
         #puts stderr "received image [image width $_image(plot)]x[image height $_image(plot)] image>"        
+        #puts stderr "w=[winfo width $itk_component(view)]"
     } elseif { $info(type) == "print" } {
         set tag $this-print-$info(-token)
@@ -721 +734 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkContourViewer::FixLegend {} {
-    puts stderr "FixLegend _first=$_first"
-    set _resizeLegendPending 0
-    set lineht [font metrics $itk_option(-font) -linespace]
-    set c $itk_component(legend)
-    set w 20
-    set h [expr {[winfo height $itk_component(view)] - 2 * ($lineht+2)}]
-    puts stderr "in fixlegend w=$w h=$h"
+    set font "Arial 8"
+    set lineht [font metrics $font -linespace]
+    set c $itk_component(view)
+    set w 12
+    set h [expr {$_height - 3 * ($lineht + 2)}]
+    if { $h < 1} {
+        return
+    }
     if {$w > 0 && $h > 0 && $_first != "" } {
-        set tag [lindex [CurrentDatasets] 0]
-        puts stderr "tag=$tag [info exists _dataset2style($tag)]"
+        set tag [lindex [CurrentDatasets -all] 0]
+        puts stderr "field=$_settings(contour-field) title=$_currentField"
+        set name $_settings(contour-field)
         if { [info exists _dataset2style($tag)] } {
-            SendCmd "legend $_dataset2style($tag) scalar {} $w $h 0"
-        }
-    } else {
-        #$itk_component(legend) delete all
+            set colormap $_dataset2style($tag)
+            SendCmd "legend $colormap scalar ${name} {} $w $h 0"
+            SendCmd "heightmap colormap $colormap $tag"
+        }
+        foreach dataset [CurrentDatasets -all] {
+            SendCmd "dataset scalar ${name} $dataset"
+            SendCmd "dataset visible on $dataset"
+            SendCmd "dataset outline on $dataset"
+        }
     }
 }
@@ -745 +765 @@
 #       of the contour plot area.
 #
-itcl::body Rappture::VtkContourViewer::DrawLegend {} {
-    set c $itk_component(legend)
+itcl::body Rappture::VtkContourViewer::DrawLegend { name } {
+    set c $itk_component(view)
     set w [winfo width $c]
     set h [winfo height $c]
-    puts stderr "DrawLegend w=$w h=$h"
+    set font "Arial 8"
+    set lineht [font metrics $font -linespace]
+    if { [info exists _fields($name)] } {
+        foreach { title units } $_fields($name) break
+        if { $units != "" } {
+            set title [format "%s (%s)" $title $units]
+        }
+    } else {
+        set title $name
+    }
+    if { $_settings(legend-visible) } {
+        set x [expr $w - 2]
+        if { [$c find withtag "legend"] == "" } {
+            set y 2 
+            $c create text $x $y \
+                -anchor ne \
+                -fill $itk_option(-plotforeground) -tags "title legend" \
+                -font $font
+            incr y $lineht
+            $c create text $x $y \
+                -anchor ne \
+                -fill $itk_option(-plotforeground) -tags "vmax legend" \
+                -font $font
+            incr y $lineht
+            $c create image $x $y \
+                -anchor ne \
+                -image $_image(legend) -tags "colormap legend"
+            $c create text $x [expr {$h-2}] \
+                -anchor se \
+                -fill $itk_option(-plotforeground) -tags "vmin legend" \
+                -font $font
+            $c bind colormap <Leave> [itcl::code $this LeaveLegend]
+            $c bind colormap <Motion> [itcl::code $this MotionLegend %x %y]
+        }
+        $c bind title <ButtonPress> [itcl::code $this FieldMenu post]
+        $c bind title <Enter> [itcl::code $this FieldMenu activate]
+        $c bind title <Leave> [itcl::code $this FieldMenu deactivate]
+        # Reset the item coordinates according the current size of the plot.
+        $c itemconfigure title -text $title
+        if { $_limits(vmin) != "" } {
+            $c itemconfigure vmin -text [format %g $_limits(vmin)]
+        }
+        if { $_limits(vmax) != "" } {
+            $c itemconfigure vmax -text [format %g $_limits(vmax)]
+        }
+        set y 2
+        $c coords title $x $y
+        incr y $lineht
+        $c coords vmax $x $y
+        incr y $lineht
+        $c coords colormap $x $y
+        $c coords vmin $x [expr {$h - 2}]
+    }
+}
+
+if 0 {
+#
+# DrawLegend --
+#
+#       Draws the legend in it's own canvas which resides to the right
+#       of the contour plot area.
+#
+itcl::body Rappture::VtkContourViewer::DrawLegend {} {
+    set c $itk_component(view)
+    set w [winfo width $c]
+    set h [winfo height $c]
+    #puts stderr "DrawLegend w=$w h=$h"
     set lineht [font metrics $itk_option(-font) -linespace]
     
-    if { $_settings($this-legend) } {
+    if { $_settings(legend-visible) } {
         if { [$c find withtag "legend"] == "" } {
             $c create image [expr {$w-2}] [expr {$lineht+2}] -anchor ne \
@@ -775 +861 @@
     }
 }
+}
 
 # ----------------------------------------------------------------------
@@ -791 +878 @@
         }
         $_image(legend) configure -data $bytes
-        puts stderr "read $size bytes for [image width $_image(legend)]x[image height $_image(legend)] legend>"
-        DrawLegend
+        set _limits(vmin) $vmin
+        set _limits(vmax) $vmax
+        #puts stderr "read $size bytes for [image width $_image(legend)]x[image height $_image(legend)] legend>"
+        set _title $title
+        DrawLegend $title
     }
 }
@@ -810 +900 @@
                 "world" {
                     foreach { x y z value tag } [lrange $args 2 end] break
-                    puts stderr "world x=$x y=$y z=$z value=$value tag=$tag"
+                    #puts stderr "world x=$x y=$y z=$z value=$value tag=$tag"
                 }
                 "pixel" {
                     foreach { x y value tag } [lrange $args 2 end] break
-                    puts stderr "pixel x=$x y=$y value=$value tag=$tag"
+                    #puts stderr "pixel x=$x y=$y value=$value tag=$tag"
                 }
             }
@@ -823 +913 @@
                 "world" {
                     foreach { x y z vx vy vz tag } [lrange $args 2 end] break
-                    puts stderr "world x=$x y=$y z=$z value=$vx $xy $vz tag=$tag"
+                    #puts stderr "world x=$x y=$y z=$z value=$vx $xy $vz tag=$tag"
                 }
                 "pixel" {
                     foreach { x y vx vy vz tag } [lrange $args 2 end] break
-                    puts stderr "pixel x=$x y=$y value=$vx $xy $vz tag=$tag"
+                    #puts stderr "pixel x=$x y=$y value=$vx $xy $vz tag=$tag"
                 }
             }
@@ -833 +923 @@
         "names" {
             foreach { name } [lindex $args 1] {
-                puts stderr "Dataset: $name"
+                #puts stderr "Dataset: $name"
             }
         }
@@ -850 +940 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkContourViewer::Rebuild {} {
-
     # Turn on buffering of commands to the server.  We don't want to
     # be preempted by a server disconnect/reconnect (which automatically
@@ -874 +963 @@
                 append _outbuf "dataset add $tag data follows $length\n"
                 append _outbuf $bytes
-                append _outbuf "heightmap add numcontours [expr {$style(-levels)+1}] 0 $tag\n"
-                SetStyles $dataobj $comp
+                SetObjectStyle $dataobj $comp
                 set _datasets($tag) 1
                 foreach {min max} [$dataobj limits v] break
@@ -902 +990 @@
         SendCmd "camera zoom $_view(zoom)"
     }
-    FixSettings opacity
-    FixSettings isolines
-    FixSettings colormap
-    FixSettings lighting
-    FixSettings wireframe
-    FixSettings axes
-    FixSettings edges
+
+    InitSettings opacity isolines colormap lighting wireframe axes edges
 
     # Nothing to send -- activate the proper ivol
-    foreach tag [CurrentDatasets] {
+    foreach tag [CurrentDatasets -all] {
         SendCmd "dataset visible 0 $tag"
     }
@@ -925 +1008 @@
         }
     }
-
+ 
+    if { $_currentField == ""  && $_first != "" } {
+        $itk_component(fieldmenu) delete all
+        $itk_component(fieldmenu2) delete all
+        array unset _fields
+        set _scalarFields [$_first hints scalars]
+        foreach { name title units } $_scalarFields {
+            $itk_component(fieldmenu) add \
+                -type radiobutton -text "$title" -value $name  \
+                -variable [itcl::scope _settings(contour-field)]
+            $itk_component(fieldmenu2) add \
+                -text "$title" -value $name \
+                -variable [itcl::scope _settings(contour-field)]
+            set _fields($name) [list $title $units]
+        }
+        set fld [$_first hints default]
+        if { $fld == "" } {
+            set fld [lindex $_scalarFields 0]
+        }
+        foreach { name title units } $_scalarFields {
+            if { $fld == $name } {
+                set _settings(contour-field) $name
+                set _currentField $title
+                break
+            }
+        }
+    }
     FixLegend 
 
@@ -939 +1048 @@
 
 # ----------------------------------------------------------------------
-# USAGE: CurrentDatasets ?-cutplanes?
+# USAGE: CurrentDatasets ?-all -visible? ?dataobjs?
 #
 # Returns a list of server IDs for the current datasets being displayed.  This
@@ -945 +1054 @@
 # object has multiple components.
 # ----------------------------------------------------------------------
-itcl::body Rappture::VtkContourViewer::CurrentDatasets {{what -all}} {
+itcl::body Rappture::VtkContourViewer::CurrentDatasets {args} {
+    set flag [lindex $args 0]
+    switch -- $flag { 
+        "-all" {
+            if { [llength $args] > 1 } {
+                error "CurrentDatasets: can't specify dataobj after \"-all\""
+            }
+            set dlist [get -objects]
+        }
+        "-visible" {
+            if { [llength $args] > 1 } {
+                set dlist {}
+                set args [lrange $args 1 end]
+                foreach dataobj $args {
+                    if { [info exists _obj2ovride($dataobj-raise)] } {
+                        lappend dlist $dataobj
+                    }
+                }
+            } else {
+                set dlist [get]
+            }
+        }           
+        default {
+            set dlist $args
+        }
+    }
     set rlist ""
-    if { $_first == "" } {
-        return
-    }
-    foreach comp [$_first components] {
-        set tag $_first-$comp
-        if { [info exists _datasets($tag)] && $_datasets($tag) } {
-            lappend rlist $tag
+    foreach dataobj $dlist {
+        foreach comp [$dataobj components] {
+            set tag $dataobj-$comp
+            if { [info exists _datasets($tag)] && $_datasets($tag) } {
+                lappend rlist $tag
+            }
         }
     }
@@ -1109 +1242 @@
 }
 
-# ----------------------------------------------------------------------
-# USAGE: FixSettings <what> ?<value>?
+
+# ----------------------------------------------------------------------
+# USAGE: InitSettings <what> ?<value>?
 #
 # Used internally to update rendering settings whenever parameters
@@ -1116 +1250 @@
 # to the back end.
 # ----------------------------------------------------------------------
-itcl::body Rappture::VtkContourViewer::FixSettings {what {value ""}} {
+itcl::body Rappture::VtkContourViewer::InitSettings { args } {
+    foreach spec $args {
+        if { [info exists _settings($_first-$spec)] } {
+            # Reset global setting with dataobj specific setting
+            set _settings($spec) $_settings($_first-$spec)
+        }
+        AdjustSetting $spec
+    }
+}
+
+# ----------------------------------------------------------------------
+# USAGE: AdjustSetting <what> ?<value>?
+#
+# Used internally to update rendering settings whenever parameters
+# change in the popup settings panel.  Sends the new settings off
+# to the back end.
+# ----------------------------------------------------------------------
+itcl::body Rappture::VtkContourViewer::AdjustSetting {what {value ""}} {
     switch -- $what {
         "opacity" {
             if {[isconnected]} {
-                set val $_settings($this-opacity)
+                set val $_settings(opacity)
                 set sval [expr { 0.01 * double($val) }]
-                foreach dataset [CurrentDatasets] {
+                foreach dataset [CurrentDatasets -all] {
                     SendCmd "heightmap opacity $sval $dataset"
                 }
@@ -1129 +1280 @@
         "wireframe" {
             if {[isconnected]} {
-                set bool $_settings($this-wireframe)
-                foreach dataset [CurrentDatasets] {
+                set bool $_settings(wireframe)
+                foreach dataset [CurrentDatasets -all] {
                     SendCmd "heightmap wireframe $bool $dataset"
                 }
@@ -1137 +1288 @@
         "colormap" {
             if {[isconnected]} {
-                set bool $_settings($this-colormap)
-                foreach dataset [CurrentDatasets] {
+                set bool $_settings(colormap)
+                foreach dataset [CurrentDatasets -all] {
                     SendCmd "heightmap surface $bool $dataset"
                 }
@@ -1145 +1296 @@
         "isolines" {
             if {[isconnected]} {
-                set bool $_settings($this-isolines)
-                foreach dataset [CurrentDatasets] {
+                set bool $_settings(isolines)
+                foreach dataset [CurrentDatasets -all] {
                     SendCmd "heightmap isolines $bool $dataset"
                 }
@@ -1153 +1304 @@
         "edges" {
             if {[isconnected]} {
-                set bool $_settings($this-edges)
-                foreach dataset [CurrentDatasets] {
+                set bool $_settings(edges)
+                foreach dataset [CurrentDatasets -all] {
                     SendCmd "heightmap edges $bool $dataset"
                 }
@@ -1161 +1312 @@
         "lighting" {
             if {[isconnected]} {
-                set bool $_settings($this-lighting)
-                foreach dataset [CurrentDatasets] {
+                set bool $_settings(lighting)
+                foreach dataset [CurrentDatasets -all] {
                     SendCmd "heightmap lighting $bool $dataset"
                 }
@@ -1169 +1320 @@
         "axes" {
             if { [isconnected] } {
-                set bool $_settings($this-axes)
+                set bool $_settings(axes)
                 SendCmd "axis visible all $bool"
             }
         }
         "legend" {
-            if { $_settings($this-legend) } {
-                blt::table $itk_component(plotarea) \
-                    0,0 $itk_component(view) -fill both \
-                    0,1 $itk_component(legend) -fill y 
-                blt::table configure $itk_component(plotarea) c1 -resize none
-            } else {
-                blt::table forget $itk_component(legend)
-            }
+            if { !$_settings(legend-visible) } {
+                $itk_component(view) delete legend
+            }
+            DrawLegend $_settings(contour-field)
+        }
+        "contour-palette" {
+            puts stderr "newpalette is $_settings(contour-palette)"
+            foreach dataset [CurrentDatasets -visible $_first] {
+                foreach {dataobj comp} [split $dataset -] break
+                ChangeColormap $dataobj $comp $_settings(contour-palette)
+            }
+            set _legendPending 1
+        }
+        "contour-field" {
+            foreach { name title units } $_scalarFields {
+                if { $name == $_settings(contour-field) } {
+                    DrawLegend $name
+                    foreach dataset [CurrentDatasets -visible] {
+                        SendCmd "dataset scalar ${name} $dataset"
+                        SendCmd "cutplane colormode scalar ${name} $dataset"
+                    }
+                    set _legendPending 1
+                    break
+                }
+            }
         }
         default {
-            error "don't know how to fix $what"
-        }
-    }
-}
-
-
-#
-# SetStyles --
-#
-itcl::body Rappture::VtkContourViewer::SetStyles { dataobj comp } {
-    array set style {
-        -color rainbow
-        -levels 6
-        -opacity 1.0
-    }
-    set tag $dataobj-$comp
-    array set style [lindex [$dataobj components -style $comp] 0]
-    set colormap "$style(-color):$style(-levels):$style(-opacity)"
-    if { [info exists _colormaps($colormap)] } {
-        puts stderr "Colormap $colormap already built"
-    }
-    if { ![info exists _dataset2style($tag)] } {
-        set _dataset2style($tag) $colormap
-        lappend _style2datasets($colormap) $tag
-    }
-    if { ![info exists _colormaps($colormap)] } {
-        # Build the pseudo colormap if it doesn't exist.
-        BuildColormap $colormap $dataobj $comp
-        set _colormaps($colormap) 1
-    }
-    #SendCmd "heightmap numcontours $style(-levels) $tag\n"
-    SendCmd "heightmap colormap $colormap $tag"
-    return $colormap
-}
-
-#
-# BuildColormap --
-#
-itcl::body Rappture::VtkContourViewer::BuildColormap { colormap dataobj comp } {
-    puts stderr "BuildColormap $colormap"
-    array set style {
-        -color rainbow
-        -levels 6
-        -opacity 1.0
-    }
-    array set style [lindex [$dataobj components -style $comp] 0]
-
-    if {$style(-color) == "rainbow"} {
-        set style(-color) "white:yellow:green:cyan:blue:magenta"
-    }
-    set clist [split $style(-color) :]
-    set cmap {}
-    for {set i 0} {$i < [llength $clist]} {incr i} {
-        set x [expr {double($i)/([llength $clist]-1)}]
-        set color [lindex $clist $i]
-        append cmap "$x [Color2RGB $color] "
-    }
-    if { [llength $cmap] == 0 } {
-        set cmap "0.0 0.0 0.0 0.0 1.0 1.0 1.0 1.0"
-    }
-    set tag $this-$colormap
-    if { ![info exists _settings($tag-opacity)] } {
-        set _settings($tag-opacity) $style(-opacity)
-    }
-    set max $_settings($tag-opacity)
-
-    set wmap "0.0 1.0 1.0 1.0"
-    SendCmd "colormap add $colormap { $cmap } { $wmap }"
+            error "unknown setting \"$what\": should be one of [array names _settings]"
+        }
+    }
 }
 
@@ -1318 +1421 @@
     checkbutton $inner.axes \
         -text "Axes" \
-        -variable [itcl::scope _settings($this-axes)] \
-        -command [itcl::code $this FixSettings axes] \
+        -variable [itcl::scope _settings(axes)] \
+        -command [itcl::code $this AdjustSetting axes] \
         -font "Arial 9"
 
     checkbutton $inner.colormap \
         -text "Colormap" \
-        -variable [itcl::scope _settings($this-colormap)] \
-        -command [itcl::code $this FixSettings colormap] \
+        -variable [itcl::scope _settings(colormap)] \
+        -command [itcl::code $this AdjustSetting colormap] \
         -font "Arial 9"
 
     checkbutton $inner.isolines \
         -text "Isolines" \
-        -variable [itcl::scope _settings($this-isolines)] \
-        -command [itcl::code $this FixSettings isolines] \
+        -variable [itcl::scope _settings(isolines)] \
+        -command [itcl::code $this AdjustSetting isolines] \
         -font "Arial 9"
 
     checkbutton $inner.wireframe \
         -text "Wireframe" \
-        -variable [itcl::scope _settings($this-wireframe)] \
-        -command [itcl::code $this FixSettings wireframe] \
+        -variable [itcl::scope _settings(wireframe)] \
+        -command [itcl::code $this AdjustSetting wireframe] \
         -font "Arial 9"
 
     checkbutton $inner.lighting \
         -text "Lighting" \
-        -variable [itcl::scope _settings($this-lighting)] \
-        -command [itcl::code $this FixSettings lighting] \
+        -variable [itcl::scope _settings(lighting)] \
+        -command [itcl::code $this AdjustSetting lighting] \
         -font "Arial 9"
 
     checkbutton $inner.legend \
         -text "Legend" \
-        -variable [itcl::scope _settings($this-legend)] \
-        -command [itcl::code $this FixSettings legend] \
+        -variable [itcl::scope _settings(legend-visible)] \
+        -command [itcl::code $this AdjustSetting legend] \
         -font "Arial 9"
 
     checkbutton $inner.edges \
         -text "Edges" \
-        -variable [itcl::scope _settings($this-edges)] \
-        -command [itcl::code $this FixSettings edges] \
+        -variable [itcl::scope _settings(edges)] \
+        -command [itcl::code $this AdjustSetting edges] \
         -font "Arial 9"
 
     label $inner.clear -text "Clear" -font "Arial 9"
     ::scale $inner.opacity -from 0 -to 100 -orient horizontal \
-        -variable [itcl::scope _settings($this-opacity)] \
+        -variable [itcl::scope _settings(opacity)] \
         -width 10 \
-        -showvalue off -command [itcl::code $this FixSettings opacity]
+        -showvalue off -command [itcl::code $this AdjustSetting opacity]
     label $inner.opaque -text "Opaque" -font "Arial 9"
+
+    label $inner.field_l -text "Field" -font "Arial 9" 
+    blt::comboentry $inner.field -width 10 \
+        -menu $inner.field.menu \
+        -textvariable [itcl::scope _currentField] \
+        -edit no
+    itk_component add fieldmenu2 {
+        blt::combomenu $inner.field.menu \
+            -textvariable [itcl::scope _currentField] \
+            -command [itcl::code $this FieldMenu invoke]
+    } {
+        usual
+        ignore -background
+    }
+    label $inner.palette_l -text "Palette" -font "Arial 9" 
+    blt::comboentry $inner.palette -width 10 \
+        -menu $inner.palette.menu \
+        -textvariable [itcl::scope _settings(contour-palette)] \
+        -edit no 
+    set palettes {
+        "BCGYR"              
+        "BGYOR"              
+        "blue"               
+        "blue-to-brown"      
+        "blue-to-orange"     
+        "blue-to-grey"       
+        "green-to-magenta"   
+        "greyscale"          
+        "nanohub"            
+        "rainbow"            
+        "spectral"           
+        "ROYGB"              
+        "RYGCB"              
+        "brown-to-blue"      
+        "grey-to-blue"       
+        "orange-to-blue"         
+    }
+    blt::combomenu $inner.palette.menu \
+        -textvariable [itcl::scope _settings(contour-palette)] \
+        -command [itcl::code $this AdjustSetting contour-palette] \
+        -yscrollbar $inner.palette.menu.ybar \
+        -height { 0 1.2i } 
+    
+    blt::tk::scrollbar $inner.palette.menu.ybar
+
+    $inner.palette.menu listadd $palettes
 
     blt::table $inner \
@@ -1375 +1524 @@
         7,0 $inner.clear -anchor e -pady 2 \
         7,1 $inner.opacity -columnspan 2 -pady 2 -fill x\
-        7,3 $inner.opaque -anchor w -pady 2 
+        7,3 $inner.opaque -anchor w -pady 2  \
+        8,0 $inner.field_l -anchor e -pady 2  \
+        8,1 $inner.field -cspan 3 -anchor w -pady 2 -fill x  \
+        9,0 $inner.palette_l -anchor e -pady 2  \
+        9,1 $inner.palette -cspan 3 -fill x -pady 2  
 
     blt::table configure $inner r* -resize none
-    blt::table configure $inner r8 -resize expand
+    blt::table configure $inner r10 -resize expand
 }
 
@@ -1615 +1768 @@
 }
 
+
+
+#
+# EnterLegend --
+#
+itcl::body Rappture::VtkContourViewer::EnterLegend { x y } {
+    SetLegendTip $x $y
+}
+
+#
+# MotionLegend --
+#
+itcl::body Rappture::VtkContourViewer::MotionLegend { x y } {
+    Rappture::Tooltip::tooltip cancel
+    set c $itk_component(view)
+    after cancel $_afterId
+    set _afterId [after 50 [itcl::code $this SetLegendTip $x $y]]
+}
+
+#
+# LeaveLegend --
+#
+itcl::body Rappture::VtkContourViewer::LeaveLegend { } {
+    Rappture::Tooltip::tooltip cancel
+    after cancel $_afterId
+    .rappturetooltip configure -icon ""
+}
+
+#
+# SetLegendTip --
+#
+itcl::body Rappture::VtkContourViewer::SetLegendTip { x y } {
+    set c $itk_component(view)
+    set w [winfo width $c]
+    set h [winfo height $c]
+    set font "Arial 8"
+    set lineht [font metrics $font -linespace]
+    
+    set imgHeight [image height $_image(legend)]
+    set coords [$c coords colormap]
+    set imgX [expr $w - [image width $_image(legend)] - 2]
+    set imgY [expr $y - 2 * ($lineht + 2)]
+
+    set units ""
+    if { [info exists _fields($_title)] } {
+        foreach { title units } $_fields($_title) break
+    }
+    # Make a swatch of the selected color
+    if { [catch { $_image(legend) get 10 $imgY } pixel] != 0 } {
+        puts stderr "out of range: $imgY"
+        return
+    }
+    if { ![info exists _image(swatch)] } {
+        set _image(swatch) [image create picture -width 24 -height 24]
+    }
+    #set color [eval format "\#%02x%02x%02x" $pixel]
+    $_image(swatch) blank white
+    $_image(swatch) draw rectangle 3 3 20 20 -color $pixel -shadow 1
+    $_image(swatch) draw rectangle 3 3 20 20 -color black -linewidth 1
+    .rappturetooltip configure -icon $_image(swatch)
+
+    # Compute the value of the point
+    if { [info exists _limits(vmax)] && [info exists _limits(vmin)] } {
+        set t [expr 1.0 - (double($imgY) / double($imgHeight-1))]
+        set value [expr $t * ($_limits(vmax) - $_limits(vmin)) + $_limits(vmin)]
+    } else {
+        set value 0.0
+    }
+    set tipx [expr $x + 15] 
+    set tipy [expr $y - 5]
+    Rappture::Tooltip::text $c "$value$units"
+    Rappture::Tooltip::tooltip show $c +$tipx,+$tipy    
+}
+
+
+
+# ----------------------------------------------------------------------
+# USAGE: _dropdown post
+# USAGE: _dropdown unpost
+# USAGE: _dropdown select
+#
+# Used internally to handle the dropdown list for this combobox.  The
+# post/unpost options are invoked when the list is posted or unposted
+# to manage the relief of the controlling button.  The select option
+# is invoked whenever there is a selection from the list, to assign
+# the value back to the gauge.
+# ----------------------------------------------------------------------
+itcl::body Rappture::VtkContourViewer::FieldMenu {option} {
+    set c $itk_component(view) 
+    set m $itk_component(fieldmenu)
+    switch -- $option {
+        post {
+            foreach { x1 y1 x2 y2 } [$c bbox title] break
+            set x1 [expr [winfo width $c] - [winfo reqwidth $m]]
+            set x [expr $x1 + [winfo rootx $c]]
+            set y [expr $y2 + [winfo rooty $c]]
+            blt::ComboMenu::popup $m $x $y
+        }
+        activate {
+            $c itemconfigure title -fill red
+        }
+        deactivate {
+            $c itemconfigure title -fill white 
+        }
+        invoke {
+            set value [$itk_component(fieldmenu) item cget $_currentField -value]
+            set _$_settings(contour-field) $value
+            $itk_component(view) itemconfigure title -text $_currentField
+            FixLegend
+            AdjustSetting contour-field
+        }
+        default {
+            error "bad option \"$option\": should be post, unpost, select"
+        }
+    }
+}
+
+
+#
+# ChangeColormap --
+#
+itcl::body Rappture::VtkContourViewer::ChangeColormap {dataobj comp color} {
+    set tag $dataobj-$comp
+    if { ![info exist _style($tag)] } {
+        error "no initial colormap"
+    }
+    array set style $_style($tag)
+    set style(-color) $color
+    set _style($tag) [array get style]
+    SetColormap $dataobj $comp
+    FixLegend
+}
+
+#
+# SetColormap --
+#
+itcl::body Rappture::VtkContourViewer::SetColormap { dataobj comp } {
+    array set style {
+        -color BGYOR
+        -levels 6
+        -opacity 1.0
+    }
+    set tag $dataobj-$comp
+    if { ![info exists _initialStyle($tag)] } {
+        # Save the initial component style.
+        set _initialStyle($tag) [$dataobj style $comp]
+    }
+
+    # Override defaults with initial style defined in xml.
+    array set style $_initialStyle($tag)
+
+    if { ![info exists _style($tag)] } {
+        set _style($tag) [array get style]
+    }
+    # Override initial style with current style.
+    array set style $_style($tag)
+
+    set name "$style(-color):$style(-levels):$style(-opacity)"
+    if { ![info exists _colormaps($name)] } {
+        BuildColormap $name [array get style]
+        set _colormaps($name) 1
+    }
+    SendCmd "heightmap colormap $name $tag"
+    SendCmd "heightmap add numcontours [expr {$style(-levels)+1}] 0 $tag"
+    if { ![info exists _dataset2style($tag)] ||
+         $_dataset2style($tag) != $name } {
+        set _dataset2style($tag) $name
+    }
+}
+
+
+itcl::body Rappture::VtkContourViewer::ColorsToColormap { colors } {
+    switch -- $colors {
+        "grey-to-blue" {
+            return {
+                0.0                      0.200 0.200 0.200
+                0.14285714285714285      0.400 0.400 0.400
+                0.2857142857142857       0.600 0.600 0.600
+                0.42857142857142855      0.900 0.900 0.900
+                0.5714285714285714       0.800 1.000 1.000
+                0.7142857142857143       0.600 1.000 1.000
+                0.8571428571428571       0.400 0.900 1.000
+                1.0                      0.000 0.600 0.800
+            }
+        }
+        "blue-to-grey" {
+            return {
+                0.0                     0.000 0.600 0.800 
+                0.14285714285714285     0.400 0.900 1.000 
+                0.2857142857142857      0.600 1.000 1.000 
+                0.42857142857142855     0.800 1.000 1.000 
+                0.5714285714285714      0.900 0.900 0.900 
+                0.7142857142857143      0.600 0.600 0.600 
+                0.8571428571428571      0.400 0.400 0.400 
+                1.0                     0.200 0.200 0.200
+            }
+        }
+        "blue" {
+            return { 
+                0.0                     0.900 1.000 1.000 
+                0.1111111111111111      0.800 0.983 1.000 
+                0.2222222222222222      0.700 0.950 1.000 
+                0.3333333333333333      0.600 0.900 1.000 
+                0.4444444444444444      0.500 0.833 1.000 
+                0.5555555555555556      0.400 0.750 1.000 
+                0.6666666666666666      0.300 0.650 1.000 
+                0.7777777777777778      0.200 0.533 1.000 
+                0.8888888888888888      0.100 0.400 1.000 
+                1.0                     0.000 0.250 1.000
+            }
+        }
+        "brown-to-blue" {
+            return {
+                0.0                             0.200   0.100   0.000 
+                0.09090909090909091             0.400   0.187   0.000 
+                0.18181818181818182             0.600   0.379   0.210 
+                0.2727272727272727              0.800   0.608   0.480 
+                0.36363636363636365             0.850   0.688   0.595 
+                0.45454545454545453             0.950   0.855   0.808 
+                0.5454545454545454              0.800   0.993   1.000 
+                0.6363636363636364              0.600   0.973   1.000 
+                0.7272727272727273              0.400   0.940   1.000 
+                0.8181818181818182              0.200   0.893   1.000 
+                0.9090909090909091              0.000   0.667   0.800 
+                1.0                             0.000   0.480   0.600 
+            }
+        }
+        "blue-to-brown" {
+            return {
+                0.0                             0.000   0.480   0.600 
+                0.09090909090909091             0.000   0.667   0.800 
+                0.18181818181818182             0.200   0.893   1.000 
+                0.2727272727272727              0.400   0.940   1.000 
+                0.36363636363636365             0.600   0.973   1.000 
+                0.45454545454545453             0.800   0.993   1.000 
+                0.5454545454545454              0.950   0.855   0.808 
+                0.6363636363636364              0.850   0.688   0.595 
+                0.7272727272727273              0.800   0.608   0.480 
+                0.8181818181818182              0.600   0.379   0.210 
+                0.9090909090909091              0.400   0.187   0.000 
+                1.0                             0.200   0.100   0.000 
+            }
+        }
+        "blue-to-orange" {
+            return {
+                0.0                             0.000   0.167   1.000
+                0.09090909090909091             0.100   0.400   1.000
+                0.18181818181818182             0.200   0.600   1.000
+                0.2727272727272727              0.400   0.800   1.000
+                0.36363636363636365             0.600   0.933   1.000
+                0.45454545454545453             0.800   1.000   1.000
+                0.5454545454545454              1.000   1.000   0.800
+                0.6363636363636364              1.000   0.933   0.600
+                0.7272727272727273              1.000   0.800   0.400
+                0.8181818181818182              1.000   0.600   0.200
+                0.9090909090909091              1.000   0.400   0.100
+                1.0                             1.000   0.167   0.000
+            }
+        }
+        "orange-to-blue" {
+            return {
+                0.0                             1.000   0.167   0.000
+                0.09090909090909091             1.000   0.400   0.100
+                0.18181818181818182             1.000   0.600   0.200
+                0.2727272727272727              1.000   0.800   0.400
+                0.36363636363636365             1.000   0.933   0.600
+                0.45454545454545453             1.000   1.000   0.800
+                0.5454545454545454              0.800   1.000   1.000
+                0.6363636363636364              0.600   0.933   1.000
+                0.7272727272727273              0.400   0.800   1.000
+                0.8181818181818182              0.200   0.600   1.000
+                0.9090909090909091              0.100   0.400   1.000
+                1.0                             0.000   0.167   1.000
+            }
+        }
+        "rainbow" {
+            set clist {
+                "#EE82EE"
+                "#4B0082" 
+                "blue" 
+                "#008000" 
+                "yellow" 
+                "#FFA500" 
+                "red" 
+            }
+        }
+        "BGYOR" {
+            set clist {
+                "blue" 
+                "#008000" 
+                "yellow" 
+                "#FFA500" 
+                "red" 
+            }
+        }
+        "ROYGB" {
+            set clist {
+                "red" 
+                "#FFA500" 
+                "yellow" 
+                "#008000" 
+                "blue" 
+            }
+        }
+        "RYGCB" {
+            set clist {
+                "red" 
+                "yellow" 
+                "green"
+                "cyan"
+                "blue"
+            }
+        }
+        "BCGYR" {
+            set clist {
+                "blue" 
+                "cyan"
+                "green"
+                "yellow" 
+                "red" 
+            }
+        }
+        "spectral" {
+            return {
+                0.0 0.150 0.300 1.000 
+                0.1 0.250 0.630 1.000 
+                0.2 0.450 0.850 1.000 
+                0.3 0.670 0.970 1.000 
+                0.4 0.880 1.000 1.000 
+                0.5 1.000 1.000 0.750 
+                0.6 1.000 0.880 0.600 
+                0.7 1.000 0.680 0.450 
+                0.8 0.970 0.430 0.370 
+                0.9 0.850 0.150 0.196 
+                1.0 0.650 0.000 0.130
+            }
+        }
+        "green-to-magenta" {
+            return {
+                0.0 0.000 0.316 0.000 
+                0.06666666666666667 0.000 0.526 0.000 
+                0.13333333333333333 0.000 0.737 0.000 
+                0.2 0.000 0.947 0.000 
+                0.26666666666666666 0.316 1.000 0.316 
+                0.3333333333333333 0.526 1.000 0.526 
+                0.4 0.737 1.000 0.737 
+                0.4666666666666667 1.000 1.000 1.000 
+                0.5333333333333333 1.000 0.947 1.000 
+                0.6 1.000 0.737 1.000 
+                0.6666666666666666 1.000 0.526 1.000 
+                0.7333333333333333 1.000 0.316 1.000 
+                0.8 0.947 0.000 0.947 
+                0.8666666666666667 0.737 0.000 0.737 
+                0.9333333333333333 0.526 0.000 0.526 
+                1.0 0.316 0.000 0.316
+            }
+        }
+        "greyscale" {
+            return { 
+                0.0 0.0 0.0 0.0 1.0 1.0 1.0 1.0
+            }
+        }
+        "nanohub" {
+            set clist "white yellow green cyan blue magenta"
+        }
+        default {
+            set clist $colors
+        }
+    }
+    set cmap {}
+    for {set i 0} {$i < [llength $clist]} {incr i} {
+        set x [expr {double($i)/([llength $clist]-1)}]
+        set color [lindex $clist $i]
+        append cmap "$x [Color2RGB $color] "
+    }
+    return $cmap
+}
+
+#
+# BuildColormap --
+#
+itcl::body Rappture::VtkContourViewer::BuildColormap { name styles } {
+    array set style $styles
+    set cmap [ColorsToColormap $style(-color)]
+    if { [llength $cmap] == 0 } {
+        set cmap "0.0 0.0 0.0 0.0 1.0 1.0 1.0 1.0"
+    }
+    if { ![info exists _settings(contour-opacity)] } {
+        set _settings(contour-opacity) $style(-opacity)
+    }
+    set max $_settings(contour-opacity)
+
+    set wmap "0.0 1.0 1.0 1.0"
+    SendCmd "colormap add $name { $cmap } { $wmap }"
+}
+
+
+itcl::body Rappture::VtkContourViewer::SetObjectStyle { dataobj comp } {
+    # Parse style string.
+    set tag $dataobj-$comp
+    set style [$dataobj style $comp]
+    array set settings {
+        -color \#808080
+        -edgecolor black
+        -edges 0
+        -lighting 1
+        -linewidth 1.0
+        -opacity 0.4
+        -seedcolor white
+        -seeds 1
+        -visible 1
+        -wireframe 0
+    }
+    if { $dataobj != $_first } {
+        set settings(-opacity) 1
+    }
+    array set settings $style
+    SendCmd "heightmap add numcontours 7 0 $tag"
+    SendCmd "heightmap linecolor 1. 1. 1. $tag"
+    SendCmd "heightmap isolinecolor 1. 1. 1. $tag"
+    SendCmd "heightmap linewidth 1 $tag"
+    SendCmd "heightmap isolinewidth 2 $tag"
+    SendCmd "heightmap visible $tag"
+    SendCmd "heightmap lighting on $tag"
+    set _settings(contour-wireframe) $settings(-wireframe)
+    set _settings(contour-opacity) [expr $settings(-opacity) * 100.0]
+    SetColormap $dataobj $comp
+}