Changeset 6675

Timestamp:

Jan 23, 2017 11:29:05 AM (7 years ago)

Author:

ldelgass

Message:

Revert volume viewer changes to release branch versions

Location:

trunk/gui/scripts

Files:

• flowvisviewer.tcl (modified) (25 diffs)
• isomarker.tcl (modified) (1 diff)
• nanovisviewer.tcl (modified) (46 diffs)
• vtkvolumeviewer.tcl (modified) (33 diffs)

trunk/gui/scripts/flowvisviewer.tcl

@@ -61 +61 @@
     public method get {args}
     public method isconnected {}
-    public method limits { cname }
+    public method limits { tf }
     public method overMarker { m x }
     public method parameters {title args} {
@@ -129 +129 @@
     private variable _dlist "";         # list of data objects
     private variable _obj2ovride;       # maps dataobj => style override
-    private variable _datasets;         # maps dataobj-component
+    private variable _serverDatasets;   # contains all the dataobj-component
                                         # to volumes in the server
+    private variable _recvdDatasets;    # list of data objs to send to server
     private variable _dataset2style;    # maps dataobj-component to transfunc
     private variable _style2datasets;   # maps tf back to list of
@@ -225 +226 @@
     $_arcball quaternion [ViewToQuaternion]
 
+    set _limits(vmin) 0.0
+    set _limits(vmax) 1.0
+
     array set _settings [subst {
-        -ambient                60
         -arrows                 0
         -axesvisible            0
@@ -233 +236 @@
         -currenttime            0
         -cutplanesvisible       0
-        -diffuse                40
         -duration               1:00
         -gridvisible            0
@@ -239 +241 @@
         -legendvisible          1
         -lic                    1
+        -light                  40
         -light2side             1
         -loop                   0
@@ -249 +252 @@
         -qy                     $_view(-qy)
         -qz                     $_view(-qz)
-        -specularexponent       90
-        -specularlevel          30
         -speed                  500
         -step                   0
@@ -496 +497 @@
     $itk_component(speed) value 1
     bind $itk_component(speed) <<Value>> [itcl::code $this flow speed]
-
 
     blt::table $itk_component(flowcontrols) \
@@ -739 +739 @@
             set _limits($cname) $limits(v)
         }
-        foreach axis {x y z} {
+        foreach axis {x y z v} {
             foreach { min max } [$dataobj limits $axis] break
             if {"" != $min && "" != $max} {
-                if { ![info exists _limits($axis)] } {
-                    set _limits($axis) [list $min $max]
+                if { ![info exists _limits(${axis}min)] } {
+                    set _limits(${axis}min) $min
+                    set _limits(${axis}max) $max
                     continue
                 }
-                foreach {amin amax} $_limits($axis) break
-                if {$min < $amin} {
-                    set amin $min
+                if {$min < $_limits(${axis}min)} {
+                    set _limits(${axis}min) $min
                 }
-                if {$max > $amax} {
-                    set amax $max
+                if {$max > $_limits(${axis}max)} {
+                    set _limits(${axis}max) $max
                 }
-                set _limits($axis) [list $amin $amax]
             }
         }
@@ -897 +896 @@
 
     # disconnected -- no more data sitting on server
-    array unset _datasets
+    array unset _serverDatasets
 }
 
@@ -993 +992 @@
     # Display the markers used by the current transfer function.
     set tf $_dataset2style($tag)
-    foreach {min max} [limits $tf] break
-    $c itemconfigure vmin -text [format %g $min]
+    array set limits [limits $tf]
+    $c itemconfigure vmin -text [format %g $limits(vmin)]
     $c coords vmin $lx $ly
 
-    $c itemconfigure vmax -text [format %g $max]
+    $c itemconfigure vmax -text [format %g $limits(vmax)]
     $c coords vmax [expr {$w-$lx}] $ly
 
@@ -1043 +1042 @@
 # The procedure is the response from the render server to each "data
 # follows" command.  The server sends back a "data" command invoked our
-# the slave interpreter.  The purpose was to collect the min/max of the
-# volume sent to the render server.  This is no longer needed since we
-# already know the limits.
+# the slave interpreter.  The purpose is to collect the min/max of the
+# volume sent to the render server.  Since the client (flowvisviewer)
+# doesn't parse 3D data formats, we rely on the server (nanovis) to
+# tell us what the limits are.  Once we've received the limits to all
+# the data we've sent (tracked by _recvdDatasets) we can then determine
+# what the transfer functions are for these volumes.
+#
+#
+#       Note: There is a considerable tradeoff in having the server report
+#             back what the data limits are.  It means that much of the code
+#             having to do with transfer-functions has to wait for the data
+#             to come back, since the isomarkers are calculated based upon
+#             the data limits.  The client code is much messier because of
+#             this.  The alternative is to parse any of the 3D formats on the
+#             client side.
 #
 itcl::body Rappture::FlowvisViewer::ReceiveData { args } {
@@ -1056 +1067 @@
 
     set tag $info(tag)
-    set _limits($tag) [list $info(min) $info(max)]
+    set parts [split $tag -]
+
+    #
+    # Volumes don't exist until we're told about them.
+    #
+    set dataobj [lindex $parts 0]
+    set _serverDatasets($tag) 0
+    set _limits($tag-min)  $info(min);  # Minimum value of the volume.
+    set _limits($tag-max)  $info(max);  # Maximum value of the volume.
+
+    unset _recvdDatasets($tag)
+    if { [array size _recvdDatasets] == 0 } {
+        updateTransferFunctions
+    }
 }
 
@@ -1099 +1123 @@
     }
     set _first ""
-    foreach dataobj [get -objects] {
-        if { [info exists _obj2ovride($dataobj-raise)] &&  $_first == "" } {
-            set _first $dataobj
-        }
+    foreach dataobj [get] {
         foreach cname [$dataobj components] {
             set tag $dataobj-$cname
-            if { ![info exists _datasets($tag)] } {
-                if { [$dataobj type] == "dx" } {
-                    set data [$dataobj blob $cname]
-                } else {
-                    set data [$dataobj vtkdata $cname]
+            if {[$dataobj type] == "dx"} {
+                set data [$dataobj blob $cname]
+            } else {
+                set data [$dataobj vtkdata $cname]
+            }
+            set nbytes [string length $data]
+            if { $_reportClientInfo }  {
+                set info {}
+                lappend info "tool_id"       [$dataobj hints toolid]
+                lappend info "tool_name"     [$dataobj hints toolname]
+                lappend info "tool_title"    [$dataobj hints tooltitle]
+                lappend info "tool_command"  [$dataobj hints toolcommand]
+                lappend info "tool_revision" [$dataobj hints toolrevision]
+                lappend info "dataset_label" [$dataobj hints label]
+                lappend info "dataset_size"  $nbytes
+                lappend info "dataset_tag"   $tag
+                SendCmd "clientinfo [list $info]"
+            }
+            set numComponents [$dataobj numComponents $cname]
+            # I have a field. Is a vector field or a volume field?
+            if { $numComponents == 1 } {
+                SendCmd "volume data follows $nbytes $tag"
+            } else {
+                if {[SendFlowCmd $dataobj $cname $nbytes $numComponents] < 0} {
+                    continue
                 }
-                set nbytes [string length $data]
-                if { $_reportClientInfo }  {
-                    set info {}
-                    lappend info "tool_id"       [$dataobj hints toolid]
-                    lappend info "tool_name"     [$dataobj hints toolname]
-                    lappend info "tool_title"    [$dataobj hints tooltitle]
-                    lappend info "tool_command"  [$dataobj hints toolcommand]
-                    lappend info "tool_revision" [$dataobj hints toolrevision]
-                    lappend info "dataset_label" [$dataobj hints label]
-                    lappend info "dataset_size"  $nbytes
-                    lappend info "dataset_tag"   $tag
-                    SendCmd "clientinfo [list $info]"
-                }
-                set numComponents [$dataobj numComponents $cname]
-                # I have a field. Is a vector field or a volume field?
-                if { $numComponents == 1 } {
-                    SendCmd "volume data follows $nbytes $tag"
-                } else {
-                    if {[SendFlowCmd $dataobj $cname $nbytes $numComponents] < 0} {
-                        continue
-                    }
-                }
-                SendData $data
-                set _datasets($tag) 1
-                NameTransferFunction $dataobj $cname
-            }
-        }
-    }
+            }
+            SendData $data
+            NameTransferFunction $dataobj $cname
+            set _recvdDatasets($tag) 1
+        }
+    }
+
+    set _first [lindex [get] 0]
 
     # Turn off cutplanes for all volumes
@@ -1145 +1166 @@
     }
 
-    InitSettings -volume -outlinevisible -cutplanesvisible \
+    # Reset the camera and other view parameters
+    InitSettings -opacity -light2side -isosurfaceshading \
+        -light \
+        -volume -outlinevisible -cutplanesvisible \
         -xcutplanevisible -ycutplanevisible -zcutplanevisible \
         -xcutplaneposition -ycutplaneposition -zcutplaneposition
 
-    if { $_reset } {
-        InitSettings -opacity -light2side -isosurfaceshading \
-            -ambient -diffuse -specularlevel -specularexponent
-
-        #
-        # Reset the camera and other view parameters
-        #
-        if {"" != $_first} {
-            set axis [$_first hints updir]
-            if { "" != $axis } {
-                SendCmd "up $axis"
-            }
-            set location [$_first hints camera]
-            if { $location != "" } {
-                array set _view $location
-            }
-        }
-        set _settings(-qw)    $_view(-qw)
-        set _settings(-qx)    $_view(-qx)
-        set _settings(-qy)    $_view(-qy)
-        set _settings(-qz)    $_view(-qz)
-        set _settings(-xpan)  $_view(-xpan)
-        set _settings(-ypan)  $_view(-ypan)
-        set _settings(-zoom)  $_view(-zoom)
-
-        set q [ViewToQuaternion]
-        $_arcball quaternion $q
-        SendCmd "camera orient $q"
-        SendCmd "camera reset"
-        PanCamera
-        SendCmd "camera zoom $_view(-zoom)"
+    # nothing to send -- activate the proper volume
+    if {"" != $_first} {
+        set axis [$_first hints updir]
+        if {"" != $axis} {
+            SendCmd "up $axis"
+        }
+        set location [$_first hints camera]
+        if { $location != "" } {
+            array set _view $location
+        }
+    }
+    set _settings(-qw)    $_view(-qw)
+    set _settings(-qx)    $_view(-qx)
+    set _settings(-qy)    $_view(-qy)
+    set _settings(-qz)    $_view(-qz)
+    set _settings(-xpan)  $_view(-xpan)
+    set _settings(-ypan)  $_view(-ypan)
+    set _settings(-zoom)  $_view(-zoom)
+
+    set q [ViewToQuaternion]
+    $_arcball quaternion $q
+    SendCmd "camera orient $q"
+    SendCmd "camera reset"
+    PanCamera
+    SendCmd "camera zoom $_view(-zoom)"
+
+    foreach dataobj [get] {
+        foreach cname [$dataobj components] {
+            NameTransferFunction $dataobj $cname
+        }
         set _reset 0
     }
 
+    # nothing to send -- activate the proper ivol
+    set _first [lindex [get] 0]
     if {"" != $_first} {
+        set axis [$_first hints updir]
+        if {"" != $axis} {
+            SendCmd "up $axis"
+        }
+        set location [$_first hints camera]
+        if { $location != "" } {
+            array set _view $location
+        }
         set cname [lindex [$_first components] 0]
         set _activeTf [lindex $_dataset2style($_first-$cname) 0]
-        # Make sure we display the proper transfer function in the legend.
-        updateTransferFunctions
-    }
+    }
+
+    # sync the state of slicers
+    set vols [CurrentDatasets -cutplanes]
+    foreach axis {x y z} {
+        set pos [expr {0.01*$_settings(-${axis}cutplaneposition)}]
+        SendCmd "cutplane position $pos $axis $vols"
+    }
+    SendCmd "volume data state $_settings(-volume)"
+    EventuallyRedrawLegend
 
     # Actually write the commands to the server socket.  If it fails, we don't
@@ -1205 +1245 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::FlowvisViewer::CurrentDatasets {{what -all}} {
-    set rlist ""
+    return ""
     if { $_first == "" } {
         return
     }
-    foreach cname [$_first components] {
-        set tag $_first-$cname
-        if { [info exists _datasets($tag)] && $_datasets($tag) } {
+    foreach tag [array names _serverDatasets *-*] {
+        if {[string match $_first-* $tag]} {
             array set style {
                 -cutplanes 1
             }
-            array set style [lindex [$_first components -style $cname] 0]
-            if { $what != "-cutplanes" || $style(-cutplanes) } {
-                lappend rlist $tag
+            foreach {dataobj cname} [split $tag -] break
+            array set style [lindex [$dataobj components -style $cname] 0]
+            if {$what != "-cutplanes" || $style(-cutplanes)} {
+                lappend rlist $_serverDatasets($tag)
             }
         }
@@ -1405 +1445 @@
     }
     switch -- $what {
-        "-ambient" {
-            if { $_first != "" } {
-                set comp [lindex [$_first components] 0]
-                set tag $_first-$comp
-                set val $_settings($what)
-                set val [expr {0.01*$val}]
-                SendCmd "$tag configure -ambient $val"
-            }
-        }
         "-axesvisible" {
             SendCmd "axis visible $_settings($what)"
@@ -1442 +1473 @@
             set tag [lindex $datasets 0]
             SendCmd "cutplane visible $bool $tag"
-        }
-        "-diffuse" {
-            if { $_first != "" } {
-                set comp [lindex [$_first components] 0]
-                set tag $_first-$comp
-                set val $_settings($what)
-                set val [expr {0.01*$val}]
-                SendCmd "$tag configure -diffuse $val"
-            }
         }
         "-gridvisible" {
@@ -1474 +1496 @@
             }
         }
+        "-light" {
+            if { $_first != "" } {
+                set comp [lindex [$_first components] 0]
+                set tag $_first-$comp
+                set diffuse [expr {0.01*$_settings($what)}]
+                set ambient [expr {1.0 - $diffuse}]
+                set specularLevel 0.3
+                set specularExp 90.0
+                SendCmd "$tag configure -ambient $ambient -diffuse $diffuse -specularLevel $specularLevel -specularExp $specularExp"
+            }
+        }
         "-light2side" {
             if { $_first != "" } {
@@ -1495 +1528 @@
                 set tag $_first-$comp
                 SendCmd "$tag configure -outline $_settings($what)"
-            }
-        }
-        "-specularlevel" {
-            if { $_first != "" } {
-                set comp [lindex [$_first components] 0]
-                set tag $_first-$comp
-                set val $_settings($what)
-                set val [expr {0.01*$val}]
-                SendCmd "$tag configure -specularLevel $val"
-            }
-        }
-        "-specularexponent" {
-            if { $_first != "" } {
-                set comp [lindex [$_first components] 0]
-                set tag $_first-$comp
-                set val $_settings($what)
-                SendCmd "$tag configure -specularExp $val"
             }
         }
@@ -1601 +1617 @@
     }
     array set style [lindex [$dataobj components -style $cname] 0]
+    set tf "$style(-color):$style(-levels)"
     # Some tools erroneously set -opacity to 1 in style, so
     # override the requested opacity for now
     set style(-opacity) 0.5
     set _settings(-opacity) [expr $style(-opacity) * 100]
-    set _dataset2style($dataobj-$cname) $cname
-    lappend _style2datasets($cname) $dataobj $cname
-    return $cname
+    set _dataset2style($dataobj-$cname) $tf
+    lappend _style2datasets($tf) $dataobj $cname
+    return $tf
 }
 
@@ -1888 +1905 @@
 }
 
-itcl::body Rappture::FlowvisViewer::limits { cname } {
-    if { ![info exists _limits($cname)] } {
-        puts stderr "no limits for cname=($cname)"
-        return [list 0.0 1.0]
-    }
-    return $_limits($cname)
+itcl::body Rappture::FlowvisViewer::limits { tf } {
+    set _limits(vmin) 0.0
+    set _limits(vmax) 1.0
+    if { ![info exists _style2datasets($tf)] } {
+        puts stderr "no _style2datasets for tf=($tf)"
+        return [array get _limits]
+    }
+    set min ""; set max ""
+    foreach {dataobj comp} $_style2datasets($tf) {
+        set tag $dataobj-$comp
+        if { ![info exists _serverDatasets($tag)] } {
+            puts stderr "$tag not in _serverDatasets?"
+            continue
+        }
+        if { ![info exists _limits($tag-min)] } {
+            puts stderr "$tag no min?"
+            continue
+        }
+        if { $min == "" || $min > $_limits($tag-min) } {
+            set min $_limits($tag-min)
+        }
+        if { $max == "" || $max < $_limits($tag-max) } {
+            set max $_limits($tag-max)
+        }
+    }
+    if { $min != "" } {
+        set _limits(vmin) $min
+    }
+    if { $max != "" } {
+        set _limits(vmax) $max
+    }
+    return [array get _limits]
 }
 
@@ -1997 +2040 @@
         -command [itcl::code $this AdjustSetting -light2side]
 
-    label $inner.ambient_l -text "Ambient" -font $fg
-    ::scale $inner.ambient -from 0 -to 100 -orient horizontal \
-        -variable [itcl::scope _settings(-ambient)] \
+    label $inner.dim -text "Glow" -font $fg
+    ::scale $inner.light -from 0 -to 100 -orient horizontal \
+        -variable [itcl::scope _settings(-light)] \
         -width 10 \
-        -showvalue off -command [itcl::code $this AdjustSetting -ambient]
-
-    label $inner.diffuse_l -text "Diffuse" -font $fg
-    ::scale $inner.diffuse -from 0 -to 100 -orient horizontal \
-        -variable [itcl::scope _settings(-diffuse)] \
-        -width 10 \
-        -showvalue off -command [itcl::code $this AdjustSetting -diffuse]
-
-    label $inner.specularLevel_l -text "Specular" -font $fg
-    ::scale $inner.specularLevel -from 0 -to 100 -orient horizontal \
-        -variable [itcl::scope _settings(-specularlevel)] \
-        -width 10 \
-        -showvalue off -command [itcl::code $this AdjustSetting -specularlevel]
-
-    label $inner.specularExponent_l -text "Shininess" -font $fg
-    ::scale $inner.specularExponent -from 10 -to 128 -orient horizontal \
-        -variable [itcl::scope _settings(-specularexponent)] \
-        -width 10 \
-        -showvalue off -command [itcl::code $this AdjustSetting -specularexponent]
+        -showvalue off -command [itcl::code $this AdjustSetting -light]
+    label $inner.bright -text "Surface" -font $fg
 
     # Opacity
@@ -2044 +2070 @@
         Rappture::Combobox $inner.colormap -width 10 -editable no
     }
+
     $inner.colormap choices insert end [GetColormapList -includeNone]
     bind $inner.colormap <<Value>> \
@@ -2054 +2081 @@
         1,0 $inner.lighting_l -cspan 4 -anchor w -pady {10 2} \
         2,0 $inner.light2side -cspan 4 -anchor w -pady 2 \
-        3,0 $inner.ambient_l -anchor e -pady 2 \
-        3,1 $inner.ambient -cspan 3 -pady 2 -fill x \
-        4,0 $inner.diffuse_l -anchor e -pady 2 \
-        4,1 $inner.diffuse -cspan 3 -pady 2 -fill x \
-        5,0 $inner.specularLevel_l -anchor e -pady 2 \
-        5,1 $inner.specularLevel -cspan 3 -pady 2 -fill x \
-        6,0 $inner.specularExponent_l -anchor e -pady 2 \
-        6,1 $inner.specularExponent -cspan 3 -pady 2 -fill x \
-        7,0 $inner.opacity_l -anchor e -pady 2 \
-        7,1 $inner.opacity -cspan 3 -pady 2 -fill x \
-        8,0 $inner.thin -anchor e -pady 2 \
-        8,1 $inner.thickness -cspan 2 -pady 2 -fill x \
-        8,3 $inner.thick -anchor w -pady 2
+        3,0 $inner.dim -anchor e -pady 2 \
+        3,1 $inner.light -cspan 2 -pady 2 -fill x \
+        3,3 $inner.bright -anchor w -pady 2 \
+        4,0 $inner.opacity_l -anchor e -pady 2 \
+        4,1 $inner.opacity -cspan 3 -pady 2 -fill x \
+        5,0 $inner.thin -anchor e -pady 2 \
+        5,1 $inner.thickness -cspan 2 -pady 2 -fill x \
+        5,3 $inner.thick -anchor w -pady 2
 
     blt::table configure $inner c0 c1 c3 r* -resize none
-    blt::table configure $inner r9 -resize expand
+    blt::table configure $inner r6 -resize expand
 }
 
@@ -2945 +2967 @@
     set list ""
     foreach tag $_volcomponents($cname) {
-        if { ![info exists _datasets($tag)] } {
+        if { ![info exists _serverDatasets($tag)] } {
             continue
         }

trunk/gui/scripts/isomarker.tcl

@@ -125 +125 @@
 
 itcl::body Rappture::IsoMarker::relval { {x "-get"} } {
-    foreach {min max} [$_nvobj limits $_tf] break
+    array set limits [$_nvobj limits $_tf]
+    set min $limits(vmin)
+    set max $limits(vmax)
     if { $x == "-get" } {
         if { $max == $min } {

trunk/gui/scripts/nanovisviewer.tcl

@@ -60 +60 @@
     public method get {args}
     public method isconnected {}
+    public method limits { tf }
+    public method overMarker { m x }
     public method parameters {title args} {
         # do nothing
     }
+    public method removeDuplicateMarker { m x }
     public method scale {args}
     public method updateTransferFunctions {}
 
     # The following methods are only used by this class.
-    private method AddNewMarker { x y }
+    private method AddIsoMarker { x y }
     private method AdjustSetting {what {value ""}}
     private method BuildCameraTab {}
@@ -73 +76 @@
     private method BuildDownloadPopup { widget command }
     private method BuildViewTab {}
-    private method BuildVolumeComponents {}
     private method BuildVolumeTab {}
-    private method ComputeAlphamap { cname }
-    private method ComputeTransferFunction { cname }
+    private method ComputeTransferFunction { tf }
     private method Connect {}
     private method CurrentDatasets {{what -all}}
     private method Disconnect {}
     private method DoResize {}
-    private method DrawLegend { cname }
+    private method DrawLegend { tf }
     private method EventuallyRedrawLegend { }
     private method EventuallyResize { w h }
     private method FixLegend {}
-    private method GetColormap { cname color }
-    private method GetDatasetsWithComponent { cname }
     private method GetImage { args }
     private method GetVtkData { args }
-    private method HideAllMarkers {}
-    private method InitComponentSettings { cname }
     private method InitSettings { args }
     private method NameTransferFunction { dataobj comp }
     private method Pan {option x y}
     private method PanCamera {}
-    private method ParseLevelsOption { cname levels }
-    private method ParseMarkersOption { cname markers }
+    private method ParseLevelsOption { tf levels }
+    private method ParseMarkersOption { tf markers }
     private method QuaternionToView { q } {
         foreach { _view(-qw) _view(-qx) _view(-qy) _view(-qz) } $q break
@@ -104 +101 @@
     private method ReceiveImage { args }
     private method ReceiveLegend { tf vmin vmax size }
-    private method RemoveMarker { x y }
-    private method ResetColormap { cname color }
+    private method ResetColormap { color }
     private method Rotate {option x y}
     private method SendTransferFunctions {}
-    private method SetObjectStyle { dataobj cname }
     private method SetOrientation { side }
     private method Slice {option args}
     private method SlicerTip {axis}
-    private method SwitchComponent { cname }
     private method ViewToQuaternion {} {
         return [list $_view(-qw) $_view(-qx) $_view(-qy) $_view(-qz)]
@@ -121 +115 @@
     private variable _dlist "";         # list of data objects
     private variable _obj2ovride;       # maps dataobj => style override
-    private variable _datasets;         # maps dataobj-component
+    private variable _serverDatasets;   # contains all the dataobj-component
                                         # to volumes in the server
+    private variable _recvdDatasets;    # list of data objs to send to server
+    private variable _dataset2style;    # maps dataobj-component to transfunc
+    private variable _style2datasets;   # maps tf back to list of
+                                        # dataobj-components using the tf.
 
     private variable _reset 1;          # Connection to server has been reset.
@@ -128 +126 @@
     private variable _limits;           # Autoscale min/max for all axes
     private variable _view;             # View params for 3D view
-    private variable _parsedFunction
-    private variable _transferFunctionEditors
+    private variable _isomarkers;       # array of isosurface level values 0..1
+    # Array of transfer functions in server.  If 0 the transfer has been
+    # defined but not loaded.  If 1 the transfer function has been named
+    # and loaded.
+    private variable _activeTfs
     private variable _settings
     private variable _first "";         # This is the topmost volume.
-    private variable _current "";       # Currently selected component
-    private variable _volcomponents;    # Maps component name to list of
-                                        # dataobj-component tags
-    private variable _componentsList;   # List of components found
-    private variable _cname2transferFunction
-    private variable _cname2defaultcolormap
     private variable _width 0
     private variable _height 0
@@ -198 +193 @@
     $_arcball quaternion [ViewToQuaternion]
 
+    set _limits(vmin) 0.0
+    set _limits(vmax) 1.0
+
     array set _settings [subst {
-        -ambient                60
         -axesvisible            1
         -background             black
-        -colormap               "default"
+        -colormap               "BCGYR"
         -cutplanesvisible       0
-        -diffuse                40
         -gridvisible            0
         -isosurfaceshading      0
         -legendvisible          1
+        -light                  40
         -light2side             1
         -opacity                50
@@ -215 +212 @@
         -qy                     $_view(-qy)
         -qz                     $_view(-qz)
-        -specularexponent       90
-        -specularlevel          30
         -thickness              350
         -volume                 1
-        -volumevisible          1
         -xcutplaneposition      50
-        -xcutplanevisible       1
+        -xcutplanevisible       0
         -xpan                   $_view(-xpan)
         -ycutplaneposition      50
-        -ycutplanevisible       1
+        -ycutplanevisible       0
         -ypan                   $_view(-ypan)
         -zcutplaneposition      50
-        -zcutplanevisible       1
+        -zcutplanevisible       0
         -zoom                   $_view(-zoom)
     }]
@@ -299 +293 @@
     Rappture::Tooltip::for $itk_component(cutplane) \
         "Show/Hide cutplanes"
-    pack $itk_component(cutplane) -padx 2 -pady 2
+    #pack $itk_component(cutplane) -padx 2 -pady 2
 
     if { [catch {
@@ -322 +316 @@
     bind $itk_component(legend) <Configure> \
         [itcl::code $this EventuallyRedrawLegend]
-    bind $itk_component(legend) <KeyPress-Delete> \
-        [itcl::code $this RemoveMarker %x %y]
-    bind $itk_component(legend) <Enter> \
-        [list focus $itk_component(legend)]
 
     # Hack around the Tk panewindow.  The problem is that the requested
@@ -344 +334 @@
     bind $itk_component(view) <ButtonRelease-1> \
         [itcl::code $this Rotate release %x %y]
-
     bind $itk_component(view) <Configure> \
         [itcl::code $this EventuallyResize %w %h]
@@ -404 +393 @@
     image delete $_image(legend)
     image delete $_image(download)
-    foreach cname [array names _transferFunctionEditors] {
-        itcl::delete object $_transferFunctionEditors($cname)
-    }
     catch { blt::arcball destroy $_arcball }
     array unset _settings
@@ -536 +522 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::NanovisViewer::scale {args} {
-    array set style {
-        -color    BCGYR
-        -levels   6
-        -markers  ""
-    }
-    array unset _limits
-    array unset _volcomponents
+    foreach val {xmin xmax ymin ymax zmin zmax vmin vmax} {
+        set _limits($val) ""
+    }
     foreach dataobj $args {
         if { ![$dataobj isvalid] } {
             continue;                     # Object doesn't contain valid data.
         }
-        foreach cname [$dataobj components] {
-            if { ![info exists _volcomponents($cname)] } {
-                lappend _componentsList $cname
-                array set style [lindex [$dataobj components -style $cname] 0]
-                set cmap [ColorsToColormap $style(-color)]
-                set _cname2defaultcolormap($cname) $cmap
-                set _settings($cname-colormap) $style(-color)
-            }
-            lappend _volcomponents($cname) $dataobj-$cname
-            array unset limits
-            array set limits [$dataobj valueLimits $cname]
-            set _limits($cname) $limits(v)
-        }
-        foreach axis {x y z} {
+        foreach axis {x y z v} {
             foreach { min max } [$dataobj limits $axis] break
             if {"" != $min && "" != $max} {
-                if { ![info exists _limits($axis)] } {
-                    set _limits($axis) [list $min $max]
-                    continue
+                if {"" == $_limits(${axis}min)} {
+                    set _limits(${axis}min) $min
+                    set _limits(${axis}max) $max
+                } else {
+                    if {$min < $_limits(${axis}min)} {
+                        set _limits(${axis}min) $min
+                    }
+                    if {$max > $_limits(${axis}max)} {
+                        set _limits(${axis}max) $max
+                    }
                 }
-                foreach {amin amax} $_limits($axis) break
-                if {$min < $amin} {
-                    set amin $min
-                }
-                if {$max > $amax} {
-                    set amax $max
-                }
-                set _limits($axis) [list $amin $amax]
-            }
-        }
-    }
-    BuildVolumeComponents
+            }
+        }
+    }
 }
 
@@ -712 +679 @@
 
     # disconnected -- no more data sitting on server
-    array unset _datasets
+    array unset _serverDatasets
 }
 
@@ -719 +686 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::NanovisViewer::SendTransferFunctions {} {
-    foreach cname [array names _volcomponents] {
-        ComputeTransferFunction $cname
+    if { $_first == "" } {
+        puts stderr "first not set"
+        return
+    }
+    # Ensure that the global thickness setting (in the slider
+    # settings widget) is used for the active transfer-function.  Update
+    # the value in the _settings variable.
+    # Scale values between 0.00001 and 0.01000
+    set thickness [expr {double($_settings(-thickness)) * 0.0001}]
+
+    foreach tag [CurrentDatasets] {
+        if { ![info exists _serverDatasets($tag)] || !$_serverDatasets($tag) } {
+            # The volume hasn't reached the server yet.  How did we get
+            # here?
+            puts stderr "Don't have $tag in _serverDatasets"
+            continue
+        }
+        if { ![info exists _dataset2style($tag)] } {
+            puts stderr "don't have style for volume $tag"
+            continue;                        # How does this happen?
+        }
+        set tf $_dataset2style($tag)
+        set _settings($tf-thickness) $thickness
+        ComputeTransferFunction $tf
+        # FIXME: Need to the send information as to what transfer functions
+        #        to update so that we only update the transfer function
+        #        as necessary.  Right now, all transfer functions are
+        #        updated. This makes moving the isomarker slider chunky.
+        if { ![info exists _activeTfs($tf)] || !$_activeTfs($tf) } {
+            set _activeTfs($tf) 1
+        }
+        SendCmd "volume shading transfunc $tf $tag"
     }
     FixLegend
@@ -758 +755 @@
 # DrawLegend --
 #
-itcl::body Rappture::NanovisViewer::DrawLegend { cname } {
+itcl::body Rappture::NanovisViewer::DrawLegend { tf } {
     set c $itk_component(legend)
     set w [winfo width $c]
@@ -774 +771 @@
             -fill $itk_option(-plotforeground) -tags "title text"
         $c lower colorbar
-        $c bind colorbar <ButtonRelease-1> [itcl::code $this AddNewMarker %x %y]
+        $c bind colorbar <ButtonRelease-1> [itcl::code $this AddIsoMarker %x %y]
     }
 
     # Display the markers used by the current transfer function.
-    HideAllMarkers
-    if {$cname == "" || ![info exists _transferFunctionEditors($cname)]} {
-        return
-    }
-    $_transferFunctionEditors($cname) showMarkers $_limits($cname)
-
-    foreach {min max} $_limits($cname) break
-    $c itemconfigure vmin -text [format %g $min]
+    array set limits [limits $tf]
+    $c itemconfigure vmin -text [format %g $limits(min)]
     $c coords vmin $lx $ly
 
-    $c itemconfigure vmax -text [format %g $max]
+    $c itemconfigure vmax -text [format %g $limits(max)]
     $c coords vmax [expr {$w-$lx}] $ly
 
@@ -801 +792 @@
     $c itemconfigure title -text $title
     $c coords title [expr {$w/2}] $ly
+
+    if { [info exists _isomarkers($tf)] } {
+        # The "visible" isomarker method below implicitly calls "absval".
+        # It uses the screen position of the marker to compute the absolute
+        # value.  So make sure the window size has been computed before
+        # calling "visible".
+        update idletasks
+        update 
+        foreach m $_isomarkers($tf) {
+            $m visible yes
+        }
+    }
+
+    # The colormap may have changed. Resync the slicers with the colormap.
+    set datasets [CurrentDatasets -cutplanes]
+    SendCmd "volume data state $_settings(-volume) $datasets"
+
+    # Adjust the cutplane for only the first component in the topmost volume
+    # (i.e. the first volume designated in the field).
+    set tag [lindex $datasets 0]
+    foreach axis {x y z} {
+        # Turn off cutplanes for all volumes
+        SendCmd "cutplane state 0 $axis"
+        if { $_settings(-${axis}cutplanevisible) } {
+            # Turn on cutplane for this particular volume and set the position
+            SendCmd "cutplane state 1 $axis $tag"
+            set pos [expr {0.01*$_settings(-${axis}cutplaneposition)}]
+            SendCmd "cutplane position $pos $axis $tag"
+        }
+    }
 }
 
@@ -812 +833 @@
 # active transfer function is displayed.
 #
-itcl::body Rappture::NanovisViewer::ReceiveLegend { cname vmin vmax size } {
+itcl::body Rappture::NanovisViewer::ReceiveLegend { tf vmin vmax size } {
     if { ![isconnected] } {
         return
@@ -820 +841 @@
     ReceiveEcho <<line "<read $size bytes for [image width $_image(legend)]x[image height $_image(legend)] legend>"
 
-    DrawLegend $_current
+    DrawLegend $tf
 }
 
@@ -828 +849 @@
 # The procedure is the response from the render server to each "data
 # follows" command.  The server sends back a "data" command invoked our
-# the slave interpreter.  The purpose was to collect the min/max of the
-# volume sent to the render server.  This is no longer needed since we
-# already know the limits.
+# the slave interpreter.  The purpose is to collect the min/max of the
+# volume sent to the render server.  Since the client (nanovisviewer)
+# doesn't parse 3D data formats, we rely on the server (nanovis) to
+# tell us what the limits are.  Once we've received the limits to all
+# the data we've sent (tracked by _recvdDatasets) we can then determine
+# what the transfer functions are for these volumes.
+#
+#
+#       Note: There is a considerable tradeoff in having the server report
+#             back what the data limits are.  It means that much of the code
+#             having to do with transfer-functions has to wait for the data
+#             to come back, since the isomarkers are calculated based upon
+#             the data limits.  The client code is much messier because of
+#             this.  The alternative is to parse any of the 3D formats on the
+#             client side.
 #
 itcl::body Rappture::NanovisViewer::ReceiveData { args } {
@@ -841 +874 @@
 
     set tag $info(tag)
-    set _limits($tag) [list $info(min) $info(max)]
+    set parts [split $tag -]
+
+    #
+    # Volumes don't exist until we're told about them.
+    #
+    set dataobj [lindex $parts 0]
+    set _serverDatasets($tag) 1
+    if { $_settings(-volume) && $dataobj == $_first } {
+        SendCmd "volume state 1 $tag"
+    }
+    set _limits($tag-min)  $info(min);  # Minimum value of the volume.
+    set _limits($tag-max)  $info(max);  # Maximum value of the volume.
+    set _limits(vmin)      $info(vmin); # Overall minimum value.
+    set _limits(vmax)      $info(vmax); # Overall maximum value.
+
+    unset _recvdDatasets($tag)
+    if { [array size _recvdDatasets] == 0 } {
+        # The active transfer function is by default the first component of
+        # the first data object.  This assumes that the data is always
+        # successfully transferred.
+        updateTransferFunctions
+    }
 }
 
@@ -865 +919 @@
     StartBufferingCommands
 
+    # Hide all the isomarkers. Can't remove them. Have to remember the
+    # settings since the user may have created/deleted/moved markers.
+
+    # The "visible" isomarker method below implicitly calls "absval".  It
+    # uses the screen position of the marker to compute the absolute value.
+    # So make sure the window size has been computed before calling
+    # "visible".
+    update idletasks
+    update 
+    foreach tf [array names _isomarkers] {
+        foreach m $_isomarkers($tf) {
+            $m visible no
+        }
+    }
+
     if { $_width != $w || $_height != $h || $_reset } {
         set _width $w
@@ -874 +943 @@
         InitSettings -background -axesvisible -gridvisible
     }
-    set _first ""
-    SendCmd "volume state 0"
-    foreach dataobj [get -objects] {
-        if { [info exists _obj2ovride($dataobj-raise)] &&  $_first == "" } {
-            set _first $dataobj
-        }
+    foreach dataobj [get] {
         foreach cname [$dataobj components] {
             set tag $dataobj-$cname
-            if { ![info exists _datasets($tag)] } {
+            if { ![info exists _serverDatasets($tag)] } {
+                # Send the data as one huge base64-encoded mess -- yuck!
                 if { [$dataobj type] == "dx" } {
                     set data [$dataobj blob $cname]
@@ -909 +974 @@
                 SendCmd "volume data follows $nbytes $tag"
                 SendData $data
-                set _datasets($tag) 1
-                SetObjectStyle $dataobj $cname
-            }
-            if { [info exists _obj2ovride($dataobj-raise)] } {
-                SendCmd "volume state 1 $tag"
-            }
-        }
-    }
-
-    # Turn off cutplanes for all volumes
-    foreach axis {x y z} {
-        SendCmd "cutplane state 0 $axis"
-    }
-
-    InitSettings -outlinevisible -cutplanesvisible \
-        -xcutplanevisible -ycutplanevisible -zcutplanevisible \
-        -xcutplaneposition -ycutplaneposition -zcutplaneposition
-
+                set _recvdDatasets($tag) 1
+                set _serverDatasets($tag) 0
+            }
+            NameTransferFunction $dataobj $cname
+        }
+    }
+    set _first [lindex [get] 0]
+    # Outline seems to need to be reset every update.
+    InitSettings -outlinevisible ;#-cutplanesvisible
     if { $_reset } {
-        InitSettings -opacity -light2side -isosurfaceshading \
-            -ambient -diffuse -specularlevel -specularexponent \
-            -current
-
         #
         # Reset the camera and other view parameters
         #
-        if {"" != $_first} {
-            set axis [$_first hints updir]
-            if { "" != $axis } {
-                SendCmd "up $axis"
-            }
-            set location [$_first hints camera]
-            if { $location != "" } {
-                array set _view $location
-            }
-        }
         set _settings(-qw)    $_view(-qw)
         set _settings(-qx)    $_view(-qx)
@@ -959 +1001 @@
         PanCamera
         SendCmd "camera zoom $_view(-zoom)"
+
+        # Turn off cutplanes for all volumes
+        foreach axis {x y z} {
+            SendCmd "cutplane state 0 $axis"
+        }
+
+        InitSettings -opacity -light2side -isosurfaceshading \
+            -light \
+            -xcutplanevisible -ycutplanevisible -zcutplanevisible
+
+        if {"" != $_first} {
+            set axis [$_first hints updir]
+            if { "" != $axis } {
+                SendCmd "up $axis"
+            }
+            set location [$_first hints camera]
+            if { $location != "" } {
+                array set _view $location
+            }
+        }
         set _reset 0
     }
 
+    # nothing to send -- activate the proper ivol
+    SendCmd "volume state 0"
     if {"" != $_first} {
-        # Make sure we display the proper transfer function in the legend.
-        updateTransferFunctions
-    }
-
+        set datasets [array names _serverDatasets $_first-*]
+        if { $datasets != "" } {
+            SendCmd "volume state 1 $datasets"
+        }
+        # If the first volume already exists on the server, then make sure
+        # we display the proper transfer function in the legend.
+        set cname [lindex [$_first components] 0]
+        if { [info exists _serverDatasets($_first-$cname)] } {
+            updateTransferFunctions
+        }
+    }
     # Actually write the commands to the server socket.  If it fails, we don't
     # care.  We're finished here.
@@ -988 +1059 @@
     foreach cname [$_first components] {
         set tag $_first-$cname
-        if { [info exists _datasets($tag)] && $_datasets($tag) } {
+        if { [info exists _serverDatasets($tag)] && $_serverDatasets($tag) } {
             array set style {
                 -cutplanes 1
@@ -1182 +1253 @@
     }
     switch -- $what {
-        "-ambient" {
-            # Other parts of the code use the ambient setting to
-            # tell if the component settings have been initialized
-            if { ![info exists _settings($_current${what})] } {
-                InitComponentSettings $_current
-            }
-            set _settings($_current${what}) $_settings($what)
-            set val $_settings($what)
-            set val [expr {0.01*$val}]
-            foreach tag [GetDatasetsWithComponent $_current] {
-                SendCmd "volume shading ambient $val $tag"
-            }
-        }
         "-axesvisible" {
             SendCmd "axis visible $_settings($what)"
@@ -1207 +1265 @@
             configure -plotbackground $bgcolor \
                 -plotforeground $fgcolors($bgcolor)
-            DrawLegend $_current
+            #DrawLegend $_current
         }
         "-colormap" {
             set color [$itk_component(colormap) value]
             set _settings($what) $color
-            set _settings($_current${what}) $color
-            ResetColormap $_current $color
-        }
-        "-current" {
-            set cname [$itk_component(volcomponents) value]
-            SwitchComponent $cname
+            # Only set the colormap on the first volume. Ignore the others.
+            #ResetColormap $color
         }
         "-cutplanesvisible" {
@@ -1226 +1280 @@
             SendCmd "cutplane visible $bool $tag"
         }
-        "-diffuse" {
-            set _settings($_current${what}) $_settings($what)
-            set val $_settings($what)
-            set val [expr {0.01*$val}]
-            foreach tag [GetDatasetsWithComponent $_current] {
-                SendCmd "volume shading diffuse $val $tag"
-            }
-        }
         "-gridvisible" {
             SendCmd "grid visible $_settings($what)"
@@ -1239 +1285 @@
         "-isosurfaceshading" {
             set val $_settings($what)
-            foreach tag [GetDatasetsWithComponent $_current] {
-                SendCmd "volume shading isosurface $val $tag"
-            }
+            SendCmd "volume shading isosurface $val"
         }
         "-legendvisible" {
@@ -1253 +1297 @@
             }
         }
+        "-light" {
+            set val $_settings($what)
+            set diffuse [expr {0.01*$val}]
+            set ambient [expr {1.0-$diffuse}]
+            set specularLevel 0.3
+            set specularExp 90.0
+            SendCmd "volume shading ambient $ambient"
+            SendCmd "volume shading diffuse $diffuse"
+            SendCmd "volume shading specularLevel $specularLevel"
+            SendCmd "volume shading specularExp $specularExp"
+        }
         "-light2side" {
-            set _settings($_current${what}) $_settings($what)
             set val $_settings($what)
-            foreach tag [GetDatasetsWithComponent $_current] {
-                SendCmd "volume shading light2side $val $tag"
-            }
+            SendCmd "volume shading light2side $val"
         }
         "-opacity" {
-            set _settings($_current${what}) $_settings($what)
             set val $_settings($what)
             set sval [expr { 0.01 * double($val) }]
-            foreach tag [GetDatasetsWithComponent $_current] {
-                SendCmd "volume shading opacity $sval $tag"
-            }
-        }
-        "-outlinecolor" {
-            set rgb [Color2RGB $_settings($what)]
-            SendCmd "volume outline color $rgb"
+            SendCmd "volume shading opacity $sval"
         }
         "-outlinevisible" {
             SendCmd "volume outline state $_settings($what)"
         }
-        "-specularexponent" {
-            set _settings($_current${what}) $_settings($what)
-            set val $_settings($what)
-            foreach tag [GetDatasetsWithComponent $_current] {
-                SendCmd "volume shading specularExp $val $tag"
-            }
-        }
-        "-specularlevel" {
-            set _settings($_current${what}) $_settings($what)
-            set val $_settings($what)
-            set val [expr {0.01*$val}]
-            foreach tag [GetDatasetsWithComponent $_current] {
-                SendCmd "volume shading specularLevel $val $tag"
-            }
-        }
         "-thickness" {
-            set val $_settings($what)
-            set _settings($_current${what}) $val
-            updateTransferFunctions
+            if { [array names _activeTfs] > 0 } {
+                set val $_settings($what)
+                # Scale values between 0.00001 and 0.01000
+                set sval [expr {0.0001*double($val)}]
+                foreach tf [array names _activeTfs] {
+                    set _settings($tf${what}) $sval
+                    set _activeTfs($tf) 0
+                }
+                updateTransferFunctions
+            }
         }
         "-volume" {
-            # This is the global volume visibility control.  It controls the
-            # visibility of all the volumes.  Whenever it's changed, you have
-            # to synchronize each of the local controls (see below) with this.
-            set datasets [CurrentDatasets]
-            set bool $_settings($what)
-            SendCmd "volume data state $bool $datasets"
-            foreach cname $_componentsList {
-                set _settings($cname-volumevisible) $bool
-            }
-            set _settings(-volumevisible) $bool
-        }
-        "-volumevisible" {
-            # This is the component specific control.  It changes the
-            # visibility of only the current component.
-            set _settings($_current${what}) $_settings($what)
-            foreach tag [GetDatasetsWithComponent $_current] {
-                SendCmd "volume data state $_settings($what) $tag"
-            }
+            set datasets [CurrentDatasets -cutplanes]
+            SendCmd "volume data state $_settings($what) $datasets"
         }
         "-xcutplaneposition" - "-ycutplaneposition" - "-zcutplaneposition" {
@@ -1356 +1377 @@
     set w [expr {$_width-20}]
     set h [expr {[winfo height $itk_component(legend)]-20-$lineht}]
-    if {$w > 0 && $h > 0 && $_first != "" } {
-        if { [info exists _cname2transferFunction($_current)] } {
-            SendCmd "legend $_current $w $h"
+    if {$w > 0 && $h > 0 && [array names _activeTfs] > 0 && $_first != "" } {
+        set tag [lindex [CurrentDatasets] 0]
+        if { [info exists _dataset2style($tag)] } {
+            SendCmd "legend $_dataset2style($tag) $w $h"
         }
     }
@@ -1372 +1394 @@
 # server parses the 3D data and sends back the limits via ReceiveData.]
 #
+#       FIXME: The current way we generate transfer-function names completely
+#              ignores the -markers option.  The problem is that we are forced
+#              to compute the name from an increasing complex set of values:
+#              color, levels, markers.
+#
 itcl::body Rappture::NanovisViewer::NameTransferFunction { dataobj cname } {
     array set style {
         -color BCGYR
         -levels 6
-        -markers ""
     }
     set tag $dataobj-$cname
     array set style [lindex [$dataobj components -style $cname] 0]
-    if { ![info exists _cname2transferFunction($cname)] } {
-        # Get the colormap right now, since it doesn't change with marker
-        # changes.
-        set cmap [ColorsToColormap $style(-color)]
-        set amap [list 0.0 0.0 1.0 1.0]
-        set _cname2transferFunction($cname) [list $cmap $amap]
-        SendCmd [list transfunc define $cname $cmap $amap]
-    }
-    SendCmd "volume shading transfunc $cname $tag"
-    if { ![info exists _transferFunctionEditors($cname)] } {
-        set _transferFunctionEditors($cname) \
-            [Rappture::TransferFunctionEditor ::\#auto $itk_component(legend) \
-                 $cname \
-                 -command [itcl::code $this updateTransferFunctions]]
-    }
-    return $cname
+    set tf "$style(-color):$style(-levels)"
+    set _dataset2style($tag) $tf
+    lappend _style2datasets($tf) $tag
+    return $tf
 }
 
@@ -1407 +1421 @@
 # the alpha map of the transfer function.
 #
-itcl::body Rappture::NanovisViewer::ComputeTransferFunction { cname } {
-    foreach {cmap amap} $_cname2transferFunction($cname) break
+itcl::body Rappture::NanovisViewer::ComputeTransferFunction { tf } {
+    array set style {
+        -color BCGYR
+        -levels 6
+    }
+
+    foreach {dataobj cname} [split [lindex $_style2datasets($tf) 0] -] break
+    array set style [lindex [$dataobj components -style $cname] 0]
 
     # We have to parse the style attributes for a volume using this
@@ -1416 +1436 @@
     # of the volumes (the first in the list) using the transfer-function as a
     # reference.
-    if { ![info exists _parsedFunction($cname)] } {
-        array set style {
-            -color BCGYR
-            -levels 6
-            -markers ""
-        }
-        # Accumulate the style from all the datasets using it.
-        foreach tag [GetDatasetsWithComponent $cname] {
-            foreach {dataobj cname} [split [lindex $tag 0] -] break
-            array set style [lindex [$dataobj components -style $cname] 0]
-        }
-        eval $_transferFunctionEditors($cname) limits $_limits($cname)
+    #
+    # FIXME: The current way we generate transfer-function names completely
+    #        ignores the -markers option.  The problem is that we are forced
+    #        to compute the name from an increasing complex set of values:
+    #        color, levels, markers.
+    if { ![info exists _isomarkers($tf)] } {
         # Have to defer creation of isomarkers until we have data limits
         if { [info exists style(-markers)] &&
              [llength $style(-markers)] > 0 } {
-            ParseMarkersOption $cname $style(-markers)
+            ParseMarkersOption $tf $style(-markers)
         } else {
-            ParseLevelsOption $cname $style(-levels)
-        }
-
-    }
-    set amap [ComputeAlphamap $cname]
-    set _cname2transferFunction($cname) [list $cmap $amap]
-    SendCmd [list transfunc define $cname $cmap $amap]
-}
-
-itcl::body Rappture::NanovisViewer::AddNewMarker { x y } {
-    if { ![info exists _transferFunctionEditors($_current)] } {
-        continue
-    }
-    # Add a new marker to the current transfer function
-    $_transferFunctionEditors($_current) newMarker $x $y normal
-    $itk_component(legend) itemconfigure labels -fill $itk_option(-plotforeground)
-}
-
-itcl::body Rappture::NanovisViewer::RemoveMarker { x y } {
-    if { ![info exists _transferFunctionEditors($_current)] } {
-        continue
-    }
-    # Add a new marker to the current transfer function
-    $_transferFunctionEditors($_current) deleteMarker $x $y
+            ParseLevelsOption $tf $style(-levels)
+        }
+    }
+    set cmap [ColorsToColormap $style(-color)]
+
+    # Transfer function should be normalized with [0,1] range
+    # The volume shading opacity setting is used to scale opacity
+    # in the volume shader.
+    set max 1.0
+
+    set isovalues {}
+    foreach m $_isomarkers($tf) {
+        lappend isovalues [$m relval]
+    }
+    # Sort the isovalues
+    set isovalues [lsort -real $isovalues]
+
+    if { ![info exists _settings($tf-thickness)]} {
+        set _settings($tf-thickness) 0.005
+    }
+    set delta $_settings($tf-thickness)
+
+    set first [lindex $isovalues 0]
+    set last [lindex $isovalues end]
+    set amap ""
+    if { $first == "" || $first != 0.0 } {
+        lappend amap 0.0 0.0
+    }
+    foreach x $isovalues {
+        set x1 [expr {$x-$delta-0.00001}]
+        set x2 [expr {$x-$delta}]
+        set x3 [expr {$x+$delta}]
+        set x4 [expr {$x+$delta+0.00001}]
+        if { $x1 < 0.0 } {
+            set x1 0.0
+        } elseif { $x1 > 1.0 } {
+            set x1 1.0
+        }
+        if { $x2 < 0.0 } {
+            set x2 0.0
+        } elseif { $x2 > 1.0 } {
+            set x2 1.0
+        }
+        if { $x3 < 0.0 } {
+            set x3 0.0
+        } elseif { $x3 > 1.0 } {
+            set x3 1.0
+        }
+        if { $x4 < 0.0 } {
+            set x4 0.0
+        } elseif { $x4 > 1.0 } {
+            set x4 1.0
+        }
+        # add spikes in the middle
+        lappend amap $x1 0.0
+        lappend amap $x2 $max
+        lappend amap $x3 $max
+        lappend amap $x4 0.0
+    }
+    if { $last == "" || $last != 1.0 } {
+        lappend amap 1.0 0.0
+    }
+    SendCmd "transfunc define $tf { $cmap } { $amap }"
 }
 
@@ -1508 +1561 @@
 # marker is a relative value from 0.0 to 1.0.
 #
-itcl::body Rappture::NanovisViewer::ParseLevelsOption { cname levels } {
+itcl::body Rappture::NanovisViewer::ParseLevelsOption { tf levels } {
     set c $itk_component(legend)
-    set list {}
     regsub -all "," $levels " " levels
     if {[string is int $levels]} {
         for {set i 1} { $i <= $levels } {incr i} {
-            lappend list [expr {double($i)/($levels+1)}]
+            set x [expr {double($i)/($levels+1)}]
+            set m [Rappture::IsoMarker \#auto $c $this $tf]
+            $itk_component(legend) itemconfigure labels -fill $itk_option(-plotforeground)
+            $m relval $x
+            lappend _isomarkers($tf) $m
         }
     } else {
         foreach x $levels {
-            lappend list $x
-        }
-    }
-    set _parsedFunction($cname) 1
-    $_transferFunctionEditors($cname) addMarkers $list
-    $itk_component(legend) itemconfigure labels -fill $itk_option(-plotforeground)
+            set m [Rappture::IsoMarker \#auto $c $this $tf]
+            $itk_component(legend) itemconfigure labels -fill $itk_option(-plotforeground)
+            $m relval $x
+            lappend _isomarkers($tf) $m
+        }
+    }
 }
 
@@ -1538 +1594 @@
 #       not be seen.
 #
-itcl::body Rappture::NanovisViewer::ParseMarkersOption { cname markers } {
+itcl::body Rappture::NanovisViewer::ParseMarkersOption { tf markers } {
     set c $itk_component(legend)
-    set list {}
-    foreach { min max } $_limits($cname) break
     regsub -all "," $markers " " markers
     foreach marker $markers {
         set n [scan $marker "%g%s" value suffix]
         if { $n == 2 && $suffix == "%" } {
-            # $n% : Set relative value (0..1).
-            lappend list [expr {$value * 0.01}]
+            # ${n}% : Set relative value.
+            set value [expr {$value * 0.01}]
+            set m [Rappture::IsoMarker \#auto $c $this $tf]
+            $itk_component(legend) itemconfigure labels -fill $itk_option(-plotforeground)
+            $m relval $value
+            lappend _isomarkers($tf) $m
         } else {
-            # $n : absolute value, compute relative
-            lappend list [expr {(double($value)-$min)/($max-$min)}]
-        }
-    }
-    set _parsedFunction($cname) 1
-    $_transferFunctionEditors($cname) addMarkers $list
-    $itk_component(legend) itemconfigure labels -fill $itk_option(-plotforeground)
+            # ${n} : Set absolute value.
+            set m [Rappture::IsoMarker \#auto $c $this $tf]
+            $itk_component(legend) itemconfigure labels -fill $itk_option(-plotforeground)
+            $m absval $value
+            lappend _isomarkers($tf) $m
+        }
+    }
 }
 
 itcl::body Rappture::NanovisViewer::updateTransferFunctions {} {
     $_dispatcher event -idle !send_transfunc
+}
+
+itcl::body Rappture::NanovisViewer::AddIsoMarker { x y } {
+    if { $_first == "" } {
+        error "active transfer function isn't set"
+    }
+    set tag [lindex [CurrentDatasets] 0]
+    set tf $_dataset2style($tag)
+    set c $itk_component(legend)
+    set m [Rappture::IsoMarker \#auto $c $this $tf]
+    $itk_component(legend) itemconfigure labels -fill $itk_option(-plotforeground)
+    set w [winfo width $c]
+    $m relval [expr {double($x-10)/($w-20)}]
+    lappend _isomarkers($tf) $m
+    updateTransferFunctions
+    return 1
+}
+
+itcl::body Rappture::NanovisViewer::removeDuplicateMarker { marker x } {
+    set tf [$marker transferfunc]
+    set bool 0
+    if { [info exists _isomarkers($tf)] } {
+        set list {}
+        set marker [namespace tail $marker]
+        foreach m $_isomarkers($tf) {
+            set sx [$m screenpos]
+            if { $m != $marker } {
+                if { $x >= ($sx-3) && $x <= ($sx+3) } {
+                    $marker relval [$m relval]
+                    itcl::delete object $m
+                    bell
+                    set bool 1
+                    continue
+                }
+            }
+            lappend list $m
+        }
+        set _isomarkers($tf) $list
+        updateTransferFunctions
+    }
+    return $bool
+}
+
+itcl::body Rappture::NanovisViewer::overMarker { marker x } {
+    set tf [$marker transferfunc]
+    if { [info exists _isomarkers($tf)] } {
+        set marker [namespace tail $marker]
+        foreach m $_isomarkers($tf) {
+            set sx [$m screenpos]
+            if { $m != $marker } {
+                set bool [expr { $x >= ($sx-3) && $x <= ($sx+3) }]
+                $m activate $bool
+            }
+        }
+    }
+    return ""
+}
+
+itcl::body Rappture::NanovisViewer::limits { tf } {
+    set _limits(min) 0.0
+    set _limits(max) 1.0
+    if { ![info exists _style2datasets($tf)] } {
+        return [array get _limits]
+    }
+    set min ""; set max ""
+    foreach tag $_style2datasets($tf) {
+        if { ![info exists _serverDatasets($tag)] } {
+            continue
+        }
+        if { ![info exists _limits($tag-min)] } {
+            continue
+        }
+        if { $min == "" || $min > $_limits($tag-min) } {
+            set min $_limits($tag-min)
+        }
+        if { $max == "" || $max < $_limits($tag-max) } {
+            set max $_limits($tag-max)
+        }
+    }
+    if { $min != "" } {
+        set _limits(min) $min
+    }
+    if { $max != "" } {
+        set _limits(max) $max
+    }
+    return [array get _limits]
 }
 
@@ -1636 +1780 @@
     #set bfg [option get $itk_component(hull) boldFont Font]
 
-    label $inner.lighting_l \
-        -text "Lighting / Material Properties" \
-        -font "Arial 9 bold"
+    checkbutton $inner.vol -text "Show volume" -font $fg \
+        -variable [itcl::scope _settings(-volume)] \
+        -command [itcl::code $this AdjustSetting -volume]
+    label $inner.shading -text "Shading:" -font $fg
 
     checkbutton $inner.isosurface -text "Isosurface shading" -font $fg \
@@ -1648 +1793 @@
         -command [itcl::code $this AdjustSetting -light2side]
 
-    checkbutton $inner.visibility -text "Visible" -font $fg \
-        -variable [itcl::scope _settings(-volumevisible)] \
-        -command [itcl::code $this AdjustSetting -volumevisible]
-
-    label $inner.ambient_l -text "Ambient" -font $fg
-    ::scale $inner.ambient -from 0 -to 100 -orient horizontal \
-        -variable [itcl::scope _settings(-ambient)] \
-        -showvalue off -command [itcl::code $this AdjustSetting -ambient] \
-        -troughcolor grey92
-
-    label $inner.diffuse_l -text "Diffuse" -font $fg
-    ::scale $inner.diffuse -from 0 -to 100 -orient horizontal \
-        -variable [itcl::scope _settings(-diffuse)] \
-        -showvalue off -command [itcl::code $this AdjustSetting -diffuse] \
-        -troughcolor grey92
-
-    label $inner.specularLevel_l -text "Specular" -font $fg
-    ::scale $inner.specularLevel -from 0 -to 100 -orient horizontal \
-        -variable [itcl::scope _settings(-specularlevel)] \
-        -showvalue off \
-        -command [itcl::code $this AdjustSetting -specularlevel] \
-        -troughcolor grey92
-
-    label $inner.specularExponent_l -text "Shininess" -font $fg
-    ::scale $inner.specularExponent -from 10 -to 128 -orient horizontal \
-        -variable [itcl::scope _settings(-specularexponent)] \
-        -showvalue off \
-        -command [itcl::code $this AdjustSetting -specularexponent] \
-        -troughcolor grey92
+    label $inner.dim -text "Glow" -font $fg
+    ::scale $inner.light -from 0 -to 100 -orient horizontal \
+        -variable [itcl::scope _settings(-light)] \
+        -width 10 \
+        -showvalue off -command [itcl::code $this AdjustSetting -light]
+    label $inner.bright -text "Surface" -font $fg
 
     # Opacity
-    label $inner.opacity_l -text "Opacity" -font $fg
+    label $inner.clear -text "Clear" -font $fg
     ::scale $inner.opacity -from 0 -to 100 -orient horizontal \
         -variable [itcl::scope _settings(-opacity)] \
-        -showvalue off -command [itcl::code $this AdjustSetting -opacity] \
-        -troughcolor grey92
-
-    label $inner.transferfunction_l \
-        -text "Transfer Function" -font "Arial 9 bold"
+        -width 10 \
+        -showvalue off -command [itcl::code $this AdjustSetting -opacity]
+    label $inner.opaque -text "Opaque" -font $fg
 
     # Tooth thickness
@@ -1692 +1812 @@
     ::scale $inner.thickness -from 0 -to 1000 -orient horizontal \
         -variable [itcl::scope _settings(-thickness)] \
-        -showvalue off -command [itcl::code $this AdjustSetting -thickness] \
-        -troughcolor grey92
+        -width 10 \
+        -showvalue off -command [itcl::code $this AdjustSetting -thickness]
     label $inner.thick -text "Thick" -font $fg
 
     # Colormap
-    label $inner.colormap_l -text "Colormap" -font $fg
+    label $inner.colormap_l -text "Colormap" -font "Arial 9"
     itk_component add colormap {
         Rappture::Combobox $inner.colormap -width 10 -editable no
     }
 
-    $inner.colormap choices insert end [GetColormapList -includeDefault -includeNone]
+    $inner.colormap choices insert end [GetColormapList -includeNone]
+    $itk_component(colormap) value "BCGYR"
     bind $inner.colormap <<Value>> \
         [itcl::code $this AdjustSetting -colormap]
-    $itk_component(colormap) value "default"
-    set _settings(-colormap) "default"
-
-    # Component
-    label $inner.volcomponents_l -text "Component" -font $fg
-    itk_component add volcomponents {
-        Rappture::Combobox $inner.volcomponents -editable no
-    }
-    bind $inner.volcomponents <<Value>> \
-        [itcl::code $this AdjustSetting -current]
 
     blt::table $inner \
-        0,0 $inner.volcomponents_l -anchor e -cspan 2 \
-        0,2 $inner.volcomponents -cspan 3 -fill x \
-        1,1 $inner.lighting_l -anchor w -cspan 4 \
-        2,1 $inner.ambient_l -anchor e \
-        2,2 $inner.ambient -cspan 3 -fill x \
-        3,1 $inner.diffuse_l -anchor e \
-        3,2 $inner.diffuse -cspan 3 -fill x \
-        4,1 $inner.specularLevel_l -anchor e \
-        4,2 $inner.specularLevel -cspan 3 -fill x \
-        5,1 $inner.specularExponent_l -anchor e \
-        5,2 $inner.specularExponent -cspan 3 -fill x \
-        6,1 $inner.light2side -cspan 3 -anchor w \
-        7,1 $inner.visibility -cspan 3 -anchor w \
-        8,1 $inner.transferfunction_l -anchor w -cspan 4 \
-        9,1 $inner.opacity_l -anchor e \
-        9,2 $inner.opacity -cspan 3 -fill x \
-        10,1 $inner.colormap_l -anchor e \
-        10,2 $inner.colormap -padx 2 -cspan 3 -fill x \
-        11,1 $inner.thin -anchor e \
-        11,2 $inner.thickness -cspan 2 -fill x \
-        11,4 $inner.thick -anchor w
-
-    blt::table configure $inner c* r* -resize none
-    blt::table configure $inner r* -pady { 2 0 }
-    blt::table configure $inner c2 c3 r12 -resize expand
-    blt::table configure $inner c0 -width .1i
+        0,0 $inner.vol -cspan 4 -anchor w -pady 2 \
+        1,0 $inner.shading -cspan 4 -anchor w -pady {10 2} \
+        2,0 $inner.light2side -cspan 4 -anchor w -pady 2 \
+        3,0 $inner.dim -anchor e -pady 2 \
+        3,1 $inner.light -cspan 2 -pady 2 -fill x \
+        3,3 $inner.bright -anchor w -pady 2 \
+        4,0 $inner.clear -anchor e -pady 2 \
+        4,1 $inner.opacity -cspan 2 -pady 2 -fill x \
+        4,3 $inner.opaque -anchor w -pady 2 \
+        5,0 $inner.thin -anchor e -pady 2 \
+        5,1 $inner.thickness -cspan 2 -pady 2 -fill x\
+        5,3 $inner.thick -anchor w -pady 2
+
+    blt::table configure $inner c0 c1 c3 r* -resize none
+    blt::table configure $inner r6 -resize expand
 }
 
@@ -1767 +1867 @@
     Rappture::Tooltip::for $itk_component(xCutButton) \
         "Toggle the X cut plane on/off"
-    $itk_component(xCutButton) select
+    #$itk_component(xCutButton) select
 
     itk_component add xCutScale {
@@ -1795 +1895 @@
     Rappture::Tooltip::for $itk_component(yCutButton) \
         "Toggle the Y cut plane on/off"
-    $itk_component(yCutButton) select
+    #$itk_component(yCutButton) select
 
     itk_component add yCutScale {
@@ -1823 +1923 @@
     Rappture::Tooltip::for $itk_component(zCutButton) \
         "Toggle the Z cut plane on/off"
-    $itk_component(zCutButton) select
+    #$itk_component(zCutButton) select
 
     itk_component add zCutScale {
@@ -1841 +1941 @@
 
     blt::table $inner \
-        0,1 $inner.visible -anchor w -pady 2 -cspan 4 \
-        1,1 $itk_component(xCutScale) \
-        1,2 $itk_component(yCutScale) \
-        1,3 $itk_component(zCutScale) \
-        2,1 $itk_component(xCutButton) \
-        2,2 $itk_component(yCutButton) \
-        2,3 $itk_component(zCutButton)
+        0,1 $itk_component(xCutScale) \
+        0,2 $itk_component(yCutScale) \
+        0,3 $itk_component(zCutScale) \
+        1,1 $itk_component(xCutButton) \
+        1,2 $itk_component(yCutButton) \
+        1,3 $itk_component(zCutButton)
+
+    #    0,1 $inner.visible -anchor w -pady 2 -cspan 4 \
 
     blt::table configure $inner r0 r1 r2 c* -resize none
@@ -1998 +2099 @@
     # VTK file.  To download all components/results, we would need
     # to put them in an archive (e.g. zip or tar file)
-    if { $_first != "" && $_current != "" } {
-        set bytes [$_first vtkdata $_current]
+    if { $_first != ""} {
+        set cname [lindex [$_first components] 0]
+        set bytes [$_first vtkdata $cname]
         return [list .vtk $bytes]
     }
@@ -2083 +2185 @@
     set _settings(-zoom) $_view(-zoom)
 }
-
-#
-# InitComponentSettings --
-#
-# Initializes the volume settings for a specific component. This should
-# match what's used as global settings above. This is called the first
-# time we try to switch to a given component in SwitchComponent below.
-#
-itcl::body Rappture::NanovisViewer::InitComponentSettings { cname } {
-    foreach {key value} {
-        -ambient           60
-        -colormap          "default"
-        -diffuse           40
-        -light2side        1
-        -opacity           50
-        -specularexponent  90
-        -specularlevel     30
-        -thickness         350
-        -volumevisible     1
-    } {
-        set _settings($cname${key}) $value
-    }
-}
-
-#
-# SwitchComponent --
-#
-# This is called when the current component is changed by the dropdown
-# menu in the volume tab.  It synchronizes the global volume settings
-# with the settings of the new current component.
-#
-itcl::body Rappture::NanovisViewer::SwitchComponent { cname } {
-    if { ![info exists _settings($cname-ambient)] } {
-        InitComponentSettings $cname
-    }
-    # _settings variables change widgets, except for colormap
-    set _settings(-ambient)          $_settings($cname-ambient)
-    set _settings(-colormap)         $_settings($cname-colormap)
-    set _settings(-diffuse)          $_settings($cname-diffuse)
-    set _settings(-light2side)       $_settings($cname-light2side)
-    set _settings(-opacity)          $_settings($cname-opacity)
-    set _settings(-specularexponent) $_settings($cname-specularexponent)
-    set _settings(-specularlevel)    $_settings($cname-specularlevel)
-    set _settings(-thickness)        $_settings($cname-thickness)
-    set _settings(-volumevisible)    $_settings($cname-volumevisible)
-    $itk_component(colormap) value   $_settings($cname-colormap)
-    set _current $cname;                # Reset the current component
-}
-
-#
-# BuildVolumeComponents --
-#
-# This is called from the "scale" method which is called when a new
-# dataset is added or deleted.  It repopulates the dropdown menu of
-# volume component names.  It sets the current component to the first
-# component in the list (of components found).  Finally, if there is
-# only one component, don't display the label or the combobox in the
-# volume settings tab.
-#
-itcl::body Rappture::NanovisViewer::BuildVolumeComponents {} {
-    $itk_component(volcomponents) choices delete 0 end
-    foreach name $_componentsList {
-        $itk_component(volcomponents) choices insert end $name $name
-    }
-    set _current [lindex $_componentsList 0]
-    $itk_component(volcomponents) value $_current
-    set parent [winfo parent $itk_component(volcomponents)]
-    if { [llength $_componentsList] <= 1 } {
-        # Unpack the components label and dropdown if there's only one
-        # component.
-        blt::table forget $parent.volcomponents_l $parent.volcomponents
-    } else {
-        # Pack the components label and dropdown into the table there's
-        # more than one component to select.
-        blt::table $parent \
-            0,0 $parent.volcomponents_l -anchor e -cspan 2 \
-            0,2 $parent.volcomponents -cspan 3 -fill x
-    }
-}
-
-#
-# GetDatasetsWithComponents --
-#
-# Returns a list of all the datasets (known by the combination of their
-# data object and component name) that match the given component name.
-# For example, this is used where we want to change the settings of
-# volumes that have the current component.
-#
-itcl::body Rappture::NanovisViewer::GetDatasetsWithComponent { cname } {
-    if { ![info exists _volcomponents($cname)] } {
-        return ""
-    }
-    set list ""
-    foreach tag $_volcomponents($cname) {
-        if { ![info exists _datasets($tag)] } {
-            continue
-        }
-        lappend list $tag
-    }
-    return $list
-}
-
-#
-# HideAllMarkers --
-#
-# Hide all the markers in all the transfer functions.  Can't simply
-# delete and recreate markers from the <style> since the user may have
-# created, deleted, or moved markers.
-#
-itcl::body Rappture::NanovisViewer::HideAllMarkers {} {
-    foreach cname [array names _transferFunctionEditors] {
-        $_transferFunctionEditors($cname) hideMarkers
-    }
-}
-
-itcl::body Rappture::NanovisViewer::GetColormap { cname color } {
-    if { $color == "default" } {
-        return $_cname2defaultcolormap($cname)
-    }
-    return [ColorsToColormap $color]
-}
-
-itcl::body Rappture::NanovisViewer::ResetColormap { cname color } {
-    # Get the current transfer function
-    if { ![info exists _cname2transferFunction($cname)] } {
-        return
-    }
-    foreach { cmap amap } $_cname2transferFunction($cname) break
-    set cmap [GetColormap $cname $color]
-    set _cname2transferFunction($cname) [list $cmap $amap]
-    SendCmd [list transfunc define $cname $cmap $amap]
-    EventuallyRedrawLegend
-}
-
-itcl::body Rappture::NanovisViewer::ComputeAlphamap { cname } {
-    if { ![info exists _transferFunctionEditors($cname)] } {
-        return [list 0.0 0.0 1.0 1.0]
-    }
-    if { ![info exists _settings($cname-ambient)] } {
-        InitComponentSettings $cname
-    }
-
-    set isovalues [$_transferFunctionEditors($cname) values]
-
-    # Transfer function should be normalized with [0,1] range
-    # The volume shading opacity setting is used to scale opacity
-    # in the volume shader.
-    set max 1.0
-
-    # Use the component-wise thickness setting from the slider
-    # settings widget
-    # Scale values between 0.00001 and 0.01000
-    set delta [expr {double($_settings($cname-thickness)) * 0.0001}]
-
-    set first [lindex $isovalues 0]
-    set last [lindex $isovalues end]
-    set amap ""
-    if { $first == "" || $first != 0.0 } {
-        lappend amap 0.0 0.0
-    }
-    foreach x $isovalues {
-        set x1 [expr {$x-$delta-0.00001}]
-        set x2 [expr {$x-$delta}]
-        set x3 [expr {$x+$delta}]
-        set x4 [expr {$x+$delta+0.00001}]
-        if { $x1 < 0.0 } {
-            set x1 0.0
-        } elseif { $x1 > 1.0 } {
-            set x1 1.0
-        }
-        if { $x2 < 0.0 } {
-            set x2 0.0
-        } elseif { $x2 > 1.0 } {
-            set x2 1.0
-        }
-        if { $x3 < 0.0 } {
-            set x3 0.0
-        } elseif { $x3 > 1.0 } {
-            set x3 1.0
-        }
-        if { $x4 < 0.0 } {
-            set x4 0.0
-        } elseif { $x4 > 1.0 } {
-            set x4 1.0
-        }
-        # add spikes in the middle
-        lappend amap $x1 0.0
-        lappend amap $x2 $max
-        lappend amap $x3 $max
-        lappend amap $x4 0.0
-    }
-    if { $last == "" || $last != 1.0 } {
-        lappend amap 1.0 0.0
-    }
-    return $amap
-}
-
-itcl::body Rappture::NanovisViewer::SetObjectStyle { dataobj cname } {
-    array set style {
-        -opacity 0.5
-    }
-    array set style [lindex [$dataobj components -style $cname] 0]
-    # Some tools erroneously set -opacity to 1 in style, so
-    # override the requested opacity for now
-    set style(-opacity) 0.5
-    set _settings($cname-opacity) [expr $style(-opacity) * 100.0]
-    set tag $dataobj-$cname
-    SendCmd "volume shading opacity $style(-opacity) $tag"
-    NameTransferFunction $dataobj $cname
-}

trunk/gui/scripts/vtkvolumeviewer.tcl

@@ -62 +62 @@
     }
     public method scale {args}
-    public method updateTransferFunctions {}
 
     # The following methods are only used by this class.
-    private method AddNewMarker { x y }
     private method AdjustSetting {what {value ""}}
     private method BuildAxisTab {}
     private method BuildCameraTab {}
+    private method BuildColormap { name colors }
     private method BuildCutplanesTab {}
     private method BuildDownloadPopup { widget command }
     private method BuildViewTab {}
-    private method BuildVolumeComponents {}
     private method BuildVolumeTab {}
-    private method ComputeAlphamap { cname }
-    private method ComputeTransferFunction { cname }
+    private method ChangeColormap { dataobj comp color }
     private method Connect {}
     private method CurrentDatasets {args}
@@ -87 +84 @@
     private method EventuallyRotate { q }
     private method EventuallySetCutplane { axis args }
-    private method GetColormap { cname color }
     private method GetDatasetsWithComponent { cname }
     private method GetImage { args }
     private method GetVtkData { args }
-    private method HideAllMarkers {}
-    private method InitComponentSettings { cname }
     private method InitSettings { args }
     private method IsValidObject { dataobj }
@@ -100 +94 @@
     private method Pan {option x y}
     private method PanCamera {}
-    private method ParseLevelsOption { cname levels }
-    private method ParseMarkersOption { cname markers }
     private method Pick {x y}
     private method QuaternionToView { q } {
@@ -110 +102 @@
     private method ReceiveImage { args }
     private method ReceiveLegend { colormap title min max size }
-    private method RemoveMarker { x y }
     private method RequestLegend {}
-    private method ResetColormap { cname color }
     private method Rotate {option x y}
-    private method SendTransferFunctions {}
+    private method SetColormap { dataobj comp }
     private method SetCurrentFieldName { dataobj }
-    private method SetInitialTransferFunction { dataobj cname }
     private method SetLegendTip { x y }
     private method SetObjectStyle { dataobj cname }
     private method SetOrientation { side }
     private method Slice {option args}
-    private method SwitchComponent { cname }
     private method ViewToQuaternion {} {
         return [list $_view(-qw) $_view(-qx) $_view(-qy) $_view(-qz)]
@@ -127 +115 @@
     private method Zoom {option}
 
-    private variable _alphamap
     private variable _arcball ""
     private variable _dlist "";         # list of data objects
@@ -141 +128 @@
     private variable _limits;           # Autoscale min/max for all axes
     private variable _view;             # View params for 3D view
-    private variable _parsedFunction
-    private variable _transferFunctionEditors
     private variable _settings
+    private variable _style;            # Array of current component styles.
+    private variable _initialStyle;     # Array of initial component styles.
 
     private variable _start 0
@@ -155 +142 @@
 
     private variable _first "";         # This is the topmost dataset.
-    private variable _current "";       # Currently selected component
     private variable _volcomponents;    # Maps component name to list of
                                         # dataobj-component tags
     private variable _componentsList;   # List of components found
-    private variable _cname2transferFunction
-    private variable _cname2defaultcolormap
 
     private variable _width 0
@@ -245 +229 @@
         -axismode               "static"
         -background             black
-        -color                  "default"
+        -color                  BCGYR
         -cutplanelighting       1
         -cutplaneopacity        100
         -cutplanesvisible       0
         -legendvisible          1
-        -volumeambient          40
-        -volumeblendmode        composite
-        -volumediffuse          60
         -volumelighting         1
+        -volumematerial         80
         -volumeopacity          50
         -volumeoutline          0
         -volumequality          80
-        -volumespecularexponent 90
-        -volumespecularlevel    30
-        -volumethickness        350
         -volumevisible          1
         -xcutplaneposition      50
@@ -374 +353 @@
     set _image(legend) [image create photo]
     itk_component add legend {
-        canvas $itk_component(plotarea).legend -height 50 -highlightthickness 0
+        canvas $itk_component(plotarea).legend -width 50 -highlightthickness 0
     } {
         usual
@@ -380 +359 @@
         rename -background -plotbackground plotBackground Background
     }
-    bind $itk_component(legend) <KeyPress-Delete> \
-        [itcl::code $this RemoveMarker %x %y]
-    bind $itk_component(legend) <Enter> \
-        [list focus $itk_component(legend)]
 
     # Hack around the Tk panewindow.  The problem is that the requested
@@ -391 +366 @@
     pack forget $itk_component(view)
     blt::table $itk_component(plotarea) \
-        0,0 $itk_component(view) -fill both -reqwidth $w \
-        1,0 $itk_component(legend) -fill x
-    blt::table configure $itk_component(plotarea) r1 -resize none
+        0,0 $itk_component(view) -fill both -reqwidth $w
+    blt::table configure $itk_component(plotarea) c1 -resize none
 
     # Bindings for rotation via mouse
@@ -729 +703 @@
         }
     }
-    BuildVolumeComponents
-    updateTransferFunctions
 }
 
@@ -872 +844 @@
     array unset _colormaps
     array unset _dataset2style
-
-    array unset _parsedFunction
-    array unset _cname2transferFunction
 
     set _resizePending 0
@@ -1068 +1037 @@
     InitSettings -color \
         -volumevisible \
-        -volumeambient -volumediffuse -volumespecularlevel \
-        -volumespecularexponent -volumeblendmode -volumethickness \
+        -volumematerial \
         -volumelighting -volumeopacity -volumequality -volumeoutline \
         -cutplanesvisible \
@@ -1349 +1317 @@
             set color [$itk_component(colormap) value]
             set _settings($what) $color
-            set _settings($_current${what}) $color
-            ResetColormap $_current $color
-        }
-        "-current" {
-            set cname [$itk_component(volcomponents) value]
-            SwitchComponent $cname
+            foreach dataset [CurrentDatasets -visible $_first] {
+                foreach {dataobj comp} [split $dataset -] break
+                ChangeColormap $dataobj $comp $color
+            }
+            EventuallyRequestLegend
         }
         "-cutplanelighting" {
@@ -1416 +1383 @@
         }
         "-legendvisible" {
-            set bool $_settings($what)
-            if { $bool } {
-                blt::table $itk_component(plotarea) \
-                    1,0 $itk_component(legend) -fill x
-            } else {
-                blt::table forget $itk_component(legend)
-            }
-        }
-        "-volumeambient" {
-            # Other parts of the code use the -volumeambient setting to
-            # tell if the component settings have been initialized
-            if { ![info exists _settings($_current${what})] } {
-                InitComponentSettings $_current
-            }
+            DrawLegend
+        }
+        "-volumematerial" {
             set val $_settings($what)
-            set _settings($_current${what}) $val
-            set ambient [expr {0.01*$val}]
-            foreach tag [GetDatasetsWithComponent $_current] {
-                SendCmd "volume shading ambient $ambient $tag"
-            }
-        }
-        "-volumeblendmode" {
-            set val [$itk_component(blendmode) value]
-            set mode [$itk_component(blendmode) translate $val]
-            set _settings($what) $mode
-            set _settings($_current${what}) $mode
-            foreach tag [GetDatasetsWithComponent $_current] {
-                SendCmd "volume blendmode $mode $tag"
-            }
-        }
-        "-volumediffuse" {
-            set val $_settings($what)
-            set _settings($_current${what}) $val
             set diffuse [expr {0.01*$val}]
-            foreach tag [GetDatasetsWithComponent $_current] {
+            set specular [expr {0.01*$val}]
+            #set power [expr {sqrt(160*$val+1.0)}]
+            set power [expr {$val+1.0}]
+            foreach tag [CurrentDatasets -visible] {
                 SendCmd "volume shading diffuse $diffuse $tag"
+                SendCmd "volume shading specular $specular $power $tag"
             }
         }
         "-volumelighting" {
             set bool $_settings($what)
-            set _settings($_current${what}) $bool
-            foreach tag [GetDatasetsWithComponent $_current] {
+            foreach tag [CurrentDatasets -visible] {
                 SendCmd "volume lighting $bool $tag"
             }
@@ -1463 +1404 @@
         "-volumeopacity" {
             set val $_settings($what)
-            set _settings($_current${what}) $val
             set val [expr {0.01*$val}]
-            foreach tag [GetDatasetsWithComponent $_current] {
+            foreach tag [CurrentDatasets -visible] {
                 SendCmd "volume opacity $val $tag"
             }
@@ -1472 +1412 @@
             set bool $_settings($what)
             SendCmd "outline visible 0"
-            foreach tag [GetDatasetsWithComponent $_current] {
+            foreach tag [CurrentDatasets -visible] {
                 SendCmd "outline visible $bool $tag"
             }
@@ -1478 +1418 @@
         "-volumequality" {
             set val $_settings($what)
-            set _settings($_current${what}) $val
             set val [expr {0.01*$val}]
-            foreach tag [GetDatasetsWithComponent $_current] {
+            foreach tag [CurrentDatasets -visible] {
                 SendCmd "volume quality $val $tag"
             }
-        }
-        "-volumespecularlevel" - "-volumespecularexponent" {
-            set val $_settings($what)
-            set _settings($_current${what}) $val
-            set level [expr {0.01*$val}]
-            set exp $_settings($what)
-            foreach tag [GetDatasetsWithComponent $_current] {
-                SendCmd "volume shading specular $level $exp $tag"
-            }
-        }
-        "-volumethickness" {
-            set _settings($_current${what}) $_settings($what)
-            updateTransferFunctions
         }
         "-volumevisible" {
             set bool $_settings($what)
-            set _settings($_current${what}) $bool
-            # Only the data objects in the array _obj2ovride(*-raise) are
-            # in the working set and can be displayed on screen. The global
-            # volume control determines whether they are visible.
-            #
-            # Note: The use of the current component is a hold over from
-            #       nanovis.  If we can't display more than one volume,
-            #       we don't have to limit the effects to a specific
-            #       component.
-            foreach tag [GetDatasetsWithComponent $_current] {
-                foreach {dataobj cname} [split $tag -] break
-                if { [info exists _obj2ovride($dataobj-raise)] } {
-                    SendCmd "volume visible $bool $tag"
-                }
+            foreach tag [CurrentDatasets -visible] {
+                SendCmd "volume visible $bool $tag"
             }
             if { $bool } {
@@ -1564 +1478 @@
     set _legendPending 0
     set font "Arial 8"
-    set lineht [font metrics $itk_option(-font) -linespace]
-    set c $itk_component(legend)
-    set w [winfo width $c]
-    set h [winfo height $c]
-    set h [expr {$h-$lineht-20}]
-    set w [expr {$w-20}]
+    set lineht [font metrics $font -linespace]
+    set w 12
+    set h [expr {$_height - 3 * ($lineht + 2)}]
+    if { $h < 1 } {
+        return
+    }
     # Set the legend on the first dataset.
     foreach dataset [CurrentDatasets -visible $_first] {
@@ -1579 +1493 @@
         }
     }
+}
+
+#
+# ChangeColormap --
+#
+itcl::body Rappture::VtkVolumeViewer::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::VtkVolumeViewer::SetColormap { dataobj comp } {
+    array set style {
+        -color BCGYR
+        -levels 6
+    }
+    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)"
+    if { ![info exists _colormaps($name)] } {
+        BuildColormap $name [array get style]
+        set _colormaps($name) 1
+    }
+    if { ![info exists _dataset2style($tag)] ||
+         $_dataset2style($tag) != $name } {
+        SendCmd "volume colormap $name $tag"
+        SendCmd "$_cutplaneCmd colormap $name-opaque $tag"
+        set _dataset2style($tag) $name
+    }
+}
+
+#
+# BuildColormap --
+#
+# Alpha map is in the format: normalized_value opacity midpoint sharpness
+#
+itcl::body Rappture::VtkVolumeViewer::BuildColormap { name styles } {
+    array set style $styles
+    set cmap [ColorsToColormap $style(-color)]
+    if { [llength $cmap] == 0 } {
+        set cmap "0.0 0.0 0.0 0.0 1.0 1.0 1.0 1.0"
+    }
+
+    set amap "0.0 0.0 0.5 0.0 1.0 1.0 0.5 0.0"
+    set opaqueAmap "0.0 1.0 1.0 1.0"
+    SendCmd [list colormap define $name $cmap -spline $amap]
+    SendCmd [list colormap define $name-opaque $cmap $opaqueAmap]
 }
 
@@ -1675 +1657 @@
     $inner configure -borderwidth 4
 
-    label $inner.volcomponents_l -text "Component" -font $font
-    itk_component add volcomponents {
-        Rappture::Combobox $inner.volcomponents -editable 0
-    }
-    bind $inner.volcomponents <<Value>> \
-        [itcl::code $this AdjustSetting -current]
-
     checkbutton $inner.visibility \
         -text "Visible" \
@@ -1688 +1663 @@
         -command [itcl::code $this AdjustSetting -volumevisible]
 
-    label $inner.lighting_l \
-        -text "Lighting / Material Properties" \
-        -font $bfont
-
     checkbutton $inner.lighting \
         -text "Enable Lighting" \
@@ -1698 +1669 @@
         -command [itcl::code $this AdjustSetting -volumelighting]
 
-    label $inner.ambient_l \
-        -text "Ambient" \
-        -font $font
-    ::scale $inner.ambient -from 0 -to 100 -orient horizontal \
-        -variable [itcl::scope _settings(-volumeambient)] \
+    label $inner.dim_l -text "Dim" -font $font
+    ::scale $inner.material -from 0 -to 100 -orient horizontal \
+        -variable [itcl::scope _settings(-volumematerial)] \
         -showvalue off \
-        -command [itcl::code $this AdjustSetting -volumeambient] \
-        -troughcolor grey92
-
-    label $inner.diffuse_l -text "Diffuse" -font $font
-    ::scale $inner.diffuse -from 0 -to 100 -orient horizontal \
-        -variable [itcl::scope _settings(-volumediffuse)] \
-        -showvalue off \
-        -command [itcl::code $this AdjustSetting -volumediffuse] \
-        -troughcolor grey92
-
-    label $inner.specularLevel_l -text "Specular" -font $font
-    ::scale $inner.specularLevel -from 0 -to 100 -orient horizontal \
-        -variable [itcl::scope _settings(-volumespecularlevel)] \
-        -showvalue off \
-        -command [itcl::code $this AdjustSetting -volumespecularlevel] \
-        -troughcolor grey92
-
-    label $inner.specularExponent_l -text "Shininess" -font $font
-    ::scale $inner.specularExponent -from 10 -to 128 -orient horizontal \
-        -variable [itcl::scope _settings(-volumespecularexponent)] \
-        -showvalue off \
-        -command [itcl::code $this AdjustSetting -volumespecularexponent] \
-        -troughcolor grey92
+        -command [itcl::code $this AdjustSetting -volumematerial]
+    label $inner.bright_l -text "Bright" -font $font
 
     label $inner.opacity_l -text "Opacity" -font $font
@@ -1732 +1680 @@
         -variable [itcl::scope _settings(-volumeopacity)] \
         -showvalue off \
-        -command [itcl::code $this AdjustSetting -volumeopacity] \
-        -troughcolor grey92
+        -command [itcl::code $this AdjustSetting -volumeopacity]
 
     label $inner.quality_l -text "Quality" -font $font
@@ -1739 +1686 @@
         -variable [itcl::scope _settings(-volumequality)] \
         -showvalue off \
-        -command [itcl::code $this AdjustSetting -volumequality] \
-        -troughcolor grey92
+        -command [itcl::code $this AdjustSetting -volumequality]
 
     label $inner.field_l -text "Field" -font $font
@@ -1749 +1695 @@
         [itcl::code $this AdjustSetting -field]
 
-    label $inner.transferfunction_l \
-        -text "Transfer Function" -font $bfont
-
-    label $inner.thin -text "Thin" -font $font
-    ::scale $inner.thickness -from 0 -to 1000 -orient horizontal \
-        -variable [itcl::scope _settings(-volumethickness)] \
-        -showvalue off \
-        -command [itcl::code $this AdjustSetting -volumethickness] \
-        -troughcolor grey92
-
-    label $inner.thick -text "Thick" -font $font
-    $inner.thickness set $_settings(-volumethickness)
-
     label $inner.colormap_l -text "Colormap" -font $font
     itk_component add colormap {
-        Rappture::Combobox $inner.colormap -width 10 -editable 0
-    }
-    $inner.colormap choices insert end [GetColormapList -includeDefault]
-
+        Rappture::Combobox $inner.colormap -editable 0
+    }
+    $inner.colormap choices insert end [GetColormapList]
     bind $inner.colormap <<Value>> \
         [itcl::code $this AdjustSetting -color]
     $itk_component(colormap) value $_settings(-color)
 
-    label $inner.blendmode_l -text "Blend Mode" -font $font
-    itk_component add blendmode {
-        Rappture::Combobox $inner.blendmode -editable 0
-    }
-    $inner.blendmode choices insert end \
-        "composite"     "Composite"         \
-        "max_intensity" "Maximum Intensity" \
-        "additive"      "Additive"
-
-    $itk_component(blendmode) value \
-        "[$itk_component(blendmode) label $_settings(-volumeblendmode)]"
-    bind $inner.blendmode <<Value>> \
-        [itcl::code $this AdjustSetting -volumeblendmode]
-
     blt::table $inner \
-        0,0 $inner.volcomponents_l -anchor e -cspan 2 \
-        0,2 $inner.volcomponents -cspan 3 -fill x \
-        1,0 $inner.field_l -anchor e -cspan 2  \
-        1,2 $inner.field -cspan 3 -fill x \
-        2,0 $inner.lighting_l -anchor w -cspan 4 \
-        3,1 $inner.lighting -anchor w -cspan 3 \
-        4,1 $inner.ambient_l -anchor e \
-        4,2 $inner.ambient -cspan 3 -fill x \
-        5,1 $inner.diffuse_l -anchor e \
-        5,2 $inner.diffuse -cspan 3 -fill x \
-        6,1 $inner.specularLevel_l -anchor e \
-        6,2 $inner.specularLevel -cspan 3 -fill x \
-        7,1 $inner.specularExponent_l -anchor e \
-        7,2 $inner.specularExponent -cspan 3 -fill x \
-        8,1 $inner.visibility -anchor w -cspan 3 \
-        9,1 $inner.quality_l -anchor e \
-        9,2 $inner.quality -cspan 3 -fill x \
-        10,0 $inner.transferfunction_l -anchor w -cspan 4 \
-        11,1 $inner.opacity_l -anchor e \
-        11,2 $inner.opacity -cspan 3 -fill x \
-        12,1 $inner.colormap_l -anchor e \
-        12,2 $inner.colormap -padx 2 -cspan 3 -fill x \
-        13,1 $inner.blendmode_l -anchor e \
-        13,2 $inner.blendmode -padx 2 -cspan 3 -fill x \
-        14,1 $inner.thin -anchor e \
-        14,2 $inner.thickness -cspan 2 -fill x \
-        14,4 $inner.thick -anchor w
-
-    blt::table configure $inner r* c* -resize none
-    blt::table configure $inner r* -pady { 2 0 }
-    blt::table configure $inner c2 c3 r15 -resize expand
-    blt::table configure $inner c0 -width .1i
+        0,0 $inner.field_l -anchor w -pady 2 \
+        0,1 $inner.field -fill x -pady 2 -cspan 3 \
+        1,0 $inner.visibility -anchor w -pady 2 -cspan 4 \
+        2,0 $inner.lighting -anchor w -pady 2 -cspan 4 \
+        3,0 $inner.dim_l -anchor e -pady 2 \
+        3,1 $inner.material -fill x -pady 2 -cspan 2 \
+        3,3 $inner.bright_l -anchor w -pady 2 \
+        4,0 $inner.opacity_l -anchor w -pady 2 -cspan 4 \
+        5,0 $inner.opacity -fill x -pady 2 -cspan 4 \
+        6,0 $inner.quality_l -anchor w -pady 2 -cspan 4 \
+        7,0 $inner.quality -fill x -pady 2 -cspan 4 \
+        8,0 $inner.colormap_l -anchor w -pady 2 \
+        8,1 $inner.colormap -fill x -pady 2 -cspan 3
+
+    blt::table configure $inner r* c0 c1 c3 -resize none
+    blt::table configure $inner r9 c2 -resize expand
 }
 
@@ -2183 +2085 @@
     }
     array set style [$dataobj style $cname]
-    set _settings($cname-volumelighting) $style(-lighting)
-    set _settings($cname-volumeopacity) [expr $style(-opacity) * 100]
-    set _settings($cname-volumeoutline) $style(-outline)
-    set _settings($cname-volumevisible) $style(-visible)
+    set _settings(-volumelighting) $style(-lighting)
+    set _settings(-volumeopacity) [expr $style(-opacity) * 100.0]
+    set _settings(-volumeoutline) $style(-outline)
+    set _settings(-volumevisible) $style(-visible)
 
     $itk_component(colormap) value $style(-color)
@@ -2202 +2104 @@
     SendCmd "volume opacity $style(-opacity) $tag"
     SendCmd "volume visible $style(-visible) $tag"
-
-    SetInitialTransferFunction $dataobj $cname
-    SendCmd "volume colormap $cname $tag"
-    SendCmd "$_cutplaneCmd colormap $cname-opaque $tag"
+    SetColormap $dataobj $cname
 }
 
@@ -2240 +2139 @@
 #
 itcl::body Rappture::VtkVolumeViewer::DrawLegend {} {
-    if { $_current == "" } {
-        set _current "component"
-    }
-    set cname $_current
-    set c $itk_component(legend)
+    set fname $_curFldName
+    set c $itk_component(view)
     set w [winfo width $c]
     set h [winfo height $c]
-    set lx 10
-    set ly [expr {$h - 1}]
-    if {"" == [$c find withtag colorbar]} {
-        $c create image 10 10 -anchor nw \
-            -image $_image(legend) -tags colorbar
-        $c create text $lx $ly -anchor sw \
-            -fill $itk_option(-plotforeground) -tags "limits text vmin"
-        $c create text [expr {$w-$lx}] $ly -anchor se \
-            -fill $itk_option(-plotforeground) -tags "limits text vmax"
-        $c create text [expr {$w/2}] $ly -anchor s \
-            -fill $itk_option(-plotforeground) -tags "limits text title"
-        $c lower colorbar
-        $c bind colorbar <ButtonRelease-1> [itcl::code $this AddNewMarker %x %y]
-    }
-
-    # Display the markers used by the current transfer function.
-    HideAllMarkers
-    if { [info exists _transferFunctionEditors($cname)] } {
-        $_transferFunctionEditors($cname) showMarkers $_limits($cname)
-    }
-
-    foreach {min max} $_limits($cname) break
-    $c itemconfigure vmin -text [format %g $min]
-    $c coords vmin $lx $ly
-
-    $c itemconfigure vmax -text [format %g $max]
-    $c coords vmax [expr {$w-$lx}] $ly
-
-    set title ""
-    if { $_first != "" } {
-        set title [$_first hints label]
-        set units [$_first hints units]
+    set font "Arial 8"
+    set lineht [font metrics $font -linespace]
+
+    if { !$_settings(-legendvisible) } {
+        $c delete legend
+        return
+    }
+
+    if { [info exists _fields($fname)] } {
+        foreach { title units } $_fields($fname) break
         if { $units != "" } {
-            set title "$title ($units)"
-        }
-    }
+            set title [format "%s (%s)" $title $units]
+        }
+    } else {
+        set title $fname
+    }
+
+    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 LegendTitleAction post]
+    $c bind title <Enter> [itcl::code $this LegendTitleAction enter]
+    $c bind title <Leave> [itcl::code $this LegendTitleAction leave]
+    # Reset the item coordinates according the current size of the plot.
     $c itemconfigure title -text $title
-    $c coords title [expr {$w/2}] $ly
+    if { [info exists _limits($_curFldName)] } {
+        foreach { vmin vmax } $_limits($_curFldName) break
+        $c itemconfigure vmin -text [format %g $vmin]
+        $c itemconfigure vmax -text [format %g $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}]
 }
 
@@ -2430 +2346 @@
 }
 
-#
-# The -levels option takes a single value that represents the number
-# of evenly distributed markers based on the current data range. Each
-# marker is a relative value from 0.0 to 1.0.
-#
-itcl::body Rappture::VtkVolumeViewer::ParseLevelsOption { cname levels } {
-    set c $itk_component(legend)
-    set list {}
-    regsub -all "," $levels " " levels
-    if {[string is int $levels]} {
-        for {set i 1} { $i <= $levels } {incr i} {
-            lappend list [expr {double($i)/($levels+1)}]
-        }
-    } else {
-        foreach x $levels {
-            lappend list $x
-        }
-    }
-    set _parsedFunction($cname) 1
-    $_transferFunctionEditors($cname) addMarkers $list
-}
-
-#
-# The -markers option takes a list of zero or more values (the values
-# may be separated either by spaces or commas) that have the following
-# format:
-#
-#   N%  Percent of current total data range.  Converted to
-#       to a relative value between 0.0 and 1.0.
-#   N   Absolute value of marker.  If the marker is outside of
-#       the current range, it will be displayed on the outer
-#       edge of the legends, but it range it represents will
-#       not be seen.
-#
-itcl::body Rappture::VtkVolumeViewer::ParseMarkersOption { cname markers } {
-    set c $itk_component(legend)
-    set list {}
-    foreach { min max } $_limits($cname) break
-    regsub -all "," $markers " " markers
-    foreach marker $markers {
-        set n [scan $marker "%g%s" value suffix]
-        if { $n == 2 && $suffix == "%" } {
-            # $n% : Set relative value (0..1).
-            lappend list [expr {$value * 0.01}]
-        } else {
-            # $n : absolute value, compute relative
-            lappend list [expr {(double($value)-$min)/($max-$min)}]
-        }
-    }
-    set _parsedFunction($cname) 1
-    $_transferFunctionEditors($cname) addMarkers $list
-}
-
-#
-# SetInitialTransferFunction --
-#
-# Creates a transfer function name based on the <style> settings in the
-# library run.xml file. This placeholder will be used later to create
-# and send the actual transfer function once the data info has been sent
-# to us by the render server. [We won't know the volume limits until the
-# server parses the 3D data and sends back the limits via ReceiveData.]
-#
-itcl::body Rappture::VtkVolumeViewer::SetInitialTransferFunction { dataobj cname } {
-    set tag $dataobj-$cname
-    if { ![info exists _cname2transferFunction($cname)] } {
-        ComputeTransferFunction $cname
-    }
-    set _dataset2style($tag) $cname
-
-    return $cname
-}
-
-#
-# ComputeTransferFunction --
-#
-# Computes and sends the transfer function to the render server.  It's
-# assumed that the volume data limits are known and that the global
-# transfer-functions slider values have been set up.  Both parts are
-# needed to compute the relative value (location) of the marker, and
-# the alpha map of the transfer function.
-#
-itcl::body Rappture::VtkVolumeViewer::ComputeTransferFunction { cname } {
-
-    if { ![info exists _transferFunctionEditors($cname)] } {
-        set _transferFunctionEditors($cname) \
-            [Rappture::TransferFunctionEditor ::\#auto $itk_component(legend) \
-                 $cname \
-                 -command [itcl::code $this updateTransferFunctions]]
-    }
-
-    # We have to parse the style attributes for a volume using this
-    # transfer-function *once*.  This sets up the initial isomarkers for the
-    # transfer function.  The user may add/delete markers, so we have to
-    # maintain a list of markers for each transfer-function.  We use the one
-    # of the volumes (the first in the list) using the transfer-function as a
-    # reference.
-    if { ![info exists _parsedFunction($cname)] ||
-         ![info exists _cname2transferFunction($cname)] } {
-        array set style {
-            -color BCGYR
-            -levels 6
-        }
-        # Accumulate the style from all the datasets using it.
-        foreach tag [GetDatasetsWithComponent $cname] {
-            foreach {dataobj cname} [split [lindex $tag 0] -] break
-            set option [lindex [$dataobj components -style $cname] 0]
-            array set style $option
-        }
-        set _settings($cname-color) $style(-color)
-        set cmap [ColorsToColormap $style(-color)]
-        set _cname2defaultcolormap($cname) $cmap
-        if { [info exists _transferFunctionEditors($cname)] } {
-            eval $_transferFunctionEditors($cname) limits $_limits($cname)
-        }
-        # Don't enable the -alphamap style until we have a proper UI
-        # to allow editing the transfer function
-        array unset style -alphamap
-        if { [info exists style(-alphamap)] &&
-             $style(-alphamap) != "" } {
-            set _alphamap($cname) $style(-alphamap)
-            set _parsedFuntion($cname) 1
-        } else {
-            if { [info exists style(-markers)] &&
-                 [llength $style(-markers)] > 0 } {
-                ParseMarkersOption $cname $style(-markers)
-            } else {
-                ParseLevelsOption $cname $style(-levels)
-            }
-        }
-    } else {
-        foreach {cmap amap} $_cname2transferFunction($cname) break
-    }
-    if { ![info exists _alphamap($cname)] } {
-        set amap [ComputeAlphamap $cname]
-    } else {
-        set amap $_alphamap($cname)
-    }
-    # We don't need to use a spline for the opaque map
-    set opaqueAmap "0.0 1.0 1.0 1.0"
-    set _cname2transferFunction($cname) [list $cmap $amap]
-    SendCmd [list colormap define $cname $cmap -spline $amap]
-    SendCmd [list colormap define $cname-opaque $cmap $opaqueAmap]
-}
-
-#
-# ResetColormap --
-#
-# Changes only the colormap portion of the transfer function.
-#
-itcl::body Rappture::VtkVolumeViewer::ResetColormap { cname color } {
-    # Get the current transfer function
-    if { ![info exists _cname2transferFunction($cname)] } {
-        return
-    }
-    foreach { cmap amap } $_cname2transferFunction($cname) break
-    set cmap [GetColormap $cname $color]
-    set _cname2transferFunction($cname) [list $cmap $amap]
-    set opaqueAmap "0.0 1.0 1.0 1.0"
-    SendCmd [list colormap define $cname $cmap -spline $amap]
-    SendCmd [list colormap define $cname-opaque $cmap $opaqueAmap]
-    EventuallyRequestLegend
-}
-
-# ----------------------------------------------------------------------
-# USAGE: updateTransferFunctions
-#
-# This is called by the transfer function editor whenever the
-# transfer function definition changes.
-# ----------------------------------------------------------------------
-itcl::body Rappture::VtkVolumeViewer::updateTransferFunctions {} {
-    foreach cname [array names _volcomponents] {
-        ComputeTransferFunction $cname
-    }
-    EventuallyRequestLegend
-}
-
-itcl::body Rappture::VtkVolumeViewer::AddNewMarker { x y } {
-    if { ![info exists _transferFunctionEditors($_current)] } {
-        continue
-    }
-    # Add a new marker to the current transfer function
-    $_transferFunctionEditors($_current) newMarker $x $y normal
-}
-
-itcl::body Rappture::VtkVolumeViewer::RemoveMarker { x y } {
-    if { ![info exists _transferFunctionEditors($_current)] } {
-        continue
-    }
-    # Add a new marker to the current transfer function
-    $_transferFunctionEditors($_current) deleteMarker $x $y
-}
-
 itcl::body Rappture::VtkVolumeViewer::SetOrientation { side } {
     array set positions {
@@ -2644 +2368 @@
 
 #
-# InitComponentSettings --
-#
-# Initializes the volume settings for a specific component. This
-# should match what's used as global settings above. This
-# is called the first time we try to switch to a given component
-# in SwitchComponent below.
-#
-itcl::body Rappture::VtkVolumeViewer::InitComponentSettings { cname } {
-    array set _settings [subst {
-        $cname-color                    default
-        $cname-volumeambient            40
-        $cname-volumeblendmode          composite
-        $cname-volumediffuse            60
-        $cname-volumelight2side         1
-        $cname-volumelighting           1
-        $cname-volumeopacity            50
-        $cname-volumeoutline            0
-        $cname-volumequality            80
-        $cname-volumespecularexponent   90
-        $cname-volumespecularlevel      30
-        $cname-volumethickness          350
-        $cname-volumevisible            1
-    }]
-}
-
-#
-# SwitchComponent --
-#
-# This is called when the current component is changed by the
-# dropdown menu in the volume tab.  It synchronizes the global
-# volume settings with the settings of the new current component.
-#
-itcl::body Rappture::VtkVolumeViewer::SwitchComponent { cname } {
-    if { ![info exists _settings(${cname}-volumeambient)] } {
-        InitComponentSettings $cname
-    }
-    # _settings variables change widgets, except for colormap
-    foreach name {
-        -volumeambient
-        -volumeblendmode
-        -volumediffuse
-        -volumelight2side
-        -volumelighting
-        -volumeopacity
-        -volumeoutline
-        -volumequality
-        -volumespecularexponent
-        -volumespecularlevel
-        -volumethickness
-        -volumevisible
-    } {
-        set _settings($name) $_settings(${cname}${name})
-    }
-    $itk_component(colormap) value        $_settings($cname-color)
-    set _current $cname;                # Reset the current component
-}
-
-#
-# Alpha map is in the format: normalized_value opacity midpoint sharpness
-#
-itcl::body Rappture::VtkVolumeViewer::ComputeAlphamap { cname } {
-    if { ![info exists _transferFunctionEditors($cname)] } {
-        return [list 0.0 0.0 0.5 0.0 1.0 1.0 0.5 0.0]
-    }
-    if { ![info exists _settings($cname-volumeambient)] } {
-        InitComponentSettings $cname
-    }
-
-    set isovalues [$_transferFunctionEditors($cname) values]
-
-    # Currently using volume opacity to scale opacity in
-    # the volume shader. The transfer function always sets full
-    # opacity
-    set max 1.0;
-
-    # Use the component-wise thickness setting from the slider
-    # settings widget
-    # Scale values between 0.00001 and 0.01000
-    set delta [expr {double($_settings($cname-volumethickness)) * 0.0001}]
-    set first [lindex $isovalues 0]
-    set last [lindex $isovalues end]
-    set amap ""
-    if { $first == "" || $first != 0.0 } {
-        lappend amap 0.0 0.0 0.5 0.0
-    }
-    foreach x $isovalues {
-        set x1 [expr {$x-$delta-0.00001}]
-        set x2 [expr {$x-$delta}]
-        set x3 [expr {$x+$delta}]
-        set x4 [expr {$x+$delta+0.00001}]
-        if { $x1 < 0.0 } {
-            set x1 0.0
-        } elseif { $x1 > 1.0 } {
-            set x1 1.0
-        }
-        if { $x2 < 0.0 } {
-            set x2 0.0
-        } elseif { $x2 > 1.0 } {
-            set x2 1.0
-        }
-        if { $x3 < 0.0 } {
-            set x3 0.0
-        } elseif { $x3 > 1.0 } {
-            set x3 1.0
-        }
-        if { $x4 < 0.0 } {
-            set x4 0.0
-        } elseif { $x4 > 1.0 } {
-            set x4 1.0
-        }
-        # add spikes in the middle
-        lappend amap $x1 0.0 0.5 0.0
-        lappend amap $x2 $max 0.5 0.0
-        lappend amap $x3 $max 0.5 0.0
-        lappend amap $x4 0.0 0.5 0.0
-    }
-    if { $last == "" || $last != 1.0 } {
-        lappend amap 1.0 0.0 0.5 0.0
-    }
-    return $amap
-}
-
-#
-# HideAllMarkers --
-#
-# Hide all the markers in all the transfer functions.  Can't simply
-# delete and recreate markers from the <style> since the user may
-# have create, deleted, or moved markers.
-#
-itcl::body Rappture::VtkVolumeViewer::HideAllMarkers {} {
-    foreach cname [array names _transferFunctionEditors] {
-        $_transferFunctionEditors($cname) hideMarkers
-    }
-}
-
-#
 # GetDatasetsWithComponent --
 #
@@ -2792 +2380 @@
     }
     return $_volcomponents($cname)
-}
-
-#
-# BuildVolumeComponents --
-#
-# This is called from the "scale" method which is called when a
-# new dataset is added or deleted.  It repopulates the dropdown
-# menu of volume component names.  It sets the current component
-# to the first component in the list (of components found).
-# Finally, if there is only one component, don't display the
-# label or the combobox in the volume settings tab.
-#
-itcl::body Rappture::VtkVolumeViewer::BuildVolumeComponents {} {
-    $itk_component(volcomponents) choices delete 0 end
-    foreach name $_componentsList {
-        $itk_component(volcomponents) choices insert end $name $name
-    }
-    set _current [lindex $_componentsList 0]
-    $itk_component(volcomponents) value $_current
-    set parent [winfo parent $itk_component(volcomponents)]
-    if { [llength $_componentsList] <= 1 } {
-        # Unpack the components label and dropdown if there's only one
-        # component.
-        catch {blt::table forget $parent.volcomponents_l $parent.volcomponents}
-    } else {
-        # Pack the components label and dropdown into the table there's
-        # more than one component to select.
-        blt::table $parent \
-            0,0 $parent.volcomponents_l -anchor e -cspan 2 \
-            0,2 $parent.volcomponents -cspan 3 -fill x
-    }
-}
-
-itcl::body Rappture::VtkVolumeViewer::GetColormap { cname color } {
-    if { $color == "default" } {
-        return $_cname2defaultcolormap($cname)
-    }
-    return [ColorsToColormap $color]
 }