Changeset 3289

Timestamp:

Feb 9, 2013, 4:06:03 PM (12 years ago)

Author:

gah

Message:

cleanup isosurface viewer

Location:

branches/Rappture 1.2

Files:

• examples/zoo/field/tool.xml (modified) (1 diff)
• gui/scripts/cloud.tcl (modified) (1 diff)
• gui/scripts/field.tcl (modified) (38 diffs)
• gui/scripts/field2dresult.tcl (modified) (5 diffs)
• gui/scripts/field3dresult.tcl (modified) (3 diffs)
• gui/scripts/mesh.tcl (modified) (7 diffs)
• gui/scripts/resultviewer.tcl (modified) (3 diffs)
• gui/scripts/vtkheightmapviewer.tcl (modified) (35 diffs)
• gui/scripts/vtkisosurfaceviewer.tcl (modified) (68 diffs)

branches/Rappture 1.2/examples/zoo/field/tool.xml

@@ -46 +46 @@
       <value>nanovis</value>
     </option>
-    <default>nanovis</default>
+    <default>vtk</default>
   </choice>
 </input>

branches/Rappture 1.2/gui/scripts/cloud.tcl

@@ -157 +157 @@
         }
     }
-    parray _limits
     append out "DATASET POLYDATA\n"
     append out "POINTS $_numPoints float\n"

branches/Rappture 1.2/gui/scripts/field.tcl

@@ -16 +16 @@
 package require BLT
 
-namespace eval Rappture { # forward declaration }
+namespace eval Rappture { 
+    # forward declaration 
+}
+
+#
+# Possible field types:
+#
+#       unirect2d       -- heightmap. if extents > 1, flow.
+#       unirect3d       -- flow 
+#       cloud (2d)      -- contour
+#       cloud (3d)      -- isosurface
+#       mesh (3d)       -- isosurface
+#       mesh (2d)       -- coutour
+#       dx              -- volume 
+#       ucd             -- isosurface
+#       vtk (3d)        -- isosurface
+#       vtk (2d)        -- contour
+#       
+# Types:
+#       Format     Dim  Description                     Viewer          Server
+#       vtk         2   vtk file data.                  contour         vtkvis
+#       vtk         3   vtk file data.                  isosurface      vtkvis
+#       mesh        2   points-on-mesh                  heightmap       vtkvis
+#       mesh        3   points-on-mesh                  isosurface      vtkvis
+#       dx          3   DX                              volume          nanovis
+#       unirect2d   2   unirect3d + extents > 1 flow    flow            nanovis
+#       unirect3d   3   unirect2d + extents > 1 flow    flow            nanovis
+#       
 
 itcl::class Rappture::Field {
-    constructor {xmlobj path} { # defined below }
-    destructor { # defined below }
-
+    private variable _dim       0;      # Dimension of mesh
+    private variable _xmlobj ""  ;      # ref to XML obj with device data
+    private variable _limits     ;      # maps box name => {z0 z1} limits
+    private variable _field ""
+    private variable _fieldNames ""   ; # list of field names.
+    private variable _fieldUnits ""   ; # list of units of each field name.
+    private variable _fieldLabels ""  ; # list of labels of each field name.
+    private variable _viewer            "auto"
+
+    constructor {xmlobj path} { 
+        # defined below 
+    }
+    destructor { 
+        # defined below 
+    }
     public method components {args}
     public method mesh {{cname -overall}}
@@ -40 +79 @@
     public method vtkdata {cname}
     
-    protected method _build {}
+    protected method Build {}
     protected method _getValue {expr}
 
-    private variable _dim       0;      # Dimension of mesh
-    private variable _xmlobj ""  ;      # ref to XML obj with device data
     private variable _path "";          # Path of this object in the XML 
     private variable _units ""   ;      # system of units for this field
-    private variable _limits     ;# maps box name => {z0 z1} limits
     private variable _zmax 0     ;# length of the device
 
-    private variable _field ""
-    private variable _fieldNames ""   ;# list of field names.
-    private variable _fieldUnits ""   ;# list of units of each field name.
-    private variable _fieldLabels ""  ;# list of labels of each field name.
     private variable _comp2dims  ;# maps component name => dimensionality
     private variable _comp2xy    ;# maps component name => x,y vectors
-    private variable _comp2vtk   ;# maps component name => vtkFloatArray
-    private variable _comp2vtkstreamlines   ;# maps component name => vtkFloatArray
     private variable _comp2isosurface   ;# maps component name => vtkFloatArray
-    private variable _comp2vtkcontour   ;# maps component name => vtkFloatArray
-    private variable _comp2vtkvolume   ;# maps component name => vtkFloatArray
+    private variable _comp2vtk   ;# maps component name => vtk file data
     private variable _comp2volume   ;# maps component name => vtkFloatArray
     private variable _comp2dx    ;# maps component name => OpenDX data
@@ -71 +100 @@
     private variable _type "" 
     private variable _comp2flowhints 
-    private variable _comp2heightmap 
+    private variable _comp2mesh 
     private common _counter 0    ;# counter for unique vector names
 
@@ -77 +106 @@
     private method ConvertToVtkData { cname } 
     private method ReadVtkDataSet { cname contents } 
-    private variable _isVtk
+    private method AvsToVtk { cname contents } 
     private variable _values ""
-    private variable _viewer "vtkcontour"
 }
 
@@ -122 +150 @@
 
     # build up vectors for various components of the field
-    _build
+    Build
 }
 
@@ -135 +163 @@
         eval blt::vector destroy $_comp2xy($name)
     }
-    foreach name [array names _comp2vtk] {
-        set mobj [lindex $_comp2vtk($name) 0]
-        set class [$mobj info class]
-        ${class}::release $mobj
-
-        set fobj [lindex $_comp2vtk($name) 1]
-        rename $fobj ""
-    }
     foreach name [array names _comp2unirect2d] {
         itcl::delete object $_comp2unirect2d($name)
@@ -152 +172 @@
         itcl::delete object $_comp2flowhints($name)
     }
-    foreach name [array names _comp2isosurface] {
-        set mesh [lindex $_comp2isosurface($name) 0]
+    foreach name [array names _comp2mesh] {
+        # Data is in the form of a mesh and a vector.
+        foreach { mesh vector } $_comp2mesh($name) break
+        # Release the mesh (may be shared)
         set class [$mesh info class]
         ${class}::release $mesh
-        set vtkarray [lindex $_comp2isosurface($name) 1]
-        rename $vtkarray ""
-    }
-    foreach name [array names _comp2heightmap] {
-        set mesh [lindex $_comp2heightmap($name) 0]
-        set class [$mesh info class]
-        ${class}::release $mesh
-
-        set vtkarray [lindex $_comp2heightmap($name) 1]
-        rename $vtkarray ""
+        # Destroy the vector
+        blt::vector destroy $vector
     }
 }
@@ -227 +241 @@
         return [lindex $_comp2xy($cname) 0]  ;# return xv
     }
-    if { [info exists _comp2vtkstreamlines($cname)] } {
-puts stderr "comp2vtkstreamlines"
-        error "mesh: not implemented for streamlines"
-        return [$mobj mesh]
-    }
-    if { [info exists _comp2vtkcontour($cname)] } {
-puts stderr "comp2vtkcontour"
-        error "method \"mesh\" is not implemented for vtkcontour"
-    }
     if { [info exists _comp2vtk($cname)] } {
-        set mobj [lindex $_comp2vtk($cname) 0]
- puts stderr "comp2vtk mobj=$mobj mesh=[$mobj mesh]"
-        return [$mobj mesh]
+        # FIXME: extract mesh from VTK file data.
+puts stderr "comp2vtk"
+        error "method \"mesh\" is not implemented for VTK file data"
     }
     if {[info exists _comp2dx($cname)]} {
@@ -245 +250 @@
         return ""  ;# no mesh -- it's embedded in the value data
     }
-    if {[info exists _comp2heightmap($cname)]} {
-puts stderr "comp2heightmap"
-        return ""  ;# no mesh -- it's embedded in the value data
-    }
-    if {[info exists _comp2isosurface($cname)]} {
-puts stderr "comp2isosurface"
-        return ""  ;# no mesh -- it's embedded in the value data
-    }
-    if {[info exists _comp2vtkvolume($cname)]} {
-puts stderr "comp2vtkvolume"
+    if {[info exists _comp2mesh($cname)]} {
+puts stderr "comp2mesh"
         return ""  ;# no mesh -- it's embedded in the value data
     }
@@ -284 +281 @@
         return [lindex $_comp2xy($cname) 1]  ;# return yv
     }
-    if { [info exists _comp2vtkcontour($cname)] } {
-        error "method \"values\" is not implemented for vtkcontour"
-    }
-    if { [info exists _comp2heightmap($cname)] } {
-        return $_values
-    }
-    if { [info exists _comp2isosurface($cname)] } {
-        return $_values
-    }
-    if { [info exists _comp2vtkstreamlines($cname)] } {
-        # FIXME: Need to process the vtk file data to pull out the field's
-        # values.
-        error "vtkstreamlines: values not implemented"
-        return [lindex $_comp2vtkstreamlines($cname) 1] 
-    }
+    # VTK file data 
     if { [info exists _comp2vtk($cname)] } {
-        return [lindex $_comp2vtk($cname) 1]  ;# return vtkFloatArray
+        # FIXME: extract the values from the VTK file data
+        error "method \"values\" is not implemented for vtk file data"
+    }
+    # Points-on-mesh
+    if { [info exists _comp2mesh($cname)] } {
+        set vector [lindex $_comp2mesh($cname) 1]
+        return [$vector range 0 end]
     }
     if {[info exists _comp2dx($cname)]} {
@@ -327 +316 @@
     }
     if { [info exists _comp2vtk($cname)] } {
-        return ""
-    }
-    if { [info exists _comp2vtkvolume($cname)] } {
-        return $_comp2vtkvolume($cname)
-    }
-    if { [info exists _comp2vtkcontour($cname)] } {
-        return $_comp2vtkcontour($cname)
-    }
-    if { [info exists _comp2vtkstreamlines($cname)] } {
-        # Return the contents of the vtk file.
-        return $_comp2vtkstreamlines($cname)
+        error "blob not implemented for VTK file data"
     }
     if {[info exists _comp2dx($cname)]} {
@@ -420 +399 @@
                     foreach {axisMin axisMax} $limits break
                     set axis v
-                } elseif {[info exists _comp2vtk($cname)]} {
-                    foreach {xv yv} $_comp2vtk($cname) break
-                    switch -- $which {
-                        x - xlin - xlog {
-                            foreach {axisMin axisMax} [$xv limits x] break
-                            set axis x
-                        }
-                        y - ylin - ylog {
-                            foreach {axisMin axisMax} [$xv limits y] break
-                            set axis y
-                        }
-                        z - zlin - zlog {
-                            foreach {axisMin axisMax} [$xv limits z] break
-                            set axis z
-                        }
-                        v - vlin - vlog {
-                            catch {unset style}
-                            array set style $_comp2style($cname)
-                            if {[info exists style(-min)] && 
-                                [info exists style(-max)]} {
-                                # This component has its own hard-coded
-                                # min/max range.  Ignore it for overall limits.
-                                set axisMin $min
-                                set axisMax $max
-                            } else {
-                                foreach {axisMin axisMax} [$yv GetRange] break
-                            }
-                            set axis v
-                        }
-                        default {
-                            error "bad option \"$which\": should be x, xlin, xlog, y, ylin, ylog, v, vlin, vlog"
-                        }
-                    }
-                } elseif {[info exists _comp2heightmap($cname)]} {
-                    foreach {mesh vector} $_comp2heightmap($cname) break
+                } elseif {[info exists _comp2mesh($cname)]} {
+                    foreach {mesh vector} $_comp2mesh($cname) break
                     switch -- $which {
                         x - xlin - xlog {
@@ -608 +554 @@
             set value [lindex $args 1]
             $_xmlobj put $path.current $value
-            _build
+            Build
         }
         default {
@@ -680 +626 @@
 
 # ----------------------------------------------------------------------
-# USAGE: _build
+# USAGE: Build
 #
 # Used internally to build up the vector representation for the
@@ -687 +633 @@
 # from scratch.
 # ----------------------------------------------------------------------
-itcl::body Rappture::Field::_build {} {
+itcl::body Rappture::Field::Build {} {
 
     # Discard any existing data
@@ -693 +639 @@
         eval blt::vector destroy $_comp2xy($name)
     }
-    foreach name [array names _comp2vtk] {
-        set mobj [lindex $_comp2vtk($name) 0]
-        set class [$mobj info class]
-        ${class}::release $mobj
-
-        set fobj [lindex $_comp2vtk($name) 1]
-        rename $fobj ""
-    }
+    array unset _comp2vtk
     foreach name [array names _comp2unirect2d] {
         eval itcl::delete object $_comp2unirect2d($name)
@@ -708 +647 @@
     }
     catch {unset _comp2xy}
-    catch {unset _comp2vtk}
     catch {unset _comp2dx}
     catch {unset _comp2dims}
     catch {unset _comp2style}
-    array unset _comp2volume
-    array unset _comp2vtkstreamlines
     array unset _comp2unirect2d
     array unset _comp2unirect3d
@@ -725 +661 @@
         set type ""
         if { ([$_field element $cname.constant] != "" &&
-            [$_field element $cname.domain] != "") ||
-            [$_field element $cname.xy] != ""} {
+              [$_field element $cname.domain] != "") ||
+              [$_field element $cname.xy] != "" } {
             set type "1D"
-        } elseif {[$_field element $cname.mesh] != "" &&
-            [$_field element $cname.values] != ""} {
+        } elseif { [$_field element $cname.mesh] != "" &&
+                   [$_field element $cname.values] != ""} {
             set type "points-on-mesh"
-        } elseif {[$_field element $cname.vtk] != ""} {
-            set _isVtkData($cname) 1
-            set view [$_field get "about.view"]
-            switch -- $view {
-                "streamlines" {
-                    set type "vtkstreamlines"
-                }
-                "contour" - "heightmap" {
-                    set type "vtkcontour"
-                }
-                default {
-                    set type "vtk"
-                }
-            }
+        } elseif { [$_field element $cname.vtk] != ""} {
+            set viewer [$_field get "about.view"]
+            set type "vtk"
+            if { $viewer != "" } {
+                set _viewer $viewer
+            }
         } elseif {[$_field element $cname.opendx] != ""} {
             global env
@@ -769 +697 @@
         }
         set _comp2extents($cname) $extents
-puts stderr "type=$type"
         set _type $type
         if {$type == "1D"} {
@@ -823 +750 @@
             BuildPointsOnMesh $cname 
         } elseif {$type == "vtk"} {
-            #
-            # Extract native vtk data from the XML and use a reader
-            # to load it.
-            #
-            error "not implemented"
-        } elseif {$type == "vtkstreamlines"} {
-            set _comp2dims($cname) "3D"
-            # Allow redirects to another element.
             set vtkdata [$_field get $cname.vtk]
-            set _comp2vtkstreamlines($cname) $vtkdata
-            set _comp2style($cname) [$_field get $cname.style]
-            incr _counter
-        } elseif {$type == "vtkcontour"} {
-            set _comp2dims($cname) "2D"
-            # Allow redirects to another element.
-
-            set data [$_field get $cname.vtk]
-            ReadVtkDataSet $cname $data
-            set _comp2vtkcontour($cname) $data
-            set _comp2style($cname) [$_field get $cname.style]
-            incr _counter
-        } elseif {$type == "vtkvolume"} {
-            set _comp2dims($cname) "3D"
-            # Allow redirects to another element.
-            set data [$_field get -decode no $cname.dx]
-            set data [Rappture::encoding::decode -as zb64 $data]
-            if 1 {
-            set file "/tmp/$cname.dx"
-            set f [open $file "w"]
-            puts $f $data
-            close $f
-            }
-            set data [Rappture::ConvertDxToVtk $data]
-            if 1 {
-            set file "/tmp/$cname.vtk"
-            set f [open $file "w"]
-            puts $f $data
-            close $f
-            }
-            set _comp2vtkvolume($cname) $data
-            set _comp2style($cname) [$_field get $cname.style]
-            incr _counter
-        } elseif {$type == "vtkstreamlines2"} {
-            set _comp2dims($cname) "3D"
-            set _comp2vtkstreamlines($cname) [$_field get $cname.vtk]
+            ReadVtkDataSet $cname $vtkdata
+            set _comp2vtk($cname) $vtkdata
             set _comp2style($cname) [$_field get $cname.style]
             incr _counter
@@ -876 +761 @@
             # off to the NanoVis visualizer.
             #
+            set _viewer "nanovis"
             set _comp2dims($cname) "3D"
             set _comp2dx($cname)  [$_field get -decode no $cname.dx]
@@ -902 +788 @@
             # off to the NanoVis visualizer.
             #
+            set _viewer "nanovis"
             set _comp2dims($cname) "3D"
             set data [$_field get -decode yes $cname.opendx]
@@ -912 +799 @@
                     [Rapture::FlowHints ::\#auto $_field $cname $_units]
             }
+            incr _counter
+        } elseif {[$_field element $cname.ucd] != ""} {
+            set _viewer "isosurface"
+            set _comp2dims($cname) "3D"
+            set contents [$_field get $cname.ucd]
+            set vtkdata [AvsToVtk $cname $contents]
+            ReadVtkDataSet $cname $vtkdata
+            set _comp2vtk($cname) $vtkdata
+            set _comp2style($cname) [$_field get $cname.style]
             incr _counter
         }
@@ -1071 +967 @@
             [$ds GetPointData] SetScalars $val
         }
-        "vtkcontour" {
+        "contour" {
             return [$dataobj blob $cname]
         }
@@ -1079 +975 @@
         default {
             set mesh [$dataobj mesh $cname]
-puts stderr "dataobj=$dataobj, mesh=$mesh"
             switch -- [$mesh GetClassName] {
                 vtkPoints {
@@ -1160 +1055 @@
         incr _dim
     }
+    if { $_dim == 2 } {
+        set _viewer heightmap
+    } else {
+        set _viewer isosurface
+    }
+    set _comp2dims($cname) ${_dim}D
     lappend limits xmin $xmin xmax $xmax ymin $ymin ymax $ymax  
     set dataAttrs [$dataset GetPointData]
@@ -1204 +1105 @@
         set cname "component"
     }
-    if { [info exists _comp2vtkstreamlines($cname)] } {
-        return $_comp2vtkstreamlines($cname)
-    }
-    if { [info exists _comp2vtkvolume($cname)] } {
-        return $_comp2vtkvolume($cname)
-    }
+    # DX: Convert DX to VTK 
     if {[info exists _comp2dx($cname)]} {
-        return $_comp2dx($cname)
-    }
+        return [Rappture::ConvertDxToVtk $_comp2dx($cname)]
+    }
+    # Unirect3d: isosurface 
     if {[info exists _comp2unirect3d($cname)]} {
-        return [$_comp2unirect3d($cname) blob]
-    }
-    if { [info exists _comp2vtkcontour($cname)] && $_dim == 2 } {
-        return $_comp2vtkcontour($cname)
-    }
+        return [$_comp2unirect3d($cname) vtkdata]
+    }
+    # VTK file data: 
     if { [info exists _comp2vtk($cname)] } {
         return $_comp2vtk($cname)
     }
-    if { [info exists _comp2heightmap($cname)] } {
+    # Points on mesh:  Construct VTK file output.
+    if { [info exists _comp2mesh($cname)] } {
+        # Data is in the form mesh and vector
+        foreach {mesh vector} $_comp2mesh($cname) break
         set label [hints zlabel] 
         if { $label == "" } {
@@ -1229 +1127 @@
             regsub -all { } $label {_} label
         }
-        foreach {mesh vector} $_comp2heightmap($cname) break
         append out "# vtk DataFile Version 3.0\n"
         append out "[hints label]\n"
@@ -1239 +1136 @@
         return $out
     }
-    if { [info exists _comp2isosurface($cname)] } {
-        set label [hints zlabel] 
-        if { $label == "" } {
-            set label $cname
-        } else {
-            regsub -all { } $label {_} label
-        }
-        foreach {mesh vector} $_comp2isosurface($cname) break
-        append out "# vtk DataFile Version 3.0\n"
-        append out "[hints label]\n"
-        append out "ASCII\n"
-        append out [$mesh vtkdata]
-        append out "SCALARS $label float\n"
-        append out "LOOKUP_TABLE default\n"
-        append out "[$vector range 0 end]\n"
-        return $out
-    }
     error "can't find vtkdata for $cname. This method should only be called by the vtkheightmap widget"
 }
@@ -1262 +1142 @@
     #
     # More complex 2D/3D data is represented by a mesh
-    # object and an associated vtkFloatArray for field
-    # values.
+    # object and an associated vector for field values.
     #
     set path [$_field get $cname.mesh]
@@ -1274 +1153 @@
     lappend _fieldLabels $cname
     lappend _fieldUnits ""
+
     # Handle bizarre cases that hopefully will be deprecated.
     if { $element == "unirect3d" } {
@@ -1282 +1162 @@
         }
         set _dim 3
+        set _viewer flowvis
         set _comp2dims($cname) "3D"
         set _comp2unirect3d($cname) \
@@ -1300 +1181 @@
         }
         set _dim 2
+        set _viewer "flowvis"
         set _comp2dims($cname) "2D"
         set _comp2unirect2d($cname) \
@@ -1310 +1192 @@
         return
     }
+    set _viewer "contour"
     switch -- $element {
         "cloud" {
@@ -1319 +1202 @@
         "unirect2d" {
             set mesh [Rappture::Unirect2d::fetch $_xmlobj $path]
-            set _viewer "vtkheightmap"
+            set _viewer "heightmap"
         }
     }
     set _dim [$mesh dimensions]
- puts stderr "mesh=$mesh dim=[$mesh dimensions]"
     if {$_dim == 1} {
         # Is this used anywhere?
@@ -1342 +1224 @@
         incr _counter
         return
+    } elseif {$_dim == 2} {
+        set _type "heightmap"
+        set vector [blt::vector create \#auto]
+        $vector set [$_field get $cname.values]
+        set _comp2dims($cname) "[$mesh dimensions]D"
+        set _comp2mesh($cname) [list $mesh $vector]
+        set _comp2style($cname) [$_field get $cname.style]
+        incr _counter
+        set label [hints zlabel]
+        if { $label != "" } {
+            set _fieldNames $label
+            regsub -all { } $_fieldNames {_} _fieldNames
+            set _fieldLabels $label
+        }
+        set units [hints zunits]
+        if { $units != "" } {
+            set _fieldUnits $units
+        }
+        return
     } elseif {$_dim == 3} {
         #
@@ -1355 +1256 @@
             $farray InsertNextValue $v
         }
-        set _viewer "vtkisosurface"
-        set _type "vtkisosurface"
+        set _viewer "isosurface"
+        set _type "isosurface"
         set vector [blt::vector create \#auto]
         $vector set [$_field get $cname.values]
         set _comp2dims($cname) "[$mesh dimensions]D"
-        set _comp2isosurface($cname) [list $mesh $vector]
+        set _comp2mesh($cname) [list $mesh $vector]
         set _comp2style($cname) [$_field get $cname.style]
         incr _counter
@@ -1374 +1275 @@
         }
         return
-    } elseif {$_dim == 2} {
-        set _type "vtkheightmap"
-        set vector [blt::vector create \#auto]
-        $vector set [$_field get $cname.values]
-        set _comp2dims($cname) "[$mesh dimensions]D"
-        set _comp2heightmap($cname) [list $mesh $vector]
-        set _comp2style($cname) [$_field get $cname.style]
-        incr _counter
-        set label [hints zlabel]
-        if { $label != "" } {
-            set _fieldNames $label
-            regsub -all { } $_fieldNames {_} _fieldNames
-            set _fieldLabels $label
-        }
-        set units [hints zunits]
-        if { $units != "" } {
-            set _fieldUnits $units
-        }
-        return
     }
     error "unhandled case in field"
 }
+
+itcl::body Rappture::Field::AvsToVtk { comp contents } {
+    package require vtk
+
+    set reader $this-datasetreader
+    vtkAVSucdReader $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 Update
+    file delete $tmpfile
+
+    set output [$reader GetOutput]
+    set pointData [$output GetPointData]
+    set _scalars {}
+    for { set i 0 } { $i < [$pointData GetNumberOfArrays] } { incr i } {
+        set name [$pointData GetArrayName $i]
+        lappend _scalars $name $name "???"
+    }
+    set writer $this-datasetwriter
+    vtkDataSetWriter $writer
+    $writer SetInputConnection [$reader GetOutputPort]
+    $writer SetFileName $tmpfile
+    $writer Write
+    rename $reader ""
+    rename $writer ""
+    set f [open "$tmpfile" "r"]
+    fconfigure $f -translation binary -encoding binary
+    set vtkdata [read $f]
+    file delete $tmpfile
+    close $f
+    return $vtkdata
+}

branches/Rappture 1.2/gui/scripts/field2dresult.tcl

@@ -31 +31 @@
     itk_option define -mode mode Mode "auto"
 
-    constructor {args} { # defined below }
-    destructor { # defined below }
+    constructor {args} { 
+        # defined below 
+    }
+    destructor { 
+        # defined below 
+    }
 
     public method add {dataobj {settings ""}}
@@ -39 +43 @@
     public method scale {args}
     public method snap {w h}
-    public method parameters {title args} { # do nothing }
+    public method parameters {title args} { 
+        # do nothing 
+    }
     public method download {option args}
 }
@@ -57 +63 @@
     array set flags $args
     set servers ""
+ puts stderr "field2d mode=$flags(-mode)"
     switch -- $flags(-mode) {
-        "auto" - "heightmap" - "flowvis" {
+        "flowvis" {
             set servers [Rappture::VisViewer::GetServerList "nanovis"]
         }
-        "vtkcontour" - "vtkheightmap" - "vtkstreamlines" - "vtkviewer" {
+        "auto" - "contour" - "heightmap" - "streamlines" - "vtkviewer" {
             set servers [Rappture::VisViewer::GetServerList "vtkvis"]
         }
@@ -73 +80 @@
     if {"" != $servers && $flags(-mode) != "vtk"} {
         switch -- $flags(-mode) {
-            "auto" - "heightmap" {
+            "heightmap" {
                 itk_component add renderer {
-                    Rappture::HeightmapViewer $itk_interior.ren $servers 
+                    Rappture::VtkHeightmapViewer $itk_interior.heightmap \
+                        $servers -mode heightmap
                 }
             }
             "flowvis" {
                 itk_component add renderer {
-                    Rappture::FlowvisViewer $itk_interior.ren $servers
+                    Rappture::FlowvisViewer $itk_interior.flow $servers
                 }
             }
-            "vtkcontour" {
+            "contour" {
                 itk_component add renderer {
-                    Rappture::VtkHeightmapViewer $itk_interior.ren $servers \
-                        -mode $flags(-mode)
+                    Rappture::VtkHeightmapViewer $itk_interior.contour \
+                        $servers -mode contour
                 }
             }
-            "vtkheightmap" {
+            "streamlines" {
                 itk_component add renderer {
-                    Rappture::VtkHeightmapViewer $itk_interior.ren $servers \
-                        -mode $flags(-mode)
-                }
-            }
-            "vtkstreamlines" {
-                itk_component add renderer {
-                    Rappture::VtkStreamlinesViewer $itk_interior.ren $servers
+                    Rappture::VtkStreamlinesViewer $itk_interior.streamlines \
+                        $servers
                 }
             }
             "vtkviewer" {
                 itk_component add renderer {
-                    Rappture::VtkViewer $itk_interior.ren $servers 
+                    Rappture::VtkViewer $itk_interior.viewer $servers 
                 }
             }
@@ -115 +118 @@
         }
     }
-
     if {![info exists itk_component(renderer)]} {
         itk_component add renderer {
-            Rappture::ContourResult $itk_interior.ren
+            Rappture::ContourResult $itk_interior.oldcontour
         }
         pack $itk_component(renderer) -expand yes -fill both
     }
     eval itk_initialize $args
+    update
 }
 

branches/Rappture 1.2/gui/scripts/field3dresult.tcl

@@ -54 +54 @@
         -mode auto
     }
-    array set flags $args
-    switch -- $flags(-mode) {
+    array set flags $args 
+ puts stderr "field3d mode=$flags(-mode)"
+   switch -- $flags(-mode) {
         "auto" - "nanovis" - "flowvis" {
             set servers [Rappture::VisViewer::GetServerList "nanovis"]
         }
-        "vtkisosurface" - "vtkheightmap" - "vtkstreamlines" - "vtkviewer" - "vtkvolume" {
+        "isosurface" - "heightmap" - "streamlines" - "vtkviewer" - "vtkvolume" {
             set servers [Rappture::VisViewer::GetServerList "vtkvis"]
         }
@@ -70 +71 @@
         }
     }
+    puts stderr "field3d: servers=$servers flags(-mode)=$flags(-mode)"
     if {"" != $servers && $flags(-mode) != "vtk"} {
         switch -- $flags(-mode) {
@@ -82 +84 @@
                 }
             }
-            "vtkcontour" - "vtkheightmap" {
+            "contour" - "heightmap" {
                 itk_component add renderer {
                     Rappture::VtkHeightmapViewer $itk_interior.ren $servers
                 }
             }
-            "vtkisosurface" {
+            "isosurface" {
                 itk_component add renderer {
                     Rappture::VtkIsosurfaceViewer $itk_interior.ren $servers
                 }
             }
-            "vtkstreamlines" {
+            "streamlines" {
                 itk_component add renderer {
                     Rappture::VtkStreamlinesViewer $itk_interior.ren $servers

branches/Rappture 1.2/gui/scripts/mesh.tcl

@@ -180 +180 @@
     foreach cname [$_mesh children] {
         foreach type { vtk cloud grid triangles cells } {
-            if { [$_mesh element $type] != "" } {
+            if { $cname == $type } {
                 incr subcount
                 break
@@ -189 +189 @@
     foreach cname [$_mesh children] {
         foreach type { node element } {
-            if { [$_mesh element $type] != "" } {
+            if { $cname == $type } {
                 incr elemcount
                 break
@@ -1082 +1082 @@
     set type "nodeselements"
     # create the vtk objects containing points and connectivity
-    set _dim 2 
-    #
-    # Extract each node and add it to the points list.
-    #
+    set _dim 3
     set points {}
     set count 0
+    # Scan for nodes.  Each node represents a vertex.
     foreach comp [$xmlobj children -type node $path] {
         set xyz [$xmlobj get $path.$comp]
@@ -1099 +1097 @@
         foreach {x y z} $xyz break
         foreach dim {x y z} units $_units {
-            set v [Rappture::Units::convert [set $dim] \
+         set v [Rappture::Units::convert [set $dim] \
                 -context $units -to $units -units off]
 
@@ -1127 +1125 @@
     }
     set count 0
+    set numCells 0
     set celltypes {}
     set data {}
+    # Next scan for elements.  Each element represents a cell.
     foreach comp [$xmlobj children -type element $path] {
         set nlist [$_mesh get $comp.nodes]
@@ -1138 +1138 @@
         append celltypes "  $celltype\n"
         append data "  $numNodes $nlist\n"
+        incr numCells
+        incr count $numNodes 
         incr count
     }
@@ -1143 +1145 @@
     append out "POINTS $_numPoints float\n"
     append out $points
-    append out "CELLS $count [expr $count * 4]\n"
+    append out "CELLS $numCells $count\n"
     append out $data
-    append out "CELL_TYPES $count\n"
+    append out "CELL_TYPES $numCells\n"
     append out $celltypes
     append out "\n"
     append out "POINT_DATA $_numPoints\n"
-    foreach axis {x y} {
+    foreach axis {x y z} {
         if { [info exists ${axis}Min] } {
             set _limits(${axis}min) [set ${axis}Min]

branches/Rappture 1.2/gui/scripts/resultviewer.tcl

@@ -284 +284 @@
         ::Rappture::Field {
             set dims [lindex [lsort [$dataobj components -dimensions]] end]
+            puts stderr "dims=$dims dataobj=$dataobj"
             switch -- $dims {
                 1D {
@@ -296 +297 @@
                     set mode "heightmap"
                     if {![info exists _mode2widget($mode)]} {
-                        set resultMode [$dataobj viewer]
+                        set viewer [$dataobj viewer]
                         set extents [$dataobj extents]
                         if { $extents > 1 } {
-                            set resultMode "flowvis"
+                            set viewer "flowvis"
                         }
-                        set w $itk_interior.heightmap
+                        set w $itk_interior.field2d
                         if { ![winfo exists $w] } {
-                            Rappture::Field2DResult $w -mode $resultMode
-                        }
-                        set _mode2widget($mode) $w
+                            Rappture::Field2DResult $w -mode $viewer
+                        }
+                        set _mode2widget($mode) $w
                     }
                 }
@@ -311 +312 @@
                     set mode "field3D"
                     if {![info exists _mode2widget($mode)]} {
-                        switch -- [$dataobj type] {
-                            "vtk" {
-                                set fmt "vtk"
-                            }
-                            "points-on-mesh" {
-                                set mesh [$dataobj mesh]
-                                set fmt [expr {("" != $mesh) ? "vtk" : "nanovis"}]
-                                set extents [$dataobj extents]
-                                if { $extents > 1 } {
-                                    set fmt "flowvis"
-                                }
-                            }
-                            "opendx" - "dx" {
-                                set fmt "nanovis"
-                                set extents [$dataobj extents]
-                                if { $extents > 1 } {
-                                    set fmt "flowvis"
-                                }
-                            }
-                            "vtkvolume" {
-                                set fmt "vtkvolume"
-                            }
-                            "vtkstreamlines" {
-                                set fmt "vtkstreamlines"
-                            }
-                            "vtkisosurface" {
-                                set fmt "vtkisosurface"
-                            }
-                        }
-                        set w $itk_interior.field3D
+                        set fmt [$dataobj viewer] 
+                        set w $itk_interior.field3d
                         Rappture::Field3DResult $w -mode $fmt
                         set _mode2widget($mode) $w

branches/Rappture 1.2/gui/scripts/vtkheightmapviewer.tcl

@@ -37 +37 @@
     itk_option define -plotforeground plotForeground Foreground ""
     itk_option define -plotbackground plotBackground Background ""
-    itk_option define -mode mode Mode "vtkcontour"
+    itk_option define -mode mode Mode "contour"
 
     constructor { hostlist args } {
@@ -214 +214 @@
 
     array set _settings [subst {
-        debug-console           0
-        axis-labels             1
+        axisLabels              1
         axis-visible            1
         axis-xgrid              0
@@ -225 +224 @@
         axis-minticks           1
         axis-flymode            "static"
-        contour-edges           0
-        contour-field           "Default"
-        contour-isolines        10
-        heightmap-lighting      1
-        heightmap-outline       0
+        edges                   0
+        field                   "Default"
+        isolines                10
+        lighting                1
+        outline                 0
         contour-opacity         100
         colormap-visible         1
         isolines-visible         1
-        contour-wireframe       0
-        heightmap-mode          0
+        wireframe               0
+        isHeightmap             0
         heightmap-scale         50
-        legend-visible          1
-        stretch-to-fit          0
+        legendVisible           1
+        stretchToFit            0
         x-scale                 1.0
         y-scale                 1.0
@@ -320 +319 @@
             -onimage [Rappture::icon surface] \
             -offimage [Rappture::icon surface] \
-            -variable [itcl::scope _settings(heightmap-mode)] \
-            -command [itcl::code $this AdjustSetting heightmap-mode] \
+            -variable [itcl::scope _settings(isHeightmap)] \
+            -command [itcl::code $this AdjustSetting isHeightmap] \
     }
     Rappture::Tooltip::for $itk_component(mode) \
@@ -915 +914 @@
         $_arcball resize $w $h
         DoResize
-        if { $_settings(stretch-to-fit) } {
-            Adjustsetting stretch-to-fit
+        if { $_settings(stretchToFit) } {
+            Adjustsetting stretchToFit
         }
     }
     if { $_reset } {
-        InitSettings heightmap-mode background
+        InitSettings isHeightmap background
         #
         # Reset the camera and other view parameters
@@ -928 +927 @@
         set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
         $_arcball quaternion $q 
-        if {$_settings(heightmap-mode) } {
-            SendCmd "camera reset all"
+        if {$_settings(isHeightmap) } {
+            SendCmd "camera reset"
             if { $_view(ortho)} {
                 SendCmd "camera mode ortho"
@@ -1022 +1021 @@
         $itk_component(field) value $_currentFieldName
     }
-    InitSettings stretch-to-fit
+    InitSettings stretchToFit
 
     if { $_reset } {
@@ -1058 +1057 @@
         set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
         $_arcball quaternion $q 
-        if {$_settings(heightmap-mode) } {
-            SendCmd "camera reset all"
+        if {$_settings(isHeightmap) } {
+            SendCmd "camera reset"
             if { $_view(ortho)} {
                 SendCmd "camera mode ortho"
@@ -1069 +1068 @@
         PanCamera
         InitSettings axis-xgrid axis-ygrid axis-zgrid \
-            axis-visible axis-labels 
+            axis-visible axisLabels 
         InitSettings contour-opacity \
-            heightmap-scale heightmap-lighting \
-            contour-colormap contour-field heightmap-outline \
-            contour-edges contour-opacity contour-wireframe 
+            heightmap-scale lighting \
+            colormap field outline \
+            edges contour-opacity wireframe 
         set _reset 0
     }
@@ -1328 +1327 @@
             }
         }
-        "contour-wireframe" {
-            set bool $_settings(contour-wireframe)
+        "wireframe" {
+            set bool $_settings(wireframe)
             foreach dataset [CurrentDatasets -all] {
                 SendCmd "heightmap wireframe $bool $dataset"
@@ -1346 +1345 @@
             }
         }
-        "heightmap-lighting" {
-            if { $_settings(heightmap-mode) } {
-                set bool $_settings(heightmap-lighting)
+        "lighting" {
+            if { $_settings(isHeightmap) } {
+                set bool $_settings(lighting)
                 SendCmd "heightmap lighting $bool"
             } else {
@@ -1354 +1353 @@
             }
         }
-        "contour-edges" {
-            set bool $_settings(contour-edges)
+        "edges" {
+            set bool $_settings(edges)
             foreach dataset [CurrentDatasets -all] {
                 SendCmd "heightmap edges $bool $dataset"
@@ -1364 +1363 @@
             SendCmd "axis visible all $bool"
         }
-        "axis-labels" {
-            set bool $_settings(axis-labels)
+        "axisLabels" {
+            set bool $_settings(axisLabels)
             SendCmd "axis labels all $bool"
         }
@@ -1385 +1384 @@
             }
         }
-        "contour-isolines" {
+        "isolines" {
             set n $_settings($what)
             EventuallyContour $n
@@ -1429 +1428 @@
             DrawLegend $_currentFieldName
         }
-        "contour-colormap" {
+        "colormap" {
             set color [$itk_component(colormap) value]
-            set _settings(contour-colormap) $color
+            set _settings(colormap) $color
             if { $color == "none" } {
                 if { $_settings(colormap-visible) } {
@@ -1455 +1454 @@
         }
         "heightmap-scale" {
-            if { $_settings(heightmap-mode) } {
+            if { $_settings(isHeightmap) } {
                 set scale [GetHeightmapScale]
                 foreach dataset [CurrentDatasets -all] {
@@ -1464 +1463 @@
             }
         }
-        "heightmap-lighting" {
-            if { $_settings(heightmap-mode) } {
-                set bool $_settings(heightmap-lighting)
+        "lighting" {
+            if { $_settings(isHeightmap) } {
+                set bool $_settings(lighting)
                 SendCmd "heightmap lighting $bool"
             } else {
@@ -1472 +1471 @@
             }
         }
-        "contour-field" {
-            set new [$itk_component(field) value]
+        "field" {
+            set new   [$itk_component(field) value]
             set value [$itk_component(field) translate $new]
-            set _settings(contour-field) $value
+            set _settings(field) $value
             if { [info exists _fields($new)] } {
                 set _colorMode scalar
@@ -1485 +1484 @@
             EventuallyRequestLegend
         }
-        "stretch-to-fit" {
-            set bool $_settings(stretch-to-fit)
+        "stretchToFit" {
+            set bool $_settings(stretchToFit)
             set _settings(x-scale) 1.0
             set _settings(y-scale) 1.0
@@ -1513 +1512 @@
             }
         }
-        "heightmap-outline" {
-            set bool $_settings(heightmap-outline)
+        "outline" {
+            set bool $_settings(outline)
             SendCmd "dataset outline $bool"
         }
-        "heightmap-mode" {
-            set bool $_settings(heightmap-mode)
+        "isHeightmap" {
+            set bool $_settings(isHeightmap)
             if { $bool } {
                 $itk_component(lighting) configure -state normal
@@ -1525 +1524 @@
             }
             if {[isconnected]} {
-                set _settings(heightmap-lighting) $bool
+                set _settings(lighting) $bool
                 # Fix heightmap scale: 0 for contours, 1 for heightmaps.
                 if { $bool } {
@@ -1538 +1537 @@
                     set _comp2scale($dataset) $scale
                 }
-                if {$_settings(stretch-to-fit)} {
+                if {$_settings(stretchToFit)} {
                     if {$scale == 0} {
                         SendCmd "camera aspect window"
@@ -1574 +1573 @@
             }
         }        
-        "legend-visible" {
-            if { !$_settings(legend-visible) } {
+        "legendVisible" {
+            if { !$_settings(legendVisible) } {
                 $itk_component(view) delete legend
             }
@@ -1908 +1907 @@
 itcl::configbody Rappture::VtkHeightmapViewer::mode {
     switch -- $itk_option(-mode) {
-        "vtkheightmap" {
-            set _settings(heightmap-mode) 1
+        "heightmap" {
+            set _settings(isHeightmap) 1
         }
-        "vtkcontour" {
-            set _settings(heightmap-mode) 0
+        "contour" {
+            set _settings(isHeightmap) 0
         } 
         default {
@@ -1918 +1917 @@
         }
     }
-    AdjustSetting heightmap-mode
+    AdjustSetting isHeightmap
 }
 
@@ -1959 +1958 @@
     checkbutton $inner.legend \
         -text "Legend" \
-        -variable [itcl::scope _settings(legend-visible)] \
-        -command [itcl::code $this AdjustSetting legend-visible] \
+        -variable [itcl::scope _settings(legendVisible)] \
+        -command [itcl::code $this AdjustSetting legendVisible] \
         -font "Arial 9"
 
     checkbutton $inner.wireframe \
         -text "Wireframe" \
-        -variable [itcl::scope _settings(contour-wireframe)] \
-        -command [itcl::code $this AdjustSetting contour-wireframe] \
+        -variable [itcl::scope _settings(wireframe)] \
+        -command [itcl::code $this AdjustSetting wireframe] \
         -font "Arial 9"
 
@@ -1972 +1971 @@
         checkbutton $inner.lighting \
             -text "Enable Lighting" \
-            -variable [itcl::scope _settings(heightmap-lighting)] \
-            -command [itcl::code $this AdjustSetting heightmap-lighting] \
+            -variable [itcl::scope _settings(lighting)] \
+            -command [itcl::code $this AdjustSetting lighting] \
             -font "Arial 9"
+    } {
+        ignore -font
     }
 
     checkbutton $inner.edges \
         -text "Edges" \
-        -variable [itcl::scope _settings(contour-edges)] \
-        -command [itcl::code $this AdjustSetting contour-edges] \
+        -variable [itcl::scope _settings(edges)] \
+        -command [itcl::code $this AdjustSetting edges] \
         -font "Arial 9"
 
     checkbutton $inner.outline \
         -text "Outline" \
-        -variable [itcl::scope _settings(heightmap-outline)] \
-        -command [itcl::code $this AdjustSetting heightmap-outline] \
+        -variable [itcl::scope _settings(outline)] \
+        -command [itcl::code $this AdjustSetting outline] \
         -font "Arial 9"
 
     checkbutton $inner.stretch \
         -text "Stretch to fit" \
-        -variable [itcl::scope _settings(stretch-to-fit)] \
-        -command [itcl::code $this AdjustSetting stretch-to-fit] \
+        -variable [itcl::scope _settings(stretchToFit)] \
+        -command [itcl::code $this AdjustSetting stretchToFit] \
         -font "Arial 9"
 
@@ -2000 +2001 @@
     }
     bind $inner.field <<Value>> \
-        [itcl::code $this AdjustSetting contour-field]
+        [itcl::code $this AdjustSetting field]
 
     label $inner.colormap_l -text "Colormap" -font "Arial 9" 
@@ -2027 +2028 @@
     $itk_component(colormap) value "BCGYR"
     bind $inner.colormap <<Value>> \
-        [itcl::code $this AdjustSetting contour-colormap]
+        [itcl::code $this AdjustSetting colormap]
 
     label $inner.isolinecolor_l -text "Isolines" -font "Arial 9" 
@@ -2120 +2121 @@
     checkbutton $inner.labels \
         -text "Axis Labels" \
-        -variable [itcl::scope _settings(axis-labels)] \
-        -command [itcl::code $this AdjustSetting axis-labels] \
+        -variable [itcl::scope _settings(axisLabels)] \
+        -command [itcl::code $this AdjustSetting axisLabels] \
         -font "Arial 9"
     label $inner.grid_l -text "Grid" -font "Arial 9" 
@@ -2280 +2281 @@
     radiobutton $inner.vtk_button -text "VTK data file" \
         -variable [itcl::scope _downloadPopup(format)] \
-        -font "Helvetica 9 " \
+        -font "Arial 9 " \
         -value vtk  
     Rappture::Tooltip::for $inner.vtk_button "Save as VTK data file."
     radiobutton $inner.image_button -text "Image File" \
         -variable [itcl::scope _downloadPopup(format)] \
+        -font "Arial 9 " \
         -value image 
     Rappture::Tooltip::for $inner.image_button \
@@ -2339 +2341 @@
     SendCmd "heightmap add numcontours $_numContours $scale $tag"
     set _comp2scale($tag) $_settings(heightmap-scale)
-    SendCmd "heightmap edges $_settings(contour-edges) $tag"
-    SendCmd "heightmap wireframe $_settings(contour-wireframe) $tag"
+    SendCmd "heightmap edges $_settings(edges) $tag"
+    SendCmd "heightmap wireframe $_settings(wireframe) $tag"
     SendCmd "heightmap colormap $_currentColormap $tag"
 }
@@ -2402 +2404 @@
     }
     set x [expr $w - 2]
-    if { !$_settings(legend-visible) } {
+    if { !$_settings(legendVisible) } {
         $c delete legend
         return
@@ -2636 +2638 @@
         invoke {
             $itk_component(field) value $_currentFieldName
-            AdjustSetting contour-field
+            AdjustSetting field
         }
         default {
@@ -2645 +2647 @@
 
 itcl::body Rappture::VtkHeightmapViewer::GetHeightmapScale {} {
-    if {  $_settings(heightmap-mode) } {
+    if {  $_settings(isHeightmap) } {
         set val $_settings(heightmap-scale)
         set sval [expr { $val >= 50 ? double($val)/50.0 : 1.0/(2.0-(double($val)/50.0)) }]

branches/Rappture 1.2/gui/scripts/vtkisosurfaceviewer.tcl

@@ -1 +1 @@
 
 # ----------------------------------------------------------------------
-#  COMPONENT: vtkcontour3dviewer - Vtk 3D contour object viewer
+#  COMPONENT: vtkisolinesviewer - Vtk 3D contour object viewer
 #
 #  It connects to the Vtk server running on a rendering farm,
@@ -68 +68 @@
     protected method Disconnect {}
     protected method DoResize {}
-    protected method DoReseed {}
     protected method DoRotate {}
     protected method AdjustSetting {what {value ""}}
@@ -80 +79 @@
     protected method Rotate {option x y}
     protected method SendCmd {string}
-    protected method SendCmdNoSplash {string}
+    protected method SendCmdNoWait {string}
     protected method Zoom {option}
 
@@ -89 +88 @@
     private method BuildCutplaneTab {}
     private method BuildDownloadPopup { widget command } 
-    private method BuildVolumeTab {}
-    private method ConvertToVtkData { dataobj comp } 
+    private method BuildIsosurfaceTab {}
     private method DrawLegend { title }
     private method Combo { option }
     private method EnterLegend { x y } 
     private method EventuallyResize { w h } 
-    private method EventuallyReseed { numPoints } 
     private method EventuallyRotate { q } 
+    private method EventuallyRequestLegend {} 
     private method EventuallySetCutplane { axis args } 
     private method GetImage { args } 
@@ -105 +103 @@
     private method PanCamera {}
     private method RequestLegend {}
-    private method SetColormap { dataobj comp }
-    private method ChangeColormap { dataobj comp color }
     private method ColorsToColormap { color }
     private method SetLegendTip { x y }
     private method SetObjectStyle { dataobj comp } 
     private method Slice {option args} 
+    private method ResetColormap { color }
+    private method EnterIsoline { x y value } 
+    private method LeaveIsoline {}
+    private method SetIsolineTip { x y value }
+    private method SetCurrentColormap { stylelist }
 
     private variable _arcball ""
@@ -122 +123 @@
     private variable _colormaps    ;    # contains all the colormaps
                                    ;    # in the server.
+    # The name of the current colormap used.  The colormap is global to all
+    # heightmaps displayed.
+    private variable _currentColormap "" ;    
+
+
     private variable _dataset2style    ;# maps dataobj-component to transfunc
 
@@ -143 +149 @@
     private variable _height 0
     private variable _resizePending 0
-    private variable _reseedPending 0
     private variable _rotatePending 0
     private variable _cutplanePending 0
     private variable _legendPending 0
-    private variable _vectorFields 
-    private variable _scalarFields 
+    private variable _field      ""
+    private variable _colorMode "vmag"; #  Mode of colormap (vmag or scalar)
+    private variable _currentField ""
+    private variable _fieldNames {} 
     private variable _fields 
-    private variable _currentField ""
-    private variable _field      ""
-    private variable _colorMode "vmag";#  Mode of colormap (vmag or scalar)
+    private variable _currentFieldName "Default"
+    private variable _numContours 10
 }
 
@@ -175 +181 @@
     $_dispatcher dispatch $this !resize "[itcl::code $this DoResize]; list"
 
-    # Reseed event
-    $_dispatcher register !reseed
-    $_dispatcher dispatch $this !reseed "[itcl::code $this DoReseed]; list"
-
     # Rotate event
     $_dispatcher register !rotate
@@ -190 +192 @@
     $_dispatcher register !xcutplane
     $_dispatcher dispatch $this !xcutplane \
-        "[itcl::code $this AdjustSetting cutplane-xposition]; list"
+        "[itcl::code $this AdjustSetting cutplaneXPosition]; list"
 
     # Y-Cutplane event
     $_dispatcher register !ycutplane
     $_dispatcher dispatch $this !ycutplane \
-        "[itcl::code $this AdjustSetting cutplane-yposition]; list"
+        "[itcl::code $this AdjustSetting cutplaneYPosition]; list"
 
     # Z-Cutplane event
     $_dispatcher register !zcutplane
     $_dispatcher dispatch $this !zcutplane \
-        "[itcl::code $this AdjustSetting cutplane-zposition]; list"
+        "[itcl::code $this AdjustSetting cutplaneZPosition]; list"
 
     #
@@ -211 +213 @@
     # Initialize the view to some default parameters.
     array set _view {
-        qw              1
-        qx              0
-        qy              0
-        qz              0
+        qw      0.36
+        qx      0.25
+        qy      0.50
+        qz      0.70
         zoom            1.0 
         xpan            0
@@ -224 +226 @@
     $_arcball quaternion $q
 
-    set _limits(zmin) 0.0
-    set _limits(zmax) 1.0
-
     array set _settings [subst {
-        axis-labels             1
-        axis-visible            1
+        axisLabelsVisible             1
+        axesVisible            1
         axis-xcutplane          0
         axis-xgrid              0
@@ -239 +238 @@
         axis-zgrid              0
         axis-zposition          0
-        contour-edges           0
-        contour-outline         0
-        contour-lighting        1
-        contour-opacity         100
-        contour-visible         1
-        contour-wireframe       0
-        cutplane-edges          0
-        cutplane-lighting       1
-        cutplane-opacity        100
-        cutplane-visible        1
-        cutplane-wireframe      0
-        cutplane-xposition      50
-        cutplane-xvisible       0
-        cutplane-yposition      50
-        cutplane-yvisible       0
-        cutplane-zposition      50
-        cutplane-zvisible       0
-        legend-visible          1
+        colormapVisible         1
+        colormapPalette         BCGYR
+        isosurfaceEdges         0
+        isosurfaceOutline       0
+        isosurfaceLighting      1
+        isosurfaceOpacity       100
+        isosurfaceVisible       1
+        isosurfaceWireframe     0
+        cutplaneEdges           0
+        cutplaneLighting        1
+        cutplaneOpacity        100
+        cutplaneVisible        1
+        cutplaneWireframe      0
+        cutplaneXPosition      50
+        cutplaneXVisible       0
+        cutplaneYPosition      50
+        cutplaneYVisible       0
+        cutplaneZPosition      50
+        cutplaneZVisible       0
+        legendVisible          1
+        isolineColor           white
+        background             black
+        field                  "Default"
     }]
 
@@ -283 +287 @@
     bind $c <KeyPress-Down>  [list %W yview scroll -10 units]
     bind $c <Enter> "focus %W"
+    bind $c <Control-F1> [itcl::code $this ToggleConsole]
 
     # Fix the scrollregion in case we go off screen
@@ -334 +339 @@
             -onimage [Rappture::icon volume-on] \
             -offimage [Rappture::icon volume-off] \
-            -variable [itcl::scope _settings(contour-visible)] \
-            -command [itcl::code $this AdjustSetting contour-visible] 
+            -variable [itcl::scope _settings(isosurfaceVisible)] \
+            -command [itcl::code $this AdjustSetting isosurfaceVisible] 
     }
     $itk_component(contour) select
@@ -346 +351 @@
             -onimage [Rappture::icon cutbutton] \
             -offimage [Rappture::icon cutbutton] \
-            -variable [itcl::scope _settings(cutplane-visible)] \
-            -command [itcl::code $this AdjustSetting cutplane-visible] 
+            -variable [itcl::scope _settings(cutplaneVisible)] \
+            -command [itcl::code $this AdjustSetting cutplaneVisible] 
     }
     $itk_component(cutplane) select
@@ -356 +361 @@
 
     if { [catch {
-        BuildVolumeTab
+        BuildIsosurfaceTab
         BuildCutplaneTab
         BuildAxisTab
@@ -466 +471 @@
     set _start [clock clicks -milliseconds]
     SendCmd "screen size $_width $_height"
-    set _legendPending 1
 
     #SendCmd "imgflush"
@@ -473 +477 @@
     #SendCmd "camera reset"
     #SendCmd "camera zoom $_view(zoom)"
+    EventuallyRequestLegend
     set _resizePending 0
 }
@@ -480 +485 @@
     SendCmd "camera orient $q" 
     set _rotatePending 0
+}
+
+itcl::body Rappture::VtkIsosurfaceViewer::EventuallyRequestLegend {} {
+    if { !$_legendPending } {
+        set _legendPending 1
+        $_dispatcher event -idle !legend
+    }
 }
 
@@ -489 +501 @@
         set _resizePending 1
         $_dispatcher event -after 400 !resize
-    }
-}
-
-itcl::body Rappture::VtkIsosurfaceViewer::EventuallyReseed { numPoints } {
-    set _numSeeds $numPoints
-    if { !$_reseedPending } {
-        set _reseedPending 1
-        $_dispatcher event -after 600 !reseed
     }
 }
@@ -674 +678 @@
 # the user scans through data in the ResultSet viewer.
 # ----------------------------------------------------------------------
-itcl::body Rappture::VtkIsosurfaceViewer::scale {args} {
+itcl::body Rappture::VtkIsosurfaceViewer::scale { args } {
     array unset _limits
     foreach dataobj $args {
@@ -681 +685 @@
             continue
         }
-        array set bounds $string
-        if {![info exists _limits(xmin)] || $_limits(xmin) > $bounds(xmin)} {
-            set _limits(xmin) $bounds(xmin)
-        }
-        if {![info exists _limits(xmax)] || $_limits(xmax) < $bounds(xmax)} {
-            set _limits(xmax) $bounds(xmax)
-        }
-
-        if {![info exists _limits(ymin)] || $_limits(ymin) > $bounds(ymin)} {
-            set _limits(ymin) $bounds(ymin)
-        }
-        if {![info exists _limits(ymax)] || $_limits(ymax) < $bounds(ymax)} {
-            set _limits(ymax) $bounds(ymax)
-        }
-
-        if {![info exists _limits(zmin)] || $_limits(zmin) > $bounds(zmin)} {
-            set _limits(zmin) $bounds(zmin)
-        }
-        if {![info exists _limits(zmax)] || $_limits(zmax) < $bounds(zmax)} {
-            set _limits(zmax) $bounds(zmax)
-        }
+        array set lim $string
+        foreach axis { x y z v } {
+            set min ${axis}min
+            set max ${axis}max
+            if {![info exists _limits($min)] || $_limits($min) > $lim($min)} {
+                set _limits($min) $lim($min)
+            }
+            if {![info exists _limits($max)] || $_limits($max) < $lim($max)} {
+                set _limits($max) $lim($max)
+            }
+        }
     }
 }
@@ -719 +713 @@
         coming {
             if {[catch {
-                $_image(download) snap $itk_component(plotarea)
-            } errs ]} {
-                puts stderr "errs=$errs"
+                blt::winop snap $itk_component(plotarea) $_image(download)
+            }]} {
                 $_image(download) configure -width 1 -height 1
                 $_image(download) put #000000
@@ -811 +804 @@
     $_dispatcher cancel !rebuild
     $_dispatcher cancel !resize
-    $_dispatcher cancel !reseed
     $_dispatcher cancel !rotate
     $_dispatcher cancel !xcutplane
@@ -852 +844 @@
 
 #
-# SendCmdNoSplash
-#
-#       Send commands off to the rendering server.  This method
-#       doesn't initiate the slash screen. 
-#
-itcl::body Rappture::VtkIsosurfaceViewer::SendCmdNoSplash {string} {
+# SendCmdNoWait
+#
+#       Send commands off to the rendering server.  If we're currently
+#       sending data objects to the server, buffer the commands to be 
+#       sent later.
+#
+itcl::body Rappture::VtkIsosurfaceViewer::SendCmdNoWait {string} {
     if { $_buffering } {
         append _outbuf $string "\n"
@@ -900 +893 @@
         set _hardcopy($tag) $bytes
     }
-    if { $_legendPending } {
-        RequestLegend
-    }
+    EventuallyRequestLegend
 }
 
@@ -964 +955 @@
 
     set _buffering 1
-    set _legendPending 1
     # Turn on buffering of commands to the server.  We don't want to
     # be preempted by a server disconnect/reconnect (which automatically
@@ -985 +975 @@
     PanCamera
     set _first ""
-    InitSettings axis-xgrid axis-ygrid axis-zgrid axis-mode \
-        axis-visible axis-labels cutplane-visible \
-        cutplane-xposition cutplane-yposition cutplane-zposition \
-        cutplane-xvisible cutplane-yvisible cutplane-zvisible
+    InitSettings axis-xgrid axis-ygrid axis-zgrid axisMode \
+        axesVisible axisLabelsVisible cutplaneVisible \
+        cutplaneXPosition cutplaneYPosition cutplaneZPosition \
+        cutplaneXVisible cutplaneYVisible cutplaneZVisible
 
     SendCmd "imgflush"
 
-    set _limits(zmin) ""
-    set _limits(zmax) ""
     set _first ""
     foreach dataobj [get -objects] {
@@ -1004 +992 @@
             if { ![info exists _datasets($tag)] } {
                 set bytes [$dataobj vtkdata $comp]
-puts stderr bytes=$bytes
                 set length [string length $bytes]
                 append _outbuf "dataset add $tag data follows $length\n"
@@ -1021 +1008 @@
         }
     }
-    if {"" != $_first} {
-        set location [$_first hints camera]
-        if { $location != "" } {
-            array set view $location
-        }
-
-        if 0 {
+    if { $_first != "" && $_reset } {
+        if 1 {
             # Tell the server the name of the tool, the version, and dataset
             # that we are rendering.  Have to do it here because we don't know
@@ -1035 +1017 @@
             lappend args version [$_first hints toolRevision]
             lappend args dataset [$_first hints label]
-            SendCmd "clientinfo $args"
-        }
-
-        foreach axis { x y z } {
-            set label [$_first hints ${axis}label]
-            if { $label != "" } {
-                SendCmd "axis name $axis $label"
-            }
-            set units [$_first hints ${axis}units]
-            if { $units != "" } {
-                SendCmd "axis units $axis $units"
-            }
-        }
-        array unset _scalarFields
-        array unset _vectorFields
-        set _currentField [$_first hints default]
-        $itk_component(field) choices delete 0 end
-        $itk_component(fieldmenu) delete 0 end
-        array unset _fields
-        foreach { name title units } [$_first hints vectors] {
-            set _vectorFields($title) $name
-            $itk_component(field) choices insert end "$name" "$title"
-            $itk_component(fieldmenu) add radiobutton -label "$title" \
-                -value $title -variable [itcl::scope _currentField] \
-                -selectcolor red \
-                -activebackground black \
-                -activeforeground white \
-                -font "Arial 8" \
-                -command [itcl::code $this Combo invoke]
-            set _fields($name) [list $title $units]
-        }
-        foreach { name title units } [$_first hints scalars] {
-            set _scalarFields($title) $name
-            $itk_component(field) choices insert end "$name" "$title"
-            $itk_component(fieldmenu) add radiobutton -label "$title" \
-                -value $title -variable [itcl::scope _currentField] \
-                -selectcolor red \
-                -activebackground black \
-                -activeforeground white \
-                -font "Arial 8" \
-                -command [itcl::code $this Combo invoke]
-            set _fields($name) [list $title $units]
-        }
-        $itk_component(field) value $_currentField
-    }
-
-    InitSettings contour-visible contour-palette contour-visible 
+            SendCmd "clientinfo [list $args]"
+        }
+
+        set _fieldNames [$_first hints fieldnames]
+        set _fieldUnits [$_first hints fieldunits]
+        set _fieldLabels [$_first hints fieldlabels]
+        $itk_component(field) choices delete 0 end
+        $itk_component(fieldmenu) delete 0 end
+        array unset _fields
+        foreach name $_fieldNames title $_fieldLabels units $_fieldUnits {
+            SendCmd "dataset maprange explicit $_limits(vmin) $_limits(vmax) $name"
+            if { $title == "" } {
+                set title $name
+            }
+            $itk_component(field) choices insert end "$name" "$title"
+            $itk_component(fieldmenu) add radiobutton -label "$title" \
+                -value $title -variable [itcl::scope _currentFieldName] \
+                -selectcolor red \
+                -activebackground $itk_option(-plotbackground) \
+                -activeforeground $itk_option(-plotforeground) \
+                -font "Arial 8" \
+                -command [itcl::code $this Combo invoke]
+            set _fields($name) [list $title $units]
+            set _currentFieldName $name
+        }
+        if { [array size _fields] == 1 } {
+            set _currentFieldName $_fieldLabels
+            if { $_currentFieldName == "" } { 
+                puts stderr "no default name from field"
+                set _currentFieldName "Default"
+            }
+        }
+        $itk_component(field) value $_currentFieldName
+    }
+    InitSettings isosurfaceVisible colormapPalette isosurfaceVisible 
 
     if { $_reset } {
         InitSettings \
-            contour-lighting \
-            contour-palette contour-field \
-            contour-edges contour-lighting contour-opacity contour-wireframe \
-            contour-outline
+            isosurfaceLighting \
+            field \
+            isosurfaceEdges isosurfaceLighting isosurfaceOpacity \
+            isosurfaceWireframe isosurfaceOutline
         Zoom reset
         set _reset 0
@@ -1167 +1137 @@
         "reset" {
             array set _view {
-                qw      1
-                qx      0
-                qy      0
-                qz      0
+                qw      0.36
+                qx      0.25
+                qy      0.50
+                qz      0.70
                 zoom    1.0
                 xpan   0
@@ -1335 +1305 @@
     }
     switch -- $what {
-        "contour-opacity" {
-            set val $_settings(contour-opacity)
+        "isosurfaceOpacity" {
+            set val $_settings(isosurfaceOpacity)
             set sval [expr { 0.01 * double($val) }]
-            foreach dataset [CurrentDatasets -visible] {
-                SendCmd "contour3d opacity $sval $dataset"
-            }
-        }
-        "contour-wireframe" {
-            set bool $_settings(contour-wireframe)
-            foreach dataset [CurrentDatasets -visible] {
-                SendCmd "contour3d wireframe $bool $dataset"
-            }
-        }
-        "contour-visible" {
-            set bool $_settings(contour-visible)
-            foreach dataset [CurrentDatasets -visible] {
-                SendCmd "contour3d visible $bool $dataset"
-            }
+            SendCmd "contour3d opacity $sval"
+        }
+        "isosurfaceWireframe" {
+            set bool $_settings(isosurfaceWireframe)
+            SendCmd "contour3d wireframe $bool"
+        }
+        "isosurfaceVisible" {
+            set bool $_settings(isosurfaceVisible)
+            SendCmd "contour3d visible $bool"
             if { $bool } {
                 Rappture::Tooltip::for $itk_component(contour) \
@@ -1361 +1325 @@
             }
         }
-        "contour-lighting" {
-            set bool $_settings(contour-lighting)
-            foreach dataset [CurrentDatasets -visible] {
-                SendCmd "contour3d lighting $bool $dataset"
-            }
-        }
-        "contour-edges" {
-            set bool $_settings(contour-edges)
-            foreach dataset [CurrentDatasets -visible] {
-                SendCmd "contour3d edges $bool $dataset"
-            }
-        }
-        "contour-outline" {
-            set bool $_settings(contour-outline)
-            foreach dataset [CurrentDatasets -visible] {
-                SendCmd "dataset outline $bool $dataset"
-            }
-        }
-        "axis-visible" {
-            set bool $_settings(axis-visible)
+        "isosurfaceLighting" {
+            set bool $_settings(isosurfaceLighting)
+            SendCmd "contour3d lighting $bool"
+        }
+        "isosurfaceEdges" {
+            set bool $_settings(isosurfaceEdges)
+            SendCmd "contour3d edges $bool"
+        }
+        "isosurfaceOutline" {
+            set bool $_settings(isosurfaceOutline)
+            SendCmd "dataset outline $bool"
+        }
+        "background" {
+            set bgcolor [$itk_component(background) value]
+            array set fgcolors {
+                "black" "white"
+                "white" "black"
+                "grey"  "black"
+            }
+            configure -plotbackground $bgcolor \
+                -plotforeground $fgcolors($bgcolor)
+            $itk_component(view) delete "legend"
+            DrawLegend $_currentFieldName
+        }
+        "axesVisible" {
+            set bool $_settings(axesVisible)
             SendCmd "axis visible all $bool"
         }
-        "axis-labels" {
-            set bool $_settings(axis-labels)
+        "axisLabelsVisible" {
+            set bool $_settings(axisLabelsVisible)
             SendCmd "axis labels all $bool"
         }
@@ -1392 +1362 @@
             SendCmd "axis grid $axis $bool"
         }
-        "axis-mode" {
-            set mode [$itk_component(axismode) value]
-            set mode [$itk_component(axismode) translate $mode]
+        "axisMode" {
+            set mode [$itk_component(axisMode) value]
+            set mode [$itk_component(axisMode) translate $mode]
             set _settings($what) $mode
             SendCmd "axis flymode $mode"
         }
-        "cutplane-edges" {
+        "cutplaneEdges" {
             set bool $_settings($what)
             foreach dataset [CurrentDatasets -visible] {
@@ -1404 +1374 @@
             }
         }
-        "cutplane-visible" {
+        "cutplaneVisible" {
             set bool $_settings($what)
             foreach dataset [CurrentDatasets -visible] {
@@ -1410 +1380 @@
             }
         }
-        "cutplane-wireframe" {
+        "cutplaneWireframe" {
             set bool $_settings($what)
             foreach dataset [CurrentDatasets -visible] {
@@ -1416 +1386 @@
             }
         }
-        "cutplane-lighting" {
+        "cutplaneLighting" {
             set bool $_settings($what)
             foreach dataset [CurrentDatasets -visible] {
@@ -1422 +1392 @@
             }
         }
-        "cutplane-opacity" {
+        "cutplaneOpacity" {
             set val $_settings($what)
             set sval [expr { 0.01 * double($val) }]
@@ -1429 +1399 @@
             }
         }
-        "cutplane-xvisible" - "cutplane-yvisible" - "cutplane-zvisible" {
-            set axis [string range $what 9 9]
+        "cutplaneXVisible" - "cutplaneYVisible" - "cutplaneZVisible" {
+            set axis [string tolower [string range $what 8 8]]
             set bool $_settings($what)
             if { $bool } {
-                $itk_component(${axis}CutScale) configure -state normal \
+                $itk_component(${axis}position) configure -state normal \
                     -troughcolor white
             } else {
-                $itk_component(${axis}CutScale) configure -state disabled \
+                $itk_component(${axis}position) configure -state disabled \
                     -troughcolor grey82
             }
@@ -1443 +1413 @@
             }
         }
-        "cutplane-xposition" - "cutplane-yposition" - "cutplane-zposition" {
-            set axis [string range $what 9 9]
+        "cutplaneXPosition" - "cutplaneYPosition" - "cutplaneZPosition" {
+            set axis [string tolower [string range $what 8 8]]
             set pos [expr $_settings($what) * 0.01]
             foreach dataset [CurrentDatasets -visible] {
@@ -1451 +1421 @@
             set _cutplanePending 0
         }
-        "contour-visible" {
+        "isosurfaceVisible" {
             set bool $_settings($what)
             foreach dataset [CurrentDatasets -visible] {
                 SendCmd "contour3d visible $bool $dataset"
             }
+            set _settings(isosurfaceVisible) $bool
             if { $bool } {
                 Rappture::Tooltip::for $itk_component(contour) \
@@ -1463 +1434 @@
                     "Show the isosurface"
             }
-        }
-        "contour-palette" {
-            set palette [$itk_component(palette) value]
-            set _settings(contour-palette) $palette
-            foreach dataset [CurrentDatasets -visible $_first] {
-                foreach {dataobj comp} [split $dataset -] break
-                ChangeColormap $dataobj $comp $palette
-            }
-            set _legendPending 1
-        }
-        "contour-opacity" {
-            set val $_settings(contour-opacity)
+            DrawLegend $_currentFieldName
+        }
+        "colormapPalette" {
+            set color [$itk_component(palette) value]
+            set _settings(colormapPalette) $color
+            if { $color == "none" } {
+                if { $_settings(colormapVisible) } {
+                    SendCmd "contour3d surface 0"
+                    set _settings(colormapVisible) 0
+                }
+            } else {
+                if { !$_settings(colormapVisible) } {
+                    SendCmd "contour3d surface 1"
+                    set _settings(colormapVisible) 1
+                }
+                ResetColormap $color
+                SendCmd "contour3d colormap $_currentColormap"
+            }
+            EventuallyRequestLegend
+        }
+        "isolineColor" {
+            set color [$itk_component(isolineColor) value]
+            if { $color == "none" } {
+                if { $_settings(isosurfaceVisible) } {
+                    SendCmd "contour3d visible 0"
+                    set _settings(isosurfaceVisible) 0
+                }
+            } else {
+                if { !$_settings(isosurfaceVisible) } {
+                    SendCmd "contour3d visible 1"
+                    set _settings(isosurfaceVisible) 1
+                }
+                set _settings(isolineColor) $color
+            }
+            DrawLegend $_currentFieldName
+        }
+        "isosurfaceOpacity" {
+            set val $_settings(isosurfaceOpacity)
             set sval [expr { 0.01 * double($val) }]
             foreach dataset [CurrentDatasets -visible $_first] {
@@ -1480 +1477 @@
             }
         }
-        "contour-lighting" {
-            set bool $_settings(contour-lighting)
+        "isosurfaceLighting" {
+            set bool $_settings(isosurfaceLighting)
             foreach dataset [CurrentDatasets -visible $_first] {
                 SendCmd "contour3d lighting $bool $dataset"
             }
         }
-        "contour-field" {
+        "field" {
             set new [$itk_component(field) value]
             set value [$itk_component(field) translate $new]
-            set _settings(contour-field) $value
-            if { [info exists _scalarFields($new)] } {
-                set name $_scalarFields($new)
+            set _settings(field) $value
+            if { [info exists _fields($new)] } {
                 set _colorMode scalar
-                set _currentField $new
-            } elseif { [info exists _vectorFields($new)] } {
-                set name $_vectorFields($new)
-                set _colorMode vmag
-                set _currentField $new
+                set _currentFieldName $new
             } else {
                 puts stderr "unknown field \"$new\""
                 return
             }
-            foreach dataset [CurrentDatasets -visible] {
-                SendCmd "dataset scalar ${name} $dataset"
-                SendCmd "cutplane colormode $_colorMode ${name} $dataset"
-            }
-            set _legendPending 1
-        }
-        "legend-visible" {
-            if { !$_settings(legend-visible) } {
+            EventuallyRequestLegend
+        }
+        "legendVisible" {
+            if { !$_settings(legendVisible) } {
                 $itk_component(view) delete legend
             }
-            DrawLegend $_settings(contour-field)
+            DrawLegend $_settings(field)
         }
         default {
@@ -1520 +1508 @@
 }
 
+
 #
 # RequestLegend --
 #
 #       Request a new legend from the server.  The size of the legend
-#       is determined from the height of the canvas.  It will be rotated
-#       to be vertical when drawn.
+#       is determined from the height of the canvas.  
+#
+# This should be called when
+#       1.  A new current colormap is set.
+#       2.  Window is resized.
+#       3.  The limits of the data have changed.  (Just need a redraw).
+#       4.  Number of isolines have changed. (Just need a redraw).
+#       5.  Legend becomes visible (Just need a redraw).
 #
 itcl::body Rappture::VtkIsosurfaceViewer::RequestLegend {} {
+    set _legendPending 0
     set font "Arial 8"
     set lineht [font metrics $font -linespace]
-    set c $itk_component(legend)
+    set c $itk_component(view)
     set w 12
-    set h [expr {$_height - 3 * ($lineht + 2)}]
+    set h [expr {$_height - 2 * ($lineht + 2)}]
     if { $h < 1} {
         return
     }
-    if { [info exists _scalarFields($_currentField)] } {
-        set name $_scalarFields($_currentField)
-    } elseif { [info exists _vectorFields($_currentField)] } {
-        set name $_vectorFields($_currentField)
+    if { [info exists _fields($_currentFieldName)] } {
+        set title [lindex $_fields($_currentFieldName) 0]
+        if { $title != "component" } {
+            set h [expr $h - ($lineht + 2)]
+        }
     } else {
         return
     }
-    # Set the legend on the first coutour dataset.
-    foreach dataset [CurrentDatasets -visible $_first] {
-        foreach {dataobj comp} [split $dataset -] break
-        if { [info exists _dataset2style($dataset)] } {
-            SendCmdNoSplash \
-                "legend $_dataset2style($dataset) $_colorMode $name {} $w $h 0"
-            break;
-        }
-    }
-}
-
-#
-# ChangeColormap --
-#
-itcl::body Rappture::VtkIsosurfaceViewer::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
-}
-
-#
-# SetColormap --
-#
-itcl::body Rappture::VtkIsosurfaceViewer::SetColormap { dataobj comp } {
-    array set style {
-        -color BCGYR
-        -levels 10
-        -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
-    }
-    if { ![info exists _dataset2style($tag)] ||
-         $_dataset2style($tag) != $name } {
-        SendCmd "contour3d colormap $name $tag"
-        SendCmd "contour3d add numcontours [expr {$style(-levels)+1}] $tag"
-        SendCmd "cutplane colormap $name $tag"
-        set _dataset2style($tag) $name
+    # Set the legend on the first heightmap dataset.
+    if { $_currentColormap != ""  } {
+        set cmap $_currentColormap
+        SendCmdNoWait "legend $cmap scalar $title {} $w $h 0"
     }
 }
@@ -1816 +1757 @@
 # BuildColormap --
 #
-itcl::body Rappture::VtkIsosurfaceViewer::BuildColormap { name styles } {
-    array set style $styles
+itcl::body Rappture::VtkIsosurfaceViewer::BuildColormap { name stylelist } {
+    array set style $stylelist
+parray style
     set cmap [ColorsToColormap $style(-color)]
     if { [llength $cmap] == 0 } {
@@ -1846 +1788 @@
 itcl::configbody Rappture::VtkIsosurfaceViewer::plotforeground {
     if { [isconnected] } {
-        foreach {r g b} [Color2RGB $itk_option(-plotforeground)] break
-        #fix this!
-        #SendCmd "color background $r $g $b"
+        SendCmd "axis color all [Color2RGB $itk_option(-plotforeground)]"
     }
 }
 
 itcl::body Rappture::VtkIsosurfaceViewer::limits { dataobj } {
-    return
-    array unset _limits $dataobj-*
-    foreach comp [$dataobj components] {
-        set tag $dataobj-$comp
-        if { ![info exists _limits($tag)] } {
-            set data [$dataobj blob $comp]
-            set tmpfile file[pid].vtk
-            set f [open "$tmpfile" "w"]
-            fconfigure $f -translation binary -encoding binary
-            puts $f $data 
-            close $f
-            set reader [vtkDataSetReader $tag-xvtkDataSetReader]
-            $reader SetFileName $tmpfile
-            $reader ReadAllScalarsOn
-            $reader ReadAllVectorsOn
-            $reader ReadAllFieldsOn
-            $reader Update
-            set output [$reader GetOutput]
-            set _limits($tag) [$output GetBounds]
-            set pointData [$output GetPointData]
-            puts stderr "\#scalars=[$reader GetNumberOfScalarsInFile]"
-            puts stderr "\#fielddata=[$reader GetNumberOfFieldDataInFile]"
-            puts stderr "fielddataname=[$reader GetFieldDataNameInFile 0]"
-            set fieldData [$output GetFieldData]
-            set pointData [$output GetPointData]
-            puts stderr "field \#arrays=[$fieldData GetNumberOfArrays]"
-            for { set i 0 } { $i < [$fieldData GetNumberOfArrays] } { incr i } {
-                puts stderr [$fieldData GetArrayName $i]
-            }
-            puts stderr "point \#arrays=[$pointData GetNumberOfArrays]"
-            for { set i 0 } { $i < [$pointData GetNumberOfArrays] } { incr i } {
-                set name [$pointData GetArrayName $i]
-                if { ![info exists _fields($name)] } {
-                    $itk_component(field) choices insert end "$name" "$name"
-                    set _fields($name) 1
-                }
-            }
-            puts stderr "field \#components=[$fieldData GetNumberOfComponents]"
-            puts stderr "point \#components=[$pointData GetNumberOfComponents]"
-            puts stderr "field \#tuples=[$fieldData GetNumberOfTuples]"
-            puts stderr "point \#tuples=[$pointData GetNumberOfTuples]"
-            puts stderr "point \#scalars=[$pointData GetScalars]"
-            puts stderr vectors=[$pointData GetVectors]
-            rename $output ""
-            rename $reader ""
-            file delete $tmpfile
-        }
-        foreach { xMin xMax yMin yMax zMin zMax} $_limits($tag) break
-        if {![info exists limits(xmin)] || $limits(xmin) > $xMin} {
-            set limits(xmin) $xMin
-        }
-        if {![info exists limits(xmax)] || $limits(xmax) < $xMax} {
-            set limits(xmax) $xMax
-        }
-        if {![info exists limits(ymin)] || $limits(ymin) > $yMin} {
-            set limits(ymin) $xMin
-        }
-        if {![info exists limits(ymax)] || $limits(ymax) < $yMax} {
-            set limits(ymax) $yMax
-        }
-        if {![info exists limits(zmin)] || $limits(zmin) > $zMin} {
-            set limits(zmin) $zMin
-        }
-        if {![info exists limits(zmax)] || $limits(zmax) < $zMax} {
-            set limits(zmax) $zMax
-        }
-    }
+    foreach { limits(xmin) limits(xmax) } [$dataobj limits x] break
+    foreach { limits(ymin) limits(ymax) } [$dataobj limits y] break
+    foreach { limits(zmin) limits(zmax) } [$dataobj limits z] break
+    foreach { limits(vmin) limits(vmax) } [$dataobj limits v] break
     return [array get limits]
 }
 
-itcl::body Rappture::VtkIsosurfaceViewer::BuildVolumeTab {} {
+itcl::body Rappture::VtkIsosurfaceViewer::BuildIsosurfaceTab {} {
 
     set fg [option get $itk_component(hull) font Font]
@@ -1929 +1806 @@
 
     set inner [$itk_component(main) insert end \
-        -title "Contour Settings" \
+        -title "Isosurface Settings" \
         -icon [Rappture::icon volume-on]]
     $inner configure -borderwidth 4
 
     checkbutton $inner.contour \
-        -text "Show Isosurface" \
-        -variable [itcl::scope _settings(contour-visible)] \
-        -command [itcl::code $this AdjustSetting contour-visible] \
+        -text "Isosurfaces" \
+        -variable [itcl::scope _settings(isosurfaceVisible)] \
+        -command [itcl::code $this AdjustSetting isosurfaceVisible] \
         -font "Arial 9"
 
     checkbutton $inner.wireframe \
-        -text "Show Wireframe" \
-        -variable [itcl::scope _settings(contour-wireframe)] \
-        -command [itcl::code $this AdjustSetting contour-wireframe] \
+        -text "Wireframe" \
+        -variable [itcl::scope _settings(isosurfaceWireframe)] \
+        -command [itcl::code $this AdjustSetting isosurfaceWireframe] \
         -font "Arial 9"
 
     checkbutton $inner.lighting \
         -text "Enable Lighting" \
-        -variable [itcl::scope _settings(contour-lighting)] \
-        -command [itcl::code $this AdjustSetting contour-lighting] \
+        -variable [itcl::scope _settings(isosurfaceLighting)] \
+        -command [itcl::code $this AdjustSetting isosurfaceLighting] \
         -font "Arial 9"
 
     checkbutton $inner.edges \
-        -text "Show Edges" \
-        -variable [itcl::scope _settings(contour-edges)] \
-        -command [itcl::code $this AdjustSetting contour-edges] \
+        -text "Edges" \
+        -variable [itcl::scope _settings(isosurfaceEdges)] \
+        -command [itcl::code $this AdjustSetting isosurfaceEdges] \
         -font "Arial 9"
 
     checkbutton $inner.outline \
-        -text "Show Outline" \
-        -variable [itcl::scope _settings(contour-outline)] \
-        -command [itcl::code $this AdjustSetting contour-outline] \
+        -text "Outline" \
+        -variable [itcl::scope _settings(isosurfaceOutline)] \
+        -command [itcl::code $this AdjustSetting isosurfaceOutline] \
         -font "Arial 9"
 
     checkbutton $inner.legend \
-        -text "Show Legend" \
-        -variable [itcl::scope _settings(legend-visible)] \
-        -command [itcl::code $this AdjustSetting legend-visible] \
+        -text "Legend" \
+        -variable [itcl::scope _settings(legendVisible)] \
+        -command [itcl::code $this AdjustSetting legendVisible] \
         -font "Arial 9"
+
+    label $inner.linecolor_l -text "Isolines" -font "Arial 9" 
+    itk_component add isolineColor {
+        Rappture::Combobox $inner.linecolor -width 10 -editable no
+    }
+    $inner.linecolor choices insert end \
+        "black"              "black"            \
+        "blue"               "blue"             \
+        "cyan"               "cyan"             \
+        "green"              "green"            \
+        "grey"               "grey"             \
+        "magenta"            "magenta"          \
+        "orange"             "orange"           \
+        "red"                "red"              \
+        "white"              "white"            \
+        "none"               "none"
+
+    $itk_component(isolineColor) value "red"
+    bind $inner.linecolor <<Value>> \
+        [itcl::code $this AdjustSetting isolineColor]
+
+    label $inner.background_l -text "Background" -font "Arial 9" 
+    itk_component add background {
+        Rappture::Combobox $inner.background -width 10 -editable no
+    }
+    $inner.background choices insert end \
+        "black"              "black"            \
+        "white"              "white"            \
+        "grey"               "grey"             
+
+    $itk_component(background) value $_settings(background)
+    bind $inner.background <<Value>> [itcl::code $this AdjustSetting background]
 
     label $inner.opacity_l -text "Opacity" -font "Arial 9"
     ::scale $inner.opacity -from 0 -to 100 -orient horizontal \
-        -variable [itcl::scope _settings(contour-opacity)] \
+        -variable [itcl::scope _settings(isosurfaceOpacity)] \
         -width 10 \
         -showvalue off \
-        -command [itcl::code $this AdjustSetting contour-opacity]
+        -command [itcl::code $this AdjustSetting isosurfaceOpacity]
 
     label $inner.scale_l -text "Scale" -font "Arial 9"
@@ -1988 +1897 @@
     }
     bind $inner.field <<Value>> \
-        [itcl::code $this AdjustSetting contour-field]
+        [itcl::code $this AdjustSetting field]
 
     label $inner.palette_l -text "Palette" -font "Arial 9" 
@@ -2014 +1923 @@
     $itk_component(palette) value "BCGYR"
     bind $inner.palette <<Value>> \
-        [itcl::code $this AdjustSetting contour-palette]
+        [itcl::code $this AdjustSetting colormapPalette]
 
     blt::table $inner \
-        0,0 $inner.contour   -anchor w -pady 2 \
-        1,0 $inner.wireframe -anchor w -pady 2 \
-        2,0 $inner.lighting  -anchor w -pady 2 \
-        3,0 $inner.edges     -anchor w -pady 2 \
-        4,0 $inner.outline   -anchor w -pady 2 \
-        5,0 $inner.legend    -anchor w -pady 2 \
-        6,0 $inner.opacity_l -anchor w -pady 2 \
-        6,1 $inner.opacity   -fill x   -pady 2 \
-        8,0 $inner.field_l     -anchor w -pady 2  \
-        8,1 $inner.field       -anchor w -pady 2  \
-        9,0 $inner.palette_l   -anchor w -pady 2  \
-        9,1 $inner.palette     -anchor w -pady 2  \
+        0,0 $inner.palette_l -anchor w -pady 2  \
+        0,1 $inner.palette   -anchor w -pady 2  -fill x \
+        1,0 $inner.linecolor_l  -anchor w -pady 2  \
+        1,1 $inner.linecolor    -anchor w -pady 2 -fill x  \
+        2,0 $inner.background_l -anchor w -pady 2 \
+        2,1 $inner.background -anchor w -pady 2  -fill x \
+        3,0 $inner.contour   -anchor w -pady 2 -cspan 2 \
+        4,0 $inner.wireframe -anchor w -pady 2 -cspan 2 \
+        5,0 $inner.lighting  -anchor w -pady 2 -cspan 2 \
+        6,0 $inner.edges     -anchor w -pady 2 -cspan 2 \
+        7,0 $inner.outline   -anchor w -pady 2 -cspan 2 \
+        8,0 $inner.legend    -anchor w -pady 2 \
+        9,0 $inner.opacity_l -anchor w -pady 2 \
+        9,1 $inner.opacity   -fill x   -pady 2 -fill x \
+        10,0 $inner.field_l   -anchor w -pady 2  \
+        10,1 $inner.field     -anchor w -pady 2  -fill x \
 
     blt::table configure $inner r* c* -resize none
-    blt::table configure $inner r10 c1 c2 -resize expand
+    blt::table configure $inner r11 c1 -resize expand
 }
 
@@ -2046 +1959 @@
     checkbutton $inner.visible \
         -text "Show Axes" \
-        -variable [itcl::scope _settings(axis-visible)] \
-        -command [itcl::code $this AdjustSetting axis-visible] \
+        -variable [itcl::scope _settings(axesVisible)] \
+        -command [itcl::code $this AdjustSetting axesVisible] \
         -font "Arial 9"
 
     checkbutton $inner.labels \
         -text "Show Axis Labels" \
-        -variable [itcl::scope _settings(axis-labels)] \
-        -command [itcl::code $this AdjustSetting axis-labels] \
+        -variable [itcl::scope _settings(axisLabelsVisible)] \
+        -command [itcl::code $this AdjustSetting axisLabelsVisible] \
         -font "Arial 9"
 
@@ -2074 +1987 @@
     label $inner.mode_l -text "Mode" -font "Arial 9" 
 
-    itk_component add axismode {
+    itk_component add axisMode {
         Rappture::Combobox $inner.mode -width 10 -editable no
     }
@@ -2082 +1995 @@
         "furthest_triad"  "furthest" \
         "outer_edges"     "outer"         
-    $itk_component(axismode) value "static"
-    bind $inner.mode <<Value>> [itcl::code $this AdjustSetting axis-mode]
+    $itk_component(axisMode) value "static"
+    bind $inner.mode <<Value>> [itcl::code $this AdjustSetting axisMode]
 
     blt::table $inner \
@@ -2145 +2058 @@
 
     checkbutton $inner.visible \
-        -text "Show Cutplanes" \
-        -variable [itcl::scope _settings(cutplane-visible)] \
-        -command [itcl::code $this AdjustSetting cutplane-visible] \
+        -text "Cutplanes" \
+        -variable [itcl::scope _settings(cutplaneVisible)] \
+        -command [itcl::code $this AdjustSetting cutplaneVisible] \
         -font "Arial 9"
 
     checkbutton $inner.wireframe \
-        -text "Show Wireframe" \
-        -variable [itcl::scope _settings(cutplane-wireframe)] \
-        -command [itcl::code $this AdjustSetting cutplane-wireframe] \
+        -text "Wireframe" \
+        -variable [itcl::scope _settings(cutplaneWireframe)] \
+        -command [itcl::code $this AdjustSetting cutplaneWireframe] \
         -font "Arial 9"
 
     checkbutton $inner.lighting \
         -text "Enable Lighting" \
-        -variable [itcl::scope _settings(cutplane-lighting)] \
-        -command [itcl::code $this AdjustSetting cutplane-lighting] \
+        -variable [itcl::scope _settings(cutplaneLighting)] \
+        -command [itcl::code $this AdjustSetting cutplaneLighting] \
         -font "Arial 9"
 
     checkbutton $inner.edges \
-        -text "Show Edges" \
-        -variable [itcl::scope _settings(cutplane-edges)] \
-        -command [itcl::code $this AdjustSetting cutplane-edges] \
+        -text "Edges" \
+        -variable [itcl::scope _settings(cutplaneEdges)] \
+        -command [itcl::code $this AdjustSetting cutplaneEdges] \
         -font "Arial 9"
 
     label $inner.opacity_l -text "Opacity" -font "Arial 9"
     ::scale $inner.opacity -from 0 -to 100 -orient horizontal \
-        -variable [itcl::scope _settings(cutplane-opacity)] \
+        -variable [itcl::scope _settings(cutplaneOpacity)] \
         -width 10 \
         -showvalue off \
-        -command [itcl::code $this AdjustSetting cutplane-opacity]
-    $inner.opacity set $_settings(cutplane-opacity)
+        -command [itcl::code $this AdjustSetting cutplaneOpacity]
+    $inner.opacity set $_settings(cutplaneOpacity)
 
     # X-value slicer...
-    itk_component add xCutButton {
+    itk_component add xbutton {
         Rappture::PushButton $inner.xbutton \
             -onimage [Rappture::icon x-cutplane] \
             -offimage [Rappture::icon x-cutplane] \
-            -command [itcl::code $this AdjustSetting cutplane-xvisible] \
-            -variable [itcl::scope _settings(cutplane-xvisible)]
-    }
-    Rappture::Tooltip::for $itk_component(xCutButton) \
+            -command [itcl::code $this AdjustSetting cutplaneXVisible] \
+            -variable [itcl::scope _settings(cutplaneXVisible)]
+    }
+    Rappture::Tooltip::for $itk_component(xbutton) \
         "Toggle the X-axis cutplane on/off"
 
-    itk_component add xCutScale {
+    itk_component add xposition {
         ::scale $inner.xval -from 100 -to 1 \
             -width 10 -orient vertical -showvalue yes \
             -borderwidth 1 -highlightthickness 0 \
             -command [itcl::code $this EventuallySetCutplane x] \
-            -variable [itcl::scope _settings(cutplane-xposition)]
+            -variable [itcl::scope _settings(cutplaneXPosition)]
     } {
         usual
@@ -2198 +2111 @@
     }
     # Set the default cutplane value before disabling the scale.
-    $itk_component(xCutScale) set 50
-    $itk_component(xCutScale) configure -state disabled
-    Rappture::Tooltip::for $itk_component(xCutScale) \
+    $itk_component(xposition) set 50
+    $itk_component(xposition) configure -state disabled
+    Rappture::Tooltip::for $itk_component(xposition) \
         "@[itcl::code $this Slice tooltip x]"
 
     # Y-value slicer...
-    itk_component add yCutButton {
+    itk_component add ybutton {
         Rappture::PushButton $inner.ybutton \
             -onimage [Rappture::icon y-cutplane] \
             -offimage [Rappture::icon y-cutplane] \
-            -command [itcl::code $this AdjustSetting cutplane-yvisible] \
-            -variable [itcl::scope _settings(cutplane-yvisible)]
-    }
-    Rappture::Tooltip::for $itk_component(yCutButton) \
+            -command [itcl::code $this AdjustSetting cutplaneYVisible] \
+            -variable [itcl::scope _settings(cutplaneYVisible)]
+    }
+    Rappture::Tooltip::for $itk_component(ybutton) \
         "Toggle the Y-axis cutplane on/off"
 
-    itk_component add yCutScale {
+    itk_component add yposition {
         ::scale $inner.yval -from 100 -to 1 \
             -width 10 -orient vertical -showvalue yes \
             -borderwidth 1 -highlightthickness 0 \
             -command [itcl::code $this EventuallySetCutplane y] \
-            -variable [itcl::scope _settings(cutplane-yposition)]
+            -variable [itcl::scope _settings(cutplaneYPosition)]
     } {
         usual
         ignore -borderwidth -highlightthickness
     }
-    Rappture::Tooltip::for $itk_component(yCutScale) \
+    Rappture::Tooltip::for $itk_component(yposition) \
         "@[itcl::code $this Slice tooltip y]"
     # Set the default cutplane value before disabling the scale.
-    $itk_component(yCutScale) set 50
-    $itk_component(yCutScale) configure -state disabled
+    $itk_component(yposition) set 50
+    $itk_component(yposition) configure -state disabled
 
     # Z-value slicer...
-    itk_component add zCutButton {
+    itk_component add zbutton {
         Rappture::PushButton $inner.zbutton \
             -onimage [Rappture::icon z-cutplane] \
             -offimage [Rappture::icon z-cutplane] \
-            -command [itcl::code $this AdjustSetting cutplane-zvisible] \
-            -variable [itcl::scope _settings(cutplane-zvisible)]
-    }
-    Rappture::Tooltip::for $itk_component(zCutButton) \
+            -command [itcl::code $this AdjustSetting cutplaneZVisible] \
+            -variable [itcl::scope _settings(cutplaneZVisible)]
+    }
+    Rappture::Tooltip::for $itk_component(zbutton) \
         "Toggle the Z-axis cutplane on/off"
 
-    itk_component add zCutScale {
+    itk_component add zposition {
         ::scale $inner.zval -from 100 -to 1 \
             -width 10 -orient vertical -showvalue yes \
             -borderwidth 1 -highlightthickness 0 \
             -command [itcl::code $this EventuallySetCutplane z] \
-            -variable [itcl::scope _settings(cutplane-zposition)]
+            -variable [itcl::scope _settings(cutplaneZPosition)]
     } {
         usual
         ignore -borderwidth -highlightthickness
     }
-    $itk_component(zCutScale) set 50
-    $itk_component(zCutScale) configure -state disabled
-    #$itk_component(zCutScale) configure -state disabled
-    Rappture::Tooltip::for $itk_component(zCutScale) \
+    $itk_component(zposition) set 50
+    $itk_component(zposition) configure -state disabled
+    Rappture::Tooltip::for $itk_component(zposition) \
         "@[itcl::code $this Slice tooltip z]"
 
     blt::table $inner \
-        0,0 $inner.visible              -anchor w -pady 2 -cspan 4 \
-        1,0 $inner.lighting             -anchor w -pady 2 -cspan 4 \
-        2,0 $inner.wireframe            -anchor w -pady 2 -cspan 4 \
-        3,0 $inner.edges                -anchor w -pady 2 -cspan 4 \
-        4,0 $inner.opacity_l            -anchor w -pady 2 -cspan 3 \
-        5,0 $inner.opacity              -fill x   -pady 2 -cspan 3 \
-        6,0 $itk_component(xCutButton)  -anchor e -padx 2 -pady 2 \
-        7,0 $itk_component(xCutScale)   -fill y \
-        6,1 $itk_component(yCutButton)  -anchor e -padx 2 -pady 2 \
-        7,1 $itk_component(yCutScale)   -fill y \
-        6,2 $itk_component(zCutButton)  -anchor e -padx 2 -pady 2 \
-        7,2 $itk_component(zCutScale)   -fill y \
+        0,0 $inner.visible              -anchor w -pady 2 -cspan 3 \
+        1,0 $inner.lighting             -anchor w -pady 2 -cspan 3 \
+        2,0 $inner.wireframe            -anchor w -pady 2 -cspan 3 \
+        3,0 $inner.edges                -anchor w -pady 2 -cspan 3 \
+        4,0 $inner.opacity_l            -anchor w -pady 2 -cspan 1 \
+        4,1 $inner.opacity              -fill x   -pady 2 -cspan 3 \
+        6,0 $inner.xbutton              -anchor w -padx 2 -pady 2 \
+        7,0 $inner.ybutton              -anchor w -padx 2 -pady 2 \
+        8,0 $inner.zbutton              -anchor w -padx 2 -pady 2 \
+        6,1 $inner.xval                 -fill y -rspan 4 \
+        6,2 $inner.yval                 -fill y -rspan 4 \
+        6,3 $inner.zval                 -fill y -rspan 4 \
+
 
     blt::table configure $inner r* c* -resize none
-    blt::table configure $inner r7 c3 -resize expand
+    blt::table configure $inner r9 c4 -resize expand
+    blt::table configure $inner r5 -height 0.12i
 }
 
@@ -2311 +2225 @@
                     SendCmd "camera zoom $_view(zoom)"
                 }
-            }
-        }
-    }
-}
-
-itcl::body Rappture::VtkIsosurfaceViewer::ConvertToVtkData { dataobj comp } {
-    foreach { x1 x2 xN y1 y2 yN } [$dataobj mesh $comp] break
-    set values [$dataobj values $comp]
-    append out "# vtk DataFile Version 2.0 \n"
-    append out "Test data \n"
-    append out "ASCII \n"
-    append out "DATASET STRUCTURED_POINTS \n"
-    append out "DIMENSIONS $xN $yN 1 \n"
-    append out "ORIGIN 0 0 0 \n"
-    append out "SPACING 1 1 1 \n"
-    append out "POINT_DATA [expr $xN * $yN] \n"
-    append out "SCALARS field float 1 \n"
-    append out "LOOKUP_TABLE default \n"
-    append out [join $values "\n"]
-    append out "\n"
-    return $out
-}
-
+             }
+        }
+    }
+}
 
 itcl::body Rappture::VtkIsosurfaceViewer::GetVtkData { args } {
     set bytes ""
     foreach dataobj [get] {
-        foreach comp [$dataobj components] {
-            set tag $dataobj-$comp
-            #set contents [ConvertToVtkData $dataobj $comp]
-            set contents [$dataobj blob $comp]
+        foreach cname [$dataobj components] {
+            set tag $dataobj-$cname
+            set contents [$dataobj vtkdata $cname]
             append bytes "$contents\n\n"
         }
@@ -2364 +2258 @@
     radiobutton $inner.vtk_button -text "VTK data file" \
         -variable [itcl::scope _downloadPopup(format)] \
-        -font "Helvetica 9 " \
+        -font "Arial 9 " \
         -value vtk  
     Rappture::Tooltip::for $inner.vtk_button "Save as VTK data file."
     radiobutton $inner.image_button -text "Image File" \
         -variable [itcl::scope _downloadPopup(format)] \
+        -font "Arial 9 " \
         -value image 
     Rappture::Tooltip::for $inner.image_button \
@@ -2401 +2296 @@
     # Parse style string.
     set tag $dataobj-$comp
-    set style [$dataobj style $comp]
-    array set settings {
-        -color \#808080
+    array set style {
+        -color BCGYR
         -edges 0
         -edgecolor black
@@ -2410 +2304 @@
         -wireframe 0
         -lighting 1
-        -seeds 1
-        -seedcolor white
-        -visible 1
         -outline 0
-    }
+        -levels 10
+    }
+    array set style [$dataobj style $comp]
     if { $dataobj != $_first } {
-        set settings(-opacity) 1
-    }
-    array set settings $style
+        set style(-opacity) 1
+    }
+    if { $_currentColormap == "" } {
+        set stylelist [$dataobj style $comp]
+        if { $stylelist != "" } {
+            array set style $stylelist
+            set stylelist [array get style]
+            SetCurrentColormap $stylelist
+        }
+        $itk_component(palette) value $style(-color)
+    }
     SendCmd "cutplane add $tag"
     SendCmd "cutplane edges 0 $tag"
@@ -2431 +2332 @@
         SendCmd "cutplane axis $axis 0 $tag"
     }
-
-    SendCmd "contour3d add numcontours 10 $tag"
-    SendCmd "contour3d edges $settings(-edges) $tag"
-    SendCmd "dataset outline $settings(-outline) $tag"
-    set _settings(contour-outline) $settings(-outline)
-    set _settings(contour-edges) $settings(-edges)
+    set _numContours $style(-levels)
+    SendCmd "contour3d add numcontours $_numContours $tag"
+    SendCmd "contour3d edges $style(-edges) $tag"
+    SendCmd "dataset outline $style(-outline) $tag"
+    set _settings(isosurfaceOutline) $style(-outline)
+    set _settings(isosurfaceEdges) $style(-edges)
     #SendCmd "contour3d color [Color2RGB $settings(-color)] $tag"
-    SendCmd "contour3d lighting $settings(-lighting) $tag"
-    set _settings(contour-lighting) $settings(-lighting)
-    SendCmd "contour3d linecolor [Color2RGB $settings(-edgecolor)] $tag"
-    SendCmd "contour3d linewidth $settings(-linewidth) $tag"
-    SendCmd "contour3d opacity $settings(-opacity) $tag"
-    set _settings(contour-opacity) $settings(-opacity)
-    SendCmd "contour3d wireframe $settings(-wireframe) $tag"
-    set _settings(contour-wireframe) $settings(-wireframe)
-    set _settings(contour-opacity) [expr $settings(-opacity) * 100.0]
-    SetColormap $dataobj $comp
+    SendCmd "contour3d lighting $style(-lighting) $tag"
+    set _settings(isosurfaceLighting) $style(-lighting)
+    SendCmd "contour3d linecolor [Color2RGB $style(-edgecolor)] $tag"
+    SendCmd "contour3d linewidth $style(-linewidth) $tag"
+    SendCmd "contour3d opacity $style(-opacity) $tag"
+    set _settings(isosurfaceOpacity) $style(-opacity)
+    SendCmd "contour3d wireframe $style(-wireframe) $tag"
+    set _settings(isosurfaceWireframe) $style(-wireframe)
+    set _settings(isosurfaceOpacity) [expr $style(-opacity) * 100.0]
 }
 
@@ -2455 +2355 @@
     }
     return 1
-}
-
-# ----------------------------------------------------------------------
-# USAGE: ReceiveLegend <colormap> <title> <vmin> <vmax> <size>
-#
-# Invoked automatically whenever the "legend" command comes in from
-# the rendering server.  Indicates that binary image data with the
-# specified <size> will follow.
-# ----------------------------------------------------------------------
-itcl::body Rappture::VtkIsosurfaceViewer::ReceiveLegend { colormap title vmin vmax size } {
-    set _legendPending 0
-    #puts stderr "ReceiveLegend colormap=$colormap title=$title range=$vmin,$vmax size=$size"
-    set _limits(vmin) $vmin
-    set _limits(vmax) $vmax
-    set _title $title
-    regsub {\(mag\)} $title "" _title 
-    if { [IsConnected] } {
-        set bytes [ReceiveBytes $size]
-        if { ![info exists _image(legend)] } {
-            set _image(legend) [image create photo]
-        }
-        $_image(legend) configure -data $bytes
-        #puts stderr "read $size bytes for [image width $_image(legend)]x[image height $_image(legend)] legend>"
-        if { [catch {DrawLegend $_title} errs] != 0 } {
-            puts stderr errs=$errs
-        }
-    }
-}
-
-#
-# DrawLegend --
-#
-#       Draws the legend in it's own canvas which resides to the right
-#       of the contour plot area.
-#
-itcl::body Rappture::VtkIsosurfaceViewer::DrawLegend { name } {
-    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]
-    
-    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 <Enter> [itcl::code $this EnterLegend %x %y]
-            $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 Combo post]
-        $c bind title <Enter> [itcl::code $this Combo activate]
-        $c bind title <Leave> [itcl::code $this Combo 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}]
-    }
 }
 
@@ -2590 +2396 @@
     set imgY [expr $y - 2 * ($lineht + 2)]
 
+    set title ""
     if { [info exists _fields($_title)] } {
         foreach { title units } $_fields($_title) break
+        if { $title == "component" } {
+            set title ""
+        }
         if { $units != "" } {
-            set title [format "%s (%s)" $title $units]
+            append title [format " (%s)" $units]
         }
     } else {
         set title $_title
+        if { $title == "component" } {
+            set title ""
+        }
     }
     # Make a swatch of the selected color
     if { [catch { $_image(legend) get 10 $imgY } pixel] != 0 } {
-        #puts stderr "out of range: $imgY"
         return
     }
@@ -2606 +2418 @@
         set _image(swatch) [image create photo -width 24 -height 24]
     }
-    $_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
-
-    if 0 {
     set color [eval format "\#%02x%02x%02x" $pixel]
     $_image(swatch) put black  -to 0 0 23 23 
     $_image(swatch) put $color -to 1 1 22 22 
-    }
+    .rappturetooltip configure -icon $_image(swatch)
+
     .rappturetooltip configure -icon $_image(swatch)
 
@@ -2643 +2451 @@
         "move" {
             set axis [lindex $args 0]
-            set oldval $_settings(axis-${axis}position)
+            set a [string toupper $axis]
+            set oldval $_settings(cutplane${a}Position)
             set newval [lindex $args 1]
             if {[llength $args] != 2} {
@@ -2653 +2462 @@
         "tooltip" {
             set axis [lindex $args 0]
-            set val [$itk_component(${axis}CutScale) get]
+            set val [$itk_component(${axis}position) get]
             return "Move the [string toupper $axis] cut plane.\nCurrently:  $axis = $val%"
         }
@@ -2662 +2471 @@
 }
 
+# 
+# ReceiveLegend -- 
+#
+#       Invoked automatically whenever the "legend" command comes in from
+#       the rendering server.  Indicates that binary image data with the
+#       specified <size> will follow.
+#
+itcl::body Rappture::VtkIsosurfaceViewer::ReceiveLegend { colormap title min max size } {
+    #puts stderr "ReceiveLegend colormap=$colormap title=$title range=$min,$max size=$size"
+    set _title $title
+    regsub {\(mag\)} $title "" _title 
+    if { [IsConnected] } {
+        set bytes [ReceiveBytes $size]
+        if { ![info exists _image(legend)] } {
+            set _image(legend) [image create photo]
+        }
+        $_image(legend) configure -data $bytes
+        #puts stderr "read $size bytes for [image width $_image(legend)]x[image height $_image(legend)] legend>"
+        if { [catch {DrawLegend $_title} errs] != 0 } {
+            global errorInfo
+            puts stderr "errs=$errs errorInfo=$errorInfo"
+        }
+    }
+}
+
+#
+# DrawLegend --
+#
+#       Draws the legend in it's own canvas which resides to the right
+#       of the contour plot area.
+#
+itcl::body Rappture::VtkIsosurfaceViewer::DrawLegend { name } {
+    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]
+    
+    if { $name == "component" } {
+        set title ""
+    } else {
+        if { [info exists _fields($name)] } {
+            foreach { title units } $_fields($name) break
+            if { $units != "" } {
+                set title [format "%s (%s)" $title $units]
+            }
+        } else {
+            set title $name
+        }
+    }
+    set x [expr $w - 2]
+    if { !$_settings(legendVisible) } {
+        $c delete legend
+        return
+    } 
+    if { [$c find withtag "legend"] == "" } {
+        set y 2 
+        # If there's a legend title, create a text item for the title.
+        if { $title != "" } {
+            $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 "zmax 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 "zmin legend" \
+            -font $font
+        #$c bind colormap <Enter> [itcl::code $this EnterLegend %x %y]
+        $c bind colormap <Leave> [itcl::code $this LeaveLegend]
+        $c bind colormap <Motion> [itcl::code $this MotionLegend %x %y]
+    }
+    $c delete isoline
+    set x2 $x
+    set iw [image width $_image(legend)]
+    set ih [image height $_image(legend)]
+    set x1 [expr $x2 - ($iw*12)/10]
+    set color $_settings(isolineColor)
+    # Draw the isolines on the legend.
+    if { $color != "none"  && $_numContours > 0 } {
+        set pixels [blt::vector create \#auto]
+        set values [blt::vector create \#auto]
+        set range [image height $_image(legend)]
+        # Order of pixels is max to min (max is at top of legend).
+        $pixels seq $ih 0 $_numContours
+        set offset [expr 2 + $lineht]
+        # If there's a legend title, increase the offset by the line height.
+        if { $title != "" } {
+            incr offset $lineht
+        }
+        $pixels expr {round($pixels + $offset)}
+        # Order of values is min to max.
+        $values seq $_limits(zmin) $_limits(zmax) $_numContours
+        set tags "isoline legend"
+        foreach pos [$pixels range 0 end] value [$values range end 0] {
+            set y1 [expr int($pos)]
+            set id [$c create line $x1 $y1 $x2 $y1 -fill $color -tags $tags]
+            $c bind $id <Enter> [itcl::code $this EnterIsoline %x %y $value]
+            $c bind $id <Leave> [itcl::code $this LeaveIsoline]
+        }
+        blt::vector destroy $pixels $values
+    }
+
+    $c bind title <ButtonPress> [itcl::code $this Combo post]
+    $c bind title <Enter> [itcl::code $this Combo activate]
+    $c bind title <Leave> [itcl::code $this Combo deactivate]
+    # Reset the item coordinates according the current size of the plot.
+    $c itemconfigure title -text $title
+    if { [info exists _limits(zmin)] && $_limits(zmin) != "" } {
+        $c itemconfigure zmin -text [format %g $_limits(zmin)]
+    }
+    if { [info exists _limits(zmax)] && $_limits(zmax) != "" } {
+        $c itemconfigure zmax -text [format %g $_limits(zmax)]
+    }
+    set y 2
+    # If there's a legend title, move the title to the correct position
+    if { $title != "" } {
+        $c coords title $x $y
+        incr y $lineht
+    }
+    $c coords zmax $x $y
+    incr y $lineht
+    $c coords colormap $x $y
+    $c coords zmin $x [expr {$h - 2}]
+}
+
+#
+# EnterIsoline --
+#
+itcl::body Rappture::VtkIsosurfaceViewer::EnterIsoline { x y value } {
+    SetIsolineTip $x $y $value
+}
+
+#
+# LeaveIsoline --
+#
+itcl::body Rappture::VtkIsosurfaceViewer::LeaveIsoline { } {
+    Rappture::Tooltip::tooltip cancel
+    .rappturetooltip configure -icon ""
+}
+
+#
+# SetIsolineTip --
+#
+itcl::body Rappture::VtkIsosurfaceViewer::SetIsolineTip { x y value } {
+    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]
+    
+    if { [info exists _fields($_title)] } {
+        foreach { title units } $_fields($_title) break
+        if { $title == "component" } {
+            set title ""
+        }
+        if { $units != "" } {
+            set title [format "%s (%s)" $title $units]
+        }
+    } else {
+        set title $_title
+    }
+    # Make a swatch of the selected color
+    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)]
+
+    if { [catch { $_image(legend) get 10 $imgY } pixel] != 0 } {
+        return
+    }
+    if { ![info exists _image(swatch)] } {
+        set _image(swatch) [image create photo -width 24 -height 24]
+    }
+    set color [eval format "\#%02x%02x%02x" $pixel]
+    $_image(swatch) put black  -to 0 0 23 23 
+    $_image(swatch) put $color -to 1 1 22 22 
+    .rappturetooltip configure -icon $_image(swatch)
+
+     # Compute the value of the point
+    set tipx [expr $x + 15] 
+    set tipy [expr $y - 5]
+    Rappture::Tooltip::text $c "Isosurface $value"
+    Rappture::Tooltip::tooltip show $c +$tipx,+$tipy    
+}
 
 # ----------------------------------------------------------------------
@@ -2688 +2691 @@
         }
         deactivate {
-            $c itemconfigure title -fill white 
+            $c itemconfigure title -fill $itk_option(-plotforeground) 
         }
         invoke {
-            $itk_component(field) value $_currentField
-            AdjustSetting contour-field
+            $itk_component(field) value $_currentFieldName
+            AdjustSetting field
         }
         default {
@@ -2699 +2702 @@
     }
 }
+
+#
+# SetCurrentColormap --
+#
+itcl::body Rappture::VtkIsosurfaceViewer::SetCurrentColormap { stylelist } {
+    array set style {
+        -color BCGYR
+        -levels 10
+        -opacity 1.0
+    }
+    array set style $stylelist
+
+    set name "$style(-color):$style(-levels):$style(-opacity)"
+    if { ![info exists _colormaps($name)] } {
+        set stylelist [array get style]
+        BuildColormap $name $stylelist
+        set _colormaps($name) $stylelist
+    }
+    set _currentColormap $name
+}
+
+itcl::body Rappture::VtkIsosurfaceViewer::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::VtkIsosurfaceViewer::BuildColormap { name stylelist } {
+    array set style $stylelist
+    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(isosurfaceOpacity)] } {
+        set _settings(isosurfaceOpacity) $style(-opacity)
+    }
+    set max $_settings(isosurfaceOpacity)
+
+    set wmap "0.0 1.0 1.0 1.0"
+    SendCmd "colormap add $name { $cmap } { $wmap }"
+}
+
+itcl::body Rappture::VtkIsosurfaceViewer::ResetColormap { color } {
+    array set style {
+        -color BCGYR
+        -levels 10
+        -opacity 1.0
+    }
+    if { [info exists _colormap($_currentColormap)] } {
+        array set style $_colormap($_currentColormap)
+    }
+    set style(-color) $color
+    SetCurrentColormap [array get style]
+}