Changeset 5009 for branches/1.3

Timestamp:

Feb 12, 2015, 11:00:22 AM (10 years ago)

Author:

ldelgass

Message:

Update vtkviewer in 1.3 branch with current trunk/1.4 branch version

File:

• branches/1.3/gui/scripts/vtkviewer.tcl (modified) (98 diffs)

branches/1.3/gui/scripts/vtkviewer.tcl

@@ -1 @@
-# -*- mode: tcl; indent-tabs-mode: nil -*- 
-
+# -*- mode: tcl; indent-tabs-mode: nil -*-
 # ----------------------------------------------------------------------
 #  COMPONENT: vtkviewer - Vtk drawing object viewer
@@ -8 +7 @@
 # ======================================================================
 #  AUTHOR:  Michael McLennan, Purdue University
-#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
+#  Copyright (c) 2004-2014  HUBzero Foundation, LLC
 #
 #  See the file "license.terms" for information on usage and
@@ -58 +57 @@
     public method get {args}
     public method isconnected {}
-    public method limits { colormap }
-    public method parameters {title args} { 
-        # do nothing 
+    public method limits { dataobj }
+    public method parameters {title args} {
+        # do nothing
     }
     public method scale {args}
 
-    protected method Connect {}
-    protected method CurrentDatasets {args}
-    protected method Disconnect {}
-    protected method DoResize {}
-    protected method DoRotate {}
-    protected method AdjustSetting {what {value ""}}
-    protected method FixSettings { args  }
-    protected method Pan {option x y}
-    protected method Pick {x y}
-    protected method Rebuild {}
-    protected method ReceiveDataset { args }
-    protected method ReceiveImage { args }
-    protected method ReceiveLegend { colormap title vmin vmax size }
-    protected method Rotate {option x y}
-    protected method Zoom {option}
-
     # The following methods are only used by this class.
+    private method AdjustSetting {what {value ""}}
     private method BuildAxisTab {}
     private method BuildCameraTab {}
     private method BuildColormap { name styles }
     private method BuildCutawayTab {}
-    private method BuildDownloadPopup { widget command } 
+    private method BuildDownloadPopup { widget command }
+    private method BuildGlyphsTab {}
     private method BuildMoleculeTab {}
     private method BuildPolydataTab {}
     private method ChangeColormap { dataobj comp color }
+    private method Connect {}
+    private method CurrentDatasets {args}
+    private method Disconnect {}
+    private method DoResize {}
+    private method DoRotate {}
     private method DrawLegend {}
-    private method EnterLegend { x y } 
-    private method EventuallySetAtomScale { args } 
-    private method EventuallySetBondScale { args } 
-    private method EventuallySetMoleculeOpacity { args } 
-    private method EventuallySetMoleculeQuality { args } 
-    private method EventuallySetPolydataOpacity { args } 
-    private method EventuallyResize { w h } 
-    private method EventuallyRotate { q } 
-    private method GetImage { args } 
-    private method GetVtkData { args } 
-    private method IsValidObject { dataobj } 
+    private method EnterLegend { x y }
+    private method EventuallyResize { w h }
+    private method EventuallyRotate { q }
+    private method EventuallySetAtomScale { args }
+    private method EventuallySetBondScale { args }
+    private method EventuallySetGlyphsOpacity { args }
+    private method EventuallySetMoleculeOpacity { args }
+    private method EventuallySetMoleculeQuality { args }
+    private method EventuallySetPolydataOpacity { args }
+    private method GetImage { args }
+    private method GetVtkData { args }
+    private method InitSettings { args  }
+    private method IsValidObject { dataobj }
     private method LeaveLegend {}
-    private method MotionLegend { x y } 
+    private method MotionLegend { x y }
+    private method Pan {option x y}
     private method PanCamera {}
+    private method Pick {x y}
+    private method QuaternionToView { q } {
+        foreach { _view(-qw) _view(-qx) _view(-qy) _view(-qz) } $q break
+    }
+    private method Rebuild {}
+    private method ReceiveDataset { args }
+    private method ReceiveImage { args }
+    private method ReceiveLegend { colormap title vmin vmax size }
     private method RequestLegend {}
+    private method Rotate {option x y}
     private method SetAtomScale {}
     private method SetBondScale {}
     private method SetColormap { dataobj comp }
+    private method SetGlyphsOpacity {}
     private method SetLegendTip { x y }
     private method SetMoleculeOpacity {}
     private method SetMoleculeQuality {}
-    private method SetObjectStyle { dataobj comp } 
+    private method SetObjectStyle { dataobj comp }
     private method SetOpacity { dataset }
     private method SetOrientation { side }
     private method SetPolydataOpacity {}
-    private method Slice {option args} 
+    private method Slice {option args}
+    private method ViewToQuaternion {} {
+        return [list $_view(-qw) $_view(-qx) $_view(-qy) $_view(-qz)]
+    }
+    private method Zoom {option}
 
     private variable _arcball ""
-    private variable _dlist "";         # list of data objects
+    private variable _dlist "";         # list of data objects
     private variable _obj2datasets
-    private variable _obj2ovride;       # maps dataobj => style override
-    private variable _datasets;         # contains all the dataobj-component 
-                                        # datasets in the server
-    private variable _colormaps;        # contains all the colormaps
-                                        # in the 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 _obj2ovride;       # maps dataobj => style override
+    private variable _datasets;         # contains all the dataobj-component
+                                        # datasets in the server
+    private variable _colormaps;        # contains all the colormaps
+                                        # in the 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 _click;            # info used for rotate operations
     private variable _limits;           # autoscale min/max for all axes
@@ -157 +164 @@
     private variable _polydataOpacityPending 0
     private variable _glyphsOpacityPending 0
-    private variable _updatePending 0;
     private variable _rotateDelay 150
     private variable _scaleDelay 100
@@ -181 +187 @@
     $_dispatcher register !resize
     $_dispatcher dispatch $this !resize "[itcl::code $this DoResize]; list"
-
-    # Update state event
-    $_dispatcher register !update
-    $_dispatcher dispatch $this !update "[itcl::code $this DoUpdate]; list"
 
     # Rotate event
@@ -214 +216 @@
     $_dispatcher dispatch $this !polydataOpacity \
         "[itcl::code $this SetPolydataOpacity]; list"
+
+    # Glyphs opacity event
+    $_dispatcher register !glyphsOpacity
+    $_dispatcher dispatch $this !glyphsOpacity \
+        "[itcl::code $this SetGlyphsOpacity]; list"
+
     #
     # Populate parser with commands handle incoming requests
     #
-    $_parser alias image    [itcl::code $this ReceiveImage]
-    $_parser alias dataset  [itcl::code $this ReceiveDataset]
-    $_parser alias legend   [itcl::code $this ReceiveLegend]
+    $_parser alias image [itcl::code $this ReceiveImage]
+    $_parser alias dataset [itcl::code $this ReceiveDataset]
+    $_parser alias legend [itcl::code $this ReceiveLegend]
 
     # Initialize the view to some default parameters.
     array set _view {
-        qw              0.853553
-        qx              -0.353553
-        qy              0.353553
-        qz              0.146447
-        zoom            1.0 
-        xpan            0
-        ypan            0
-        ortho           0
+        -ortho           0
+        -qw              0.853553
+        -qx              -0.353553
+        -qy              0.353553
+        -qz              0.146447
+        -xpan            0
+        -ypan            0
+        -zoom            1.0
     }
     set _arcball [blt::arcball create 100 100]
-    set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
-    $_arcball quaternion $q
+    $_arcball quaternion [ViewToQuaternion]
 
     set _limits(zmin) 0.0
@@ -240 +247 @@
 
     array set _axis [subst {
+        labels          1
+        minorticks      1
+        visible         1
         xgrid           0
         ygrid           0
@@ -252 +262 @@
         ydirection      -1
         zdirection      -1
-        visible         1
-        labels          1
     }]
     array set _settings [subst {
+        glyphs-edges            0
+        glyphs-lighting         1
+        glyphs-opacity          100
+        glyphs-outline          0
+        glyphs-palette          BCGYR
+        glyphs-visible          1
+        glyphs-wireframe        0
         legend                  1
-        glyphs-opacity          100
-        glyphs-wireframe        0
-        polydata-edges          0
-        polydata-lighting       1
-        polydata-opacity        100
-        polydata-palette        rainbow
-        polydata-visible        1
-        polydata-wireframe      0
+        molecule-atoms-visible  1
         molecule-atomscale      0.3
+        molecule-bonds-visible  1
         molecule-bondscale      0.075
         molecule-bondstyle      "cylinder"
-        molecule-atoms-visible  1
-        molecule-bonds-visible  1
         molecule-edges          0
         molecule-labels         0
         molecule-lighting       1
         molecule-opacity        100
+        molecule-outline        0
         molecule-palette        elementDefault
         molecule-quality        1.0
@@ -280 +288 @@
         molecule-visible        1
         molecule-wireframe      0
+        polydata-edges          0
+        polydata-lighting       1
+        polydata-opacity        100
+        polydata-outline        0
+        polydata-palette        BCGYR
+        polydata-visible        1
+        polydata-wireframe      0
     }]
     itk_component add view {
@@ -304 +319 @@
 
     set _map(id) [$c create image 0 0 -anchor nw -image $_image(plot)]
-    set _map(cwidth) -1 
-    set _map(cheight) -1 
+    set _map(cwidth) -1
+    set _map(cheight) -1
     set _map(zoom) 1.0
     set _map(original) ""
@@ -347 +362 @@
     Rappture::Tooltip::for $itk_component(zoomout) "Zoom out"
 
-    BuildAxisTab
-    #BuildCutawayTab
-    BuildCameraTab
+    if { [catch {
+        BuildAxisTab
+        #BuildCutawayTab
+        BuildCameraTab
+    } errs] != 0 } {
+        puts stderr errs=$errs
+    }
 
     # Legend
-
     set _image(legend) [image create photo]
     itk_component add legend {
-        canvas $itk_component(plotarea).legend -width 50 -highlightthickness 0 
+        canvas $itk_component(plotarea).legend -width 50 -highlightthickness 0
     } {
         usual
@@ -362 +380 @@
     }
 
-    # Hack around the Tk panewindow.  The problem is that the requested 
+    # Hack around the Tk panewindow.  The problem is that the requested
     # size of the 3d view isn't set until an image is retrieved from
     # the server.  So the panewindow uses the tiny size.
@@ -368 +386 @@
     pack forget $itk_component(view)
     blt::table $itk_component(plotarea) \
-        0,0 $itk_component(view) -fill both -reqwidth $w 
+        0,0 $itk_component(view) -fill both -reqwidth $w
     blt::table configure $itk_component(plotarea) c1 -resize none
 
@@ -378 +396 @@
     bind $itk_component(view) <ButtonRelease-1> \
         [itcl::code $this Rotate release %x %y]
-    bind $itk_component(view) <Configure> \
-        [itcl::code $this EventuallyResize %w %h]
 
     # Bindings for panning via mouse
@@ -457 +473 @@
 
 itcl::body Rappture::VtkViewer::DoRotate {} {
-    set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
-    SendCmd "camera orient $q" 
+    SendCmd "camera orient [ViewToQuaternion]"
     set _rotatePending 0
 }
@@ -473 +488 @@
 
 itcl::body Rappture::VtkViewer::EventuallyRotate { q } {
-    foreach { _view(qw) _view(qx) _view(qy) _view(qz) } $q break
+    QuaternionToView $q
     if { !$_rotatePending } {
         set _rotatePending 1
@@ -506 +521 @@
 }
 
+itcl::body Rappture::VtkViewer::SetGlyphsOpacity {} {
+    set _glyphsOpacityPending 0
+    foreach dataset [CurrentDatasets -visible $_first] {
+        foreach { dataobj comp } [split $dataset -] break
+        if { [$dataobj type $comp] == "glyphs" } {
+            SetOpacity $dataset
+        }
+    }
+}
+
 itcl::body Rappture::VtkViewer::SetPolydataOpacity {} {
     set _polydataOpacityPending 0
@@ -548 +573 @@
         set _polydataOpacityPending 1
         $_dispatcher event -after $_scaleDelay !polydataOpacity
+    }
+}
+
+itcl::body Rappture::VtkViewer::EventuallySetGlyphsOpacity { args } {
+    if { !$_glyphsOpacityPending } {
+        set _glyphsOpacityPending 1
+        $_dispatcher event -after $_scaleDelay !glyphsOpacity
     }
 }
@@ -642 +674 @@
                     continue
                 }
-                if {[info exists _obj2ovride($dataobj-raise)] && 
+                if {[info exists _obj2ovride($dataobj-raise)] &&
                     $_obj2ovride($dataobj-raise)} {
                     set dlist [linsert $dlist 0 $dataobj]
@@ -670 +702 @@
             }
             return $dlist
-        }           
+        }
         -image {
             if {[llength $args] != 2} {
@@ -716 +748 @@
         }
         array set bounds [limits $dataobj]
-        if {![info exists _limits(xmin)] || $_limits(xmin) > $bounds(xmin)} {
+        if {[info exists bounds(xmin)] && (![info exists _limits(xmin)] || $_limits(xmin) > $bounds(xmin))} {
             set _limits(xmin) $bounds(xmin)
         }
-        if {![info exists _limits(xmax)] || $_limits(xmax) < $bounds(xmax)} {
+        if {[info exists bounds(xmax)] && (![info exists _limits(xmax)] || $_limits(xmax) < $bounds(xmax))} {
             set _limits(xmax) $bounds(xmax)
         }
 
-        if {![info exists _limits(ymin)] || $_limits(ymin) > $bounds(ymin)} {
+        if {[info exists bounds(ymin)] && (![info exists _limits(ymin)] || $_limits(ymin) > $bounds(ymin))} {
             set _limits(ymin) $bounds(ymin)
         }
-        if {![info exists _limits(ymax)] || $_limits(ymax) < $bounds(ymax)} {
+        if {[info exists bounds(ymax)] && (![info exists _limits(ymax)] || $_limits(ymax) < $bounds(ymax))} {
             set _limits(ymax) $bounds(ymax)
         }
 
-        if {![info exists _limits(zmin)] || $_limits(zmin) > $bounds(zmin)} {
+        if {[info exists bounds(zmin)] && (![info exists _limits(zmin)] || $_limits(zmin) > $bounds(zmin))} {
             set _limits(zmin) $bounds(zmin)
         }
-        if {![info exists _limits(zmax)] || $_limits(zmax) < $bounds(zmax)} {
+        if {[info exists bounds(zmax)] && (![info exists _limits(zmax)] || $_limits(zmax) < $bounds(zmax))} {
             set _limits(zmax) $bounds(zmax)
+        }
+    }
+    if { $_haveGlyphs } {
+        if { ![$itk_component(main) exists "Glyphs Settings"] } {
+            if { [catch { BuildGlyphsTab } errs ]  != 0 } {
+                puts stderr "errs=$errs"
+            }
         }
     }
@@ -828 +867 @@
         if { $_reportClientInfo }  {
             # Tell the server the viewer, hub, user and session.
-            # Do this immediately on connect before buffing any commands
+            # Do this immediately on connect before buffering any commands
             global env
 
@@ -885 +924 @@
 
     # disconnected -- no more data sitting on server
-    array unset _datasets 
-    array unset _data 
-    array unset _colormaps 
+    set _outbuf ""
+    array unset _datasets
+    array unset _data
+    array unset _colormaps
     global readyForNextFrame
     set readyForNextFrame 1
@@ -911 +951 @@
     if { $info(-type) == "image" } {
         if 0 {
-            set f [open "last.ppm" "w"] 
+            set f [open "last.ppm" "w"]
             fconfigure $f -encoding binary
             puts -nonewline $f $bytes
@@ -989 +1029 @@
     # Turn on buffering of commands to the server.  We don't want to
     # be preempted by a server disconnect/reconnect (which automatically
-    # generates a new call to Rebuild).   
+    # generates a new call to Rebuild).
     StartBufferingCommands
 
@@ -997 +1037 @@
         $_arcball resize $w $h
         DoResize
-        FixSettings axis-xgrid axis-ygrid axis-zgrid axis-mode \
-            axis-visible axis-labels
-
-        if { $_havePolydata } {
-            FixSettings polydata-edges polydata-lighting polydata-opacity \
-                polydata-visible polydata-wireframe 
-        }
+        InitSettings axis-xgrid axis-ygrid axis-zgrid axis-mode \
+            axis-visible axis-labels axis-minorticks
+
         StopBufferingCommands
         SendCmd "imgflush"
@@ -1025 +1061 @@
                 if { $bytes == "" } {
                     continue
+                }
+                if 0 {
+                    set f [open /tmp/vtkviewer.vtk "w"]
+                    fconfigure $f -translation binary -encoding binary
+                    puts -nonewline $f $bytes
+                    close $f
                 }
                 set length [string length $bytes]
@@ -1037 +1079 @@
                     lappend info "dataset_size"  $length
                     lappend info "dataset_tag"   $tag
-                    SendCmd [list "clientinfo" $info]
+                    SendCmd "clientinfo [list $info]"
                 }
                 SendCmd "dataset add $tag data follows $length"
@@ -1045 +1087 @@
             }
             lappend _obj2datasets($dataobj) $tag
+            set type [$dataobj type $comp]
             if { [info exists _obj2ovride($dataobj-raise)] } {
-                SendCmd "dataset visible 1 $tag"
+                SendCmd "$type visible 1 $tag"
                 SetOpacity $tag
             }
@@ -1060 +1103 @@
             set label [$_first hints ${axis}label]
             if { $label != "" } {
-                SendCmd "axis name $axis $label"
+                SendCmd [list axis name $axis $label]
             }
             set units [$_first hints ${axis}units]
             if { $units != "" } {
-                SendCmd "axis units $axis $units"
-            }
-        }
+                SendCmd [list axis units $axis $units]
+            }
+        }
+    }
+    if { $_haveGlyphs } {
+        InitSettings glyphs-outline
+    }
+    if { $_haveMolecules } {
+        InitSettings molecule-outline
+    }
+    if { $_havePolydata } {
+        InitSettings polydata-outline
     }
     if { $_reset } {
-        set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
-        $_arcball quaternion $q 
+        if { $_haveGlyphs } {
+            InitSettings glyphs-edges glyphs-lighting glyphs-opacity \
+                glyphs-visible glyphs-wireframe
+        }
+        if { $_havePolydata } {
+            InitSettings polydata-edges polydata-lighting polydata-opacity \
+                polydata-visible polydata-wireframe
+        }
+        if { $_haveMolecules } {
+            InitSettings molecule-edges molecule-lighting molecule-opacity \
+                molecule-visible molecule-wireframe molecule-labels
+        }
+
+        $_arcball quaternion [ViewToQuaternion]
         SendCmd "camera reset"
-        if { $_view(ortho)} {
+        if { $_view(-ortho)} {
             SendCmd "camera mode ortho"
         } else {
@@ -1083 +1147 @@
 
     if { $_haveMolecules } {
-        #FixSettings molecule-representation 
+        #InitSettings molecule-representation
     }
     set _reset 0
@@ -1106 +1170 @@
 itcl::body Rappture::VtkViewer::CurrentDatasets {args} {
     set flag [lindex $args 0]
-    switch -- $flag { 
+    switch -- $flag {
         "-all" {
             if { [llength $args] > 1 } {
@@ -1125 +1189 @@
                 set dlist [get -visible]
             }
-        }           
+        }
         default {
             set dlist $args
@@ -1153 +1217 @@
     switch -- $option {
         "in" {
-            set _view(zoom) [expr {$_view(zoom)*1.25}]
-            SendCmd "camera zoom $_view(zoom)"
+            set _view(-zoom) [expr {$_view(-zoom)*1.25}]
+            SendCmd "camera zoom $_view(-zoom)"
         }
         "out" {
-            set _view(zoom) [expr {$_view(zoom)*0.8}]
-            SendCmd "camera zoom $_view(zoom)"
+            set _view(-zoom) [expr {$_view(-zoom)*0.8}]
+            SendCmd "camera zoom $_view(-zoom)"
         }
         "reset" {
             array set _view {
-                qw      0.853553
-                qx      -0.353553
-                qy      0.353553
-                qz      0.146447
-                zoom    1.0
-                xpan    0
-                ypan    0
+                -qw      0.853553
+                -qx      -0.353553
+                -qy      0.353553
+                -qz      0.146447
+                -xpan    0
+                -ypan    0
+                -zoom    1.0
             }
             if { $_first != "" } {
@@ -1176 +1240 @@
                 }
             }
-            set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
-            $_arcball quaternion $q
+            $_arcball quaternion [ViewToQuaternion]
             DoRotate
             SendCmd "camera reset"
@@ -1185 +1248 @@
 
 itcl::body Rappture::VtkViewer::PanCamera {} {
-    set x $_view(xpan)
-    set y $_view(ypan)
+    set x $_view(-xpan)
+    set y $_view(-ypan)
     SendCmd "camera pan $x $y"
 }
@@ -1245 +1308 @@
     foreach tag [CurrentDatasets -visible] {
         SendCmd "dataset getscalar pixel $x $y $tag"
-    } 
+    }
 }
 
@@ -1263 +1326 @@
             set x [expr $x / double($w)]
             set y [expr $y / double($h)]
-            set _view(xpan) [expr $_view(xpan) + $x]
-            set _view(ypan) [expr $_view(ypan) + $y]
+            set _view(-xpan) [expr $_view(-xpan) + $x]
+            set _view(-ypan) [expr $_view(-ypan) + $y]
             PanCamera
             return
@@ -1286 +1349 @@
             set _click(x) $x
             set _click(y) $y
-            set _view(xpan) [expr $_view(xpan) - $dx]
-            set _view(ypan) [expr $_view(ypan) - $dy]
+            set _view(-xpan) [expr $_view(-xpan) - $dx]
+            set _view(-ypan) [expr $_view(-ypan) - $dy]
             PanCamera
         }
@@ -1301 +1364 @@
 
 # ----------------------------------------------------------------------
-# USAGE: FixSettings <what> ?<value>?
+# USAGE: InitSettings <what> ?<value>?
 #
 # Used internally to update rendering settings whenever parameters
@@ -1307 +1370 @@
 # to the back end.
 # ----------------------------------------------------------------------
-itcl::body Rappture::VtkViewer::FixSettings { args } {
+itcl::body Rappture::VtkViewer::InitSettings { args } {
     foreach setting $args {
         AdjustSetting $setting
@@ -1325 +1388 @@
     }
     switch -- $what {
+        "glyphs-opacity" {
+            foreach dataset [CurrentDatasets -visible $_first] {
+                foreach { dataobj comp } [split $dataset -] break
+                if { [$dataobj type $comp] == "glyphs" } {
+                    SetOpacity $dataset
+                }
+            }
+        }
+        "glyphs-outline" {
+            set bool $_settings($what)
+            foreach dataset [CurrentDatasets -visible $_first] {
+                foreach { dataobj comp } [split $dataset -] break
+                set type [$dataobj type $comp]
+                if { $type == "glyphs" } {
+                    SendCmd "outline visible $bool $dataset"
+                }
+            }
+        }
+        "glyphs-wireframe" {
+            set bool $_settings($what)
+            foreach dataset [CurrentDatasets -visible $_first] {
+                foreach { dataobj comp } [split $dataset -] break
+                set type [$dataobj type $comp]
+                if { $type == "glyphs" } {
+                    SendCmd "$type wireframe $bool $dataset"
+                }
+            }
+        }
+        "glyphs-visible" {
+            set bool $_settings($what)
+            foreach dataset [CurrentDatasets -visible $_first] {
+                foreach { dataobj comp } [split $dataset -] break
+                set type [$dataobj type $comp]
+                if { $type == "glyphs" } {
+                    SendCmd "$type visible $bool $dataset"
+                }
+            }
+        }
+        "glyphs-lighting" {
+            set bool $_settings($what)
+            foreach dataset [CurrentDatasets -visible $_first] {
+                foreach { dataobj comp } [split $dataset -] break
+                set type [$dataobj type $comp]
+                if { $type == "glyphs" } {
+                    SendCmd "$type lighting $bool $dataset"
+                }
+            }
+        }
+        "glyphs-edges" {
+            set bool $_settings($what)
+            foreach dataset [CurrentDatasets -visible $_first] {
+                foreach { dataobj comp } [split $dataset -] break
+                set type [$dataobj type $comp]
+                if { $type == "glyphs" } {
+                    SendCmd "$type edges $bool $dataset"
+                }
+            }
+        }
+        "glyphs-palette" {
+            set palette [$itk_component(glyphspalette) value]
+            set _settings($what) $palette
+            foreach dataset [CurrentDatasets -visible $_first] {
+                foreach {dataobj comp} [split $dataset -] break
+                set type [$dataobj type $comp]
+                if { $type == "glyphs" } {
+                    ChangeColormap $dataobj $comp $palette
+                    # FIXME: fill in current selected fieldname
+                    #SendCmd "glyphs colormode scalar {} $dataset"
+                }
+            }
+            set _legendPending 1
+        }
         "polydata-opacity" {
             foreach dataset [CurrentDatasets -visible $_first] {
@@ -1333 +1468 @@
             }
         }
+        "polydata-outline" {
+            set bool $_settings($what)
+            foreach dataset [CurrentDatasets -visible $_first] {
+                foreach { dataobj comp } [split $dataset -] break
+                set type [$dataobj type $comp]
+                if { $type == "polydata" } {
+                    SendCmd "outline visible $bool $dataset"
+                }
+            }
+        }
         "polydata-wireframe" {
-            set bool $_settings(polydata-wireframe)
+            set bool $_settings($what)
             foreach dataset [CurrentDatasets -visible $_first] {
                 foreach { dataobj comp } [split $dataset -] break
@@ -1344 +1489 @@
         }
         "polydata-visible" {
-            set bool $_settings(polydata-visible)
+            set bool $_settings($what)
             foreach dataset [CurrentDatasets -visible $_first] {
                 foreach { dataobj comp } [split $dataset -] break
@@ -1354 +1499 @@
         }
         "polydata-lighting" {
-            set bool $_settings(polydata-lighting)
+            set bool $_settings($what)
             foreach dataset [CurrentDatasets -visible $_first] {
                 foreach { dataobj comp } [split $dataset -] break
@@ -1364 +1509 @@
         }
         "polydata-edges" {
-            set bool $_settings(polydata-edges)
+            set bool $_settings($what)
             foreach dataset [CurrentDatasets -visible $_first] {
                 foreach { dataobj comp } [split $dataset -] break
@@ -1375 +1520 @@
         "polydata-palette" {
             set palette [$itk_component(meshpalette) value]
-            set _settings(polydata-palette) $palette
+            set _settings($what) $palette
             foreach dataset [CurrentDatasets -visible $_first] {
                 foreach {dataobj comp} [split $dataset -] break
@@ -1388 +1533 @@
         }
         "molecule-opacity" {
-            set val $_settings(molecule-opacity)
-            set sval [expr { 0.01 * double($val) }]
             foreach dataset [CurrentDatasets -visible $_first] {
                 foreach { dataobj comp } [split $dataset -] break
@@ -1397 +1540 @@
             }
         }
+        "molecule-outline" {
+            set bool $_settings($what)
+            foreach dataset [CurrentDatasets -visible $_first] {
+                foreach { dataobj comp } [split $dataset -] break
+                set type [$dataobj type $comp]
+                if { $type == "molecule" } {
+                    SendCmd "outline visible $bool $dataset"
+                }
+            }
+        }
         "molecule-wireframe" {
-            set bool $_settings(molecule-wireframe)
+            set bool $_settings($what)
             foreach dataset [CurrentDatasets -visible $_first] {
                 foreach { dataobj comp } [split $dataset -] break
@@ -1408 +1561 @@
         }
         "molecule-visible" {
-            set bool $_settings(molecule-visible)
+            set bool $_settings($what)
             foreach dataset [CurrentDatasets -visible $_first] {
                 foreach { dataobj comp } [split $dataset -] break
@@ -1418 +1571 @@
         }
         "molecule-lighting" {
-            set bool $_settings(molecule-lighting)
+            set bool $_settings($what)
             foreach dataset [CurrentDatasets -visible $_first] {
                 foreach { dataobj comp } [split $dataset -] break
@@ -1428 +1581 @@
         }
         "molecule-edges" {
-            set bool $_settings(molecule-edges)
+            set bool $_settings($what)
             foreach dataset [CurrentDatasets -visible $_first] {
                 foreach { dataobj comp } [split $dataset -] break
@@ -1439 +1592 @@
         "molecule-palette" {
             set palette [$itk_component(moleculepalette) value]
-            set _moelculeSettings(palette) $palette
+            set _settings($what) $palette
             foreach dataset [CurrentDatasets -visible $_first] {
                 foreach {dataobj comp} [split $dataset -] break
@@ -1503 +1656 @@
                     set _settings(molecule-atoms-visible) 0
                     set _settings(molecule-bonds-visible) 1
-                    set _settings(molecule-bondstyle) cylinder
+                    set _settings(molecule-bondstyle) line
                     set _settings(molecule-atomscale) 1.0
                     set _settings(molecule-bondscale) 1.0
@@ -1524 +1677 @@
                 set type [$dataobj type $comp]
                 if { $type == "molecule" } {
-                    SendCmd [subst {molecule rscale $_settings(molecule-rscale) $dataset
-molecule ascale $_settings(molecule-atomscale) $dataset
-molecule bscale $_settings(molecule-bondscale) $dataset
-molecule bstyle $_settings(molecule-bondstyle) $dataset
-molecule atoms $_settings(molecule-atoms-visible) $dataset
-molecule bonds $_settings(molecule-bonds-visible) $dataset}]
+                    StartBufferingCommands
+                    SendCmd [subst {molecule rscale $_settings(molecule-rscale) $dataset}]
+                    SendCmd [subst {molecule ascale $_settings(molecule-atomscale) $dataset}]
+                    SendCmd [subst {molecule bscale $_settings(molecule-bondscale) $dataset}]
+                    SendCmd [subst {molecule bstyle $_settings(molecule-bondstyle) $dataset}]
+                    SendCmd [subst {molecule atoms $_settings(molecule-atoms-visible) $dataset}]
+                    SendCmd [subst {molecule bonds $_settings(molecule-bonds-visible) $dataset}]
+                    StopBufferingCommands
                 }
             }
@@ -1536 +1691 @@
             set value [$itk_component(rscale) value]
             set value [$itk_component(rscale) translate $value]
-            set _settings(molecule-rscale) $value
+            set _settings($what) $value
             foreach dataset [CurrentDatasets -visible $_first] {
                 foreach {dataobj comp} [split $dataset -] break
                 set type [$dataobj type $comp]
                 if { $type == "molecule" } {
-                    SendCmd [subst {molecule rscale $_settings(molecule-rscale) $dataset}]
+                    SendCmd [subst {molecule rscale $_settings($what) $dataset}]
                 }
             }
         }
         "molecule-labels" {
-            set bool $_settings(molecule-labels)
+            set bool $_settings($what)
             foreach dataset [CurrentDatasets -visible $_first] {
                foreach { dataobj comp } [split $dataset -] break
@@ -1562 +1717 @@
             set bool $_axis(labels)
             SendCmd "axis labels all $bool"
+        }
+        "axis-minorticks" {
+            set bool $_axis(minorticks)
+            SendCmd "axis minticks all $bool"
         }
         "axis-xgrid" {
@@ -1595 +1754 @@
             }
         }
-        "axis-xposition" - "axis-yposition" - "axis-zposition" - 
+        "axis-xposition" - "axis-yposition" - "axis-zposition" -
         "axis-xdirection" - "axis-ydirection" - "axis-zdirection" {
             set axis [string range $what 5 5]
@@ -1618 +1777 @@
     set font "Arial 8"
     set lineht [font metrics $font -linespace]
-    set c $itk_component(legend)
     set w 12
     set h [expr {$_height - 2 * ($lineht + 2)}]
-    if { $h < 1} {
+    if { $h < 1 } {
         return
     }
@@ -1727 +1885 @@
 itcl::configbody Rappture::VtkViewer::plotbackground {
     if { [isconnected] } {
-        foreach {r g b} [Color2RGB $itk_option(-plotbackground)] break
-        SendCmd "screen bgcolor $r $g $b"
+        set rgb [Color2RGB $itk_option(-plotbackground)]
+        SendCmd "screen bgcolor $rgb"
     }
 }
@@ -1737 +1895 @@
 itcl::configbody Rappture::VtkViewer::plotforeground {
     if { [isconnected] } {
-        foreach {r g b} [Color2RGB $itk_option(-plotforeground)] break
-        #fix this!
-        #SendCmd "color background $r $g $b"
+        set rgb [Color2RGB $itk_option(-plotforeground)]
+        SendCmd "axis color all $rgb"
+        SendCmd "outline color $rgb"
     }
 }
@@ -1754 +1912 @@
             set f [open "$tmpfile" "w"]
             fconfigure $f -translation binary -encoding binary
-            puts $f $data 
+            puts $f $data
             close $f
             set reader [vtkDataSetReader $tag-xvtkDataSetReader]
@@ -1772 +1930 @@
             file delete $tmpfile
             set output [$reader GetOutput]
+            if { $output == "" } {
+                # Invalid VTK file -- loader failed to parse
+                continue
+            }
             set _limits($tag) [$output GetBounds]
             if {$debug} {
@@ -1830 +1992 @@
 }
 
-itcl::body Rappture::VtkViewer::BuildPolydataTab {} {
+itcl::body Rappture::VtkViewer::BuildGlyphsTab {} {
 
     set fg [option get $itk_component(hull) font Font]
     #set bfg [option get $itk_component(hull) boldFont Font]
 
-    set inner [$itk_component(main) insert end \
+    set inner [$itk_component(main) insert 0 \
+        -title "Glyph Settings" \
+        -icon [Rappture::icon volume-on]]
+    $inner configure -borderwidth 4
+
+    checkbutton $inner.glyphs \
+        -text "Show Glyphs" \
+        -variable [itcl::scope _settings(glyphs-visible)] \
+        -command [itcl::code $this AdjustSetting glyphs-visible] \
+        -font "Arial 9" -anchor w
+
+    checkbutton $inner.outline \
+        -text "Show Outline" \
+        -variable [itcl::scope _settings(glyphs-outline)] \
+        -command [itcl::code $this AdjustSetting glyphs-outline] \
+        -font "Arial 9" -anchor w
+
+    checkbutton $inner.wireframe \
+        -text "Show Wireframe" \
+        -variable [itcl::scope _settings(glyphs-wireframe)] \
+        -command [itcl::code $this AdjustSetting glyphs-wireframe] \
+        -font "Arial 9" -anchor w
+
+    checkbutton $inner.lighting \
+        -text "Enable Lighting" \
+        -variable [itcl::scope _settings(glyphs-lighting)] \
+        -command [itcl::code $this AdjustSetting glyphs-lighting] \
+        -font "Arial 9" -anchor w
+
+    checkbutton $inner.edges \
+        -text "Show Edges" \
+        -variable [itcl::scope _settings(glyphs-edges)] \
+        -command [itcl::code $this AdjustSetting glyphs-edges] \
+        -font "Arial 9" -anchor w
+
+    label $inner.palette_l -text "Palette" -font "Arial 9" -anchor w
+    itk_component add glyphspalette {
+        Rappture::Combobox $inner.palette -width 10 -editable no
+    }
+    $inner.palette choices insert end [GetColormapList]
+    $itk_component(glyphspalette) value "BCGYR"
+    bind $inner.palette <<Value>> \
+        [itcl::code $this AdjustSetting glyphs-palette]
+
+    label $inner.opacity_l -text "Opacity" -font "Arial 9" -anchor w
+    ::scale $inner.opacity -from 0 -to 100 -orient horizontal \
+        -variable [itcl::scope _settings(glyphs-opacity)] \
+        -width 10 \
+        -showvalue off \
+        -command [itcl::code $this EventuallySetGlyphsOpacity]
+    $inner.opacity set $_settings(glyphs-opacity)
+
+    blt::table $inner \
+        0,0 $inner.glyphs    -cspan 2  -anchor w -pady 2 \
+        1,0 $inner.outline   -cspan 2  -anchor w -pady 2 \
+        2,0 $inner.wireframe -cspan 2  -anchor w -pady 2 \
+        3,0 $inner.lighting  -cspan 2  -anchor w -pady 2 \
+        4,0 $inner.edges     -cspan 2  -anchor w -pady 2 \
+        5,0 $inner.opacity_l -anchor w -pady 2 \
+        5,1 $inner.opacity   -fill x   -pady 2 \
+        6,0 $inner.palette_l -anchor w -pady 2 \
+        6,1 $inner.palette   -fill x   -pady 2
+
+    blt::table configure $inner r* c* -resize none
+    blt::table configure $inner r8 c1 -resize expand
+}
+
+itcl::body Rappture::VtkViewer::BuildPolydataTab {} {
+
+    set fg [option get $itk_component(hull) font Font]
+    #set bfg [option get $itk_component(hull) boldFont Font]
+
+    set inner [$itk_component(main) insert 0 \
         -title "Mesh Settings" \
         -icon [Rappture::icon mesh]]
@@ -1844 +2078 @@
         -variable [itcl::scope _settings(polydata-visible)] \
         -command [itcl::code $this AdjustSetting polydata-visible] \
-        -font "Arial 9" -anchor w 
+        -font "Arial 9" -anchor w
+
+    checkbutton $inner.outline \
+        -text "Show Outline" \
+        -variable [itcl::scope _settings(polydata-outline)] \
+        -command [itcl::code $this AdjustSetting polydata-outline] \
+        -font "Arial 9" -anchor w
 
     checkbutton $inner.wireframe \
@@ -1850 +2090 @@
         -variable [itcl::scope _settings(polydata-wireframe)] \
         -command [itcl::code $this AdjustSetting polydata-wireframe] \
-        -font "Arial 9" -anchor w 
+        -font "Arial 9" -anchor w
 
     checkbutton $inner.lighting \
@@ -1864 +2104 @@
         -font "Arial 9" -anchor w
 
-    label $inner.palette_l -text "Palette" -font "Arial 9" -anchor w 
+    label $inner.palette_l -text "Palette" -font "Arial 9" -anchor w
     itk_component add meshpalette {
         Rappture::Combobox $inner.palette -width 10 -editable no
     }
-    $inner.palette choices insert end \
-        "BCGYR"              "BCGYR"            \
-        "BGYOR"              "BGYOR"            \
-        "blue"               "blue"             \
-        "blue-to-brown"      "blue-to-brown"    \
-        "blue-to-orange"     "blue-to-orange"   \
-        "blue-to-grey"       "blue-to-grey"     \
-        "green-to-magenta"   "green-to-magenta" \
-        "greyscale"          "greyscale"        \
-        "nanohub"            "nanohub"          \
-        "rainbow"            "rainbow"          \
-        "spectral"           "spectral"         \
-        "ROYGB"              "ROYGB"            \
-        "RYGCB"              "RYGCB"            \
-        "brown-to-blue"      "brown-to-blue"    \
-        "grey-to-blue"       "grey-to-blue"     \
-        "orange-to-blue"     "orange-to-blue"   
-
+    $inner.palette choices insert end [GetColormapList]
     $itk_component(meshpalette) value "BCGYR"
     bind $inner.palette <<Value>> \
         [itcl::code $this AdjustSetting polydata-palette]
 
-    label $inner.opacity_l -text "Opacity" -font "Arial 9" -anchor w 
+    label $inner.opacity_l -text "Opacity" -font "Arial 9" -anchor w
     ::scale $inner.opacity -from 0 -to 100 -orient horizontal \
         -variable [itcl::scope _settings(polydata-opacity)] \
         -width 10 \
         -showvalue off \
-        -command [itcl::code $this AdjustSetting polydata-opacity]
+        -command [itcl::code $this EventuallySetPolydataOpacity]
     $inner.opacity set $_settings(polydata-opacity)
 
     blt::table $inner \
         0,0 $inner.mesh      -cspan 2  -anchor w -pady 2 \
-        1,0 $inner.wireframe -cspan 2  -anchor w -pady 2 \
-        2,0 $inner.lighting  -cspan 2  -anchor w -pady 2 \
-        3,0 $inner.edges     -cspan 2  -anchor w -pady 2 \
-        4,0 $inner.opacity_l -anchor w -pady 2 \
-        4,1 $inner.opacity   -fill x   -pady 2 \
-        5,0 $inner.palette_l -anchor w -pady 2 \
-        5,1 $inner.palette   -fill x   -pady 2  
+        1,0 $inner.outline   -cspan 2  -anchor w -pady 2 \
+        2,0 $inner.wireframe -cspan 2  -anchor w -pady 2 \
+        3,0 $inner.lighting  -cspan 2  -anchor w -pady 2 \
+        4,0 $inner.edges     -cspan 2  -anchor w -pady 2 \
+        5,0 $inner.opacity_l -anchor w -pady 2 \
+        5,1 $inner.opacity   -fill x   -pady 2 \
+        6,0 $inner.palette_l -anchor w -pady 2 \
+        6,1 $inner.palette   -fill x   -pady 2
 
     blt::table configure $inner r* c* -resize none
-    blt::table configure $inner r7 c1 -resize expand
+    blt::table configure $inner r8 c1 -resize expand
 }
 
@@ -1919 +2143 @@
     set inner [$itk_component(main) insert end \
         -title "Axis Settings" \
-        -icon [Rappture::icon axis1]]
+        -icon [Rappture::icon axis2]]
     $inner configure -borderwidth 4
 
     checkbutton $inner.visible \
-        -text "Show Axes" \
+        -text "Axes" \
         -variable [itcl::scope _axis(visible)] \
         -command [itcl::code $this AdjustSetting axis-visible] \
@@ -1929 +2153 @@
 
     checkbutton $inner.labels \
-        -text "Show Axis Labels" \
+        -text "Axis Labels" \
         -variable [itcl::scope _axis(labels)] \
         -command [itcl::code $this AdjustSetting axis-labels] \
         -font "Arial 9"
-
-    checkbutton $inner.gridx \
-        -text "Show X Grid" \
+    label $inner.grid_l -text "Grid" -font "Arial 9"
+    checkbutton $inner.xgrid \
+        -text "X" \
         -variable [itcl::scope _axis(xgrid)] \
         -command [itcl::code $this AdjustSetting axis-xgrid] \
         -font "Arial 9"
-    checkbutton $inner.gridy \
-        -text "Show Y Grid" \
+    checkbutton $inner.ygrid \
+        -text "Y" \
         -variable [itcl::scope _axis(ygrid)] \
         -command [itcl::code $this AdjustSetting axis-ygrid] \
         -font "Arial 9"
-    checkbutton $inner.gridz \
-        -text "Show Z Grid" \
+    checkbutton $inner.zgrid \
+        -text "Z" \
         -variable [itcl::scope _axis(zgrid)] \
         -command [itcl::code $this AdjustSetting axis-zgrid] \
         -font "Arial 9"
-
-    label $inner.mode_l -text "Mode" -font "Arial 9" 
+    checkbutton $inner.minorticks \
+        -text "Minor Ticks" \
+        -variable [itcl::scope _axis(minorticks)] \
+        -command [itcl::code $this AdjustSetting axis-minorticks] \
+        -font "Arial 9"
+
+    label $inner.mode_l -text "Mode" -font "Arial 9"
 
     itk_component add axismode {
@@ -1958 +2187 @@
         "static_triad"    "static" \
         "closest_triad"   "closest" \
-        "furthest_triad"  "furthest" \
-        "outer_edges"     "outer"         
+        "furthest_triad"  "farthest" \
+        "outer_edges"     "outer"
     $itk_component(axismode) value "static"
     bind $inner.mode <<Value>> [itcl::code $this AdjustSetting axis-mode]
 
     blt::table $inner \
-        0,0 $inner.visible -anchor w -cspan 2 \
-        1,0 $inner.labels  -anchor w -cspan 2 \
-        2,0 $inner.gridx   -anchor w -cspan 2 \
-        3,0 $inner.gridy   -anchor w -cspan 2 \
-        4,0 $inner.gridz   -anchor w -cspan 2 \
-        5,0 $inner.mode_l  -anchor w -cspan 2 -padx { 2 0 } \
-        6,0 $inner.mode    -fill x   -cspan 2 
+        0,0 $inner.visible -anchor w -cspan 4 \
+        1,0 $inner.labels  -anchor w -cspan 4 \
+        2,0 $inner.minorticks  -anchor w -cspan 4 \
+        4,0 $inner.grid_l  -anchor w \
+        4,1 $inner.xgrid   -anchor w \
+        4,2 $inner.ygrid   -anchor w \
+        4,3 $inner.zgrid   -anchor w \
+        5,0 $inner.mode_l  -anchor w -padx { 2 0 } \
+        5,1 $inner.mode    -fill x   -cspan 3
 
     blt::table configure $inner r* c* -resize none
-    blt::table configure $inner r7 c1 -resize expand
+    blt::table configure $inner r7 c6 -resize expand
+    blt::table configure $inner r3 -height 0.125i
 }
 
@@ -1994 +2226 @@
         0,0 $inner.view_l -anchor e -pady 2 \
         0,1 $inner.view -anchor w -pady 2
+    blt::table configure $inner r0 -resize none
 
     set labels { qx qy qz qw xpan ypan zoom }
@@ -2000 +2233 @@
         label $inner.${tag}label -text $tag -font "Arial 9"
         entry $inner.${tag} -font "Arial 9"  -bg white \
-            -textvariable [itcl::scope _view($tag)]
-        bind $inner.${tag} <KeyPress-Return> \
-            [itcl::code $this camera set ${tag}]
+            -textvariable [itcl::scope _view(-$tag)]
+        bind $inner.${tag} <Return> \
+            [itcl::code $this camera set -${tag}]
+        bind $inner.${tag} <KP_Enter> \
+            [itcl::code $this camera set -${tag}]
         blt::table $inner \
             $row,0 $inner.${tag}label -anchor e -pady 2 \
@@ -2011 +2246 @@
     checkbutton $inner.ortho \
         -text "Orthographic Projection" \
-        -variable [itcl::scope _view(ortho)] \
-        -command [itcl::code $this camera set ortho] \
+        -variable [itcl::scope _view(-ortho)] \
+        -command [itcl::code $this camera set -ortho] \
         -font "Arial 9"
     blt::table $inner \
@@ -2019 +2254 @@
     incr row
 
-    blt::table configure $inner c* r* -resize none
+    blt::table configure $inner c* -resize none
     blt::table configure $inner c2 -resize expand
     blt::table configure $inner r$row -resize expand
@@ -2027 +2262 @@
 
     set fg [option get $itk_component(hull) font Font]
-    
+
     set inner [$itk_component(main) insert end \
         -title "Cutaway Along Axis" \
-        -icon [Rappture::icon cutbutton]] 
+        -icon [Rappture::icon cutbutton]]
 
     $inner configure -borderwidth 4
@@ -2070 +2305 @@
             -variable [itcl::scope _axis(xdirection)]
     }
-    set _axis(xdirection) -1 
+    set _axis(xdirection) -1
     Rappture::Tooltip::for $itk_component(xDirButton) \
         "Toggle the direction of the X-axis cutaway"
@@ -2112 +2347 @@
     Rappture::Tooltip::for $itk_component(yDirButton) \
         "Toggle the direction of the Y-axis cutaway"
-    set _axis(ydirection) -1 
+    set _axis(ydirection) -1
 
     # Z-value slicer...
@@ -2137 +2372 @@
     $itk_component(zCutScale) set 100
     $itk_component(zCutScale) configure -state disabled
-    #$itk_component(zCutScale) configure -state disabled
     Rappture::Tooltip::for $itk_component(zCutScale) \
         "@[itcl::code $this Slice tooltip z]"
@@ -2150 +2384 @@
             -variable [itcl::scope _axis(zdirection)]
     }
-    set _axis(zdirection) -1 
+    set _axis(zdirection) -1
     Rappture::Tooltip::for $itk_component(zDirButton) \
         "Toggle the direction of the Z-axis cutaway"
@@ -2169 +2403 @@
     set fg [option get $itk_component(hull) font Font]
 
-    set inner [$itk_component(main) insert end \
+    set inner [$itk_component(main) insert 0 \
         -title "Molecule Settings" \
         -icon [Rappture::icon molecule]]
@@ -2180 +2414 @@
         -font "Arial 9"
 
+    checkbutton $inner.outline \
+        -text "Show Outline" \
+        -variable [itcl::scope _settings(molecule-outline)] \
+        -command [itcl::code $this AdjustSetting molecule-outline] \
+        -font "Arial 9"
+
     checkbutton $inner.label \
         -text "Show Atom Labels" \
@@ -2212 +2452 @@
     $inner.rep choices insert end \
         "ballandstick"  "Ball and Stick" \
-        "spheres"       "Spheres"        \
-        "sticks"        "Sticks"         \
-        "rods"          "Rods"           \
-        "wireframe"     "Wireframe"      \
-        "spacefilling"  "Space Filling" 
+        "spheres"       "Spheres"        \
+        "sticks"        "Sticks"         \
+        "rods"          "Rods"           \
+        "wireframe"     "Wireframe"      \
+        "spacefilling"  "Space Filling"
 
     bind $inner.rep <<Value>> \
@@ -2229 +2469 @@
     }
     $inner.rscale choices insert end \
-        "atomic"        "Atomic"   \
-        "covalent"      "Covalent" \
-        "van_der_waals" "VDW"      \
-        "none"          "Constant"
+        "atomic"        "Atomic"   \
+        "covalent"      "Covalent" \
+        "van_der_waals" "VDW"      \
+        "none"          "Constant"
 
     bind $inner.rscale <<Value>> \
@@ -2238 +2478 @@
     $inner.rscale value "Covalent"
 
-    label $inner.palette_l -text "Palette" -font "Arial 9" 
+    label $inner.palette_l -text "Palette" -font "Arial 9"
     itk_component add moleculepalette {
         Rappture::Combobox $inner.palette -width 10 -editable no
     }
-    $inner.palette choices insert end \
-        "elementDefault"     "elementDefault"   \
-        "BCGYR"              "BCGYR"            \
-        "BGYOR"              "BGYOR"            \
-        "blue"               "blue"             \
-        "blue-to-brown"      "blue-to-brown"    \
-        "blue-to-orange"     "blue-to-orange"   \
-        "blue-to-grey"       "blue-to-grey"     \
-        "green-to-magenta"   "green-to-magenta" \
-        "greyscale"          "greyscale"        \
-        "nanohub"            "nanohub"          \
-        "rainbow"            "rainbow"          \
-        "spectral"           "spectral"         \
-        "ROYGB"              "ROYGB"            \
-        "RYGCB"              "RYGCB"            \
-        "brown-to-blue"      "brown-to-blue"    \
-        "grey-to-blue"       "grey-to-blue"     \
-        "orange-to-blue"     "orange-to-blue"   
-
+    $inner.palette choices insert end [GetColormapList -includeElementDefault]
     $itk_component(moleculepalette) value "elementDefault"
     bind $inner.palette <<Value>> \
         [itcl::code $this AdjustSetting molecule-palette]
-
-    checkbutton $inner.labels -text "Show labels on atoms" \
-        -command [itcl::code $this labels update] \
-        -variable [itcl::scope _settings(molecule-labels)] \
-        -font "Arial 9"
-    Rappture::Tooltip::for $inner.labels \
-        "Display atom symbol and serial number."
-
-    checkbutton $inner.rock -text "Rock molecule back and forth" \
-        -variable [itcl::scope _settings(molecule-rock)] \
-        -font "Arial 9"
-    Rappture::Tooltip::for $inner.rock \
-        "Rotate the object back and forth around the y-axis."
-
-    checkbutton $inner.cell -text "Parallelepiped" \
-        -font "Arial 9"
-    $inner.cell select
 
     label $inner.atomscale_l -text "Atom Scale" -font "Arial 9"
@@ -2321 +2526 @@
     blt::table $inner \
         0,0 $inner.molecule     -anchor w -pady {1 0} \
-        1,0 $inner.label        -anchor w -pady {1 0} \
-        2,0 $inner.edges        -anchor w -pady {1 0} \
-        3,0 $inner.rep_l        -anchor w -pady { 2 0 } \
-        4,0 $inner.rep          -fill x    -pady 2 \
-        5,0 $inner.rscale_l     -anchor w -pady { 2 0 } \
-        6,0 $inner.rscale       -fill x    -pady 2 \
-        7,0 $inner.palette_l    -anchor w  -pady 0 \
-        8,0 $inner.palette      -fill x    -padx 2 \
-        9,0 $inner.atomscale_l  -anchor w -pady {3 0} \
-        10,0 $inner.atomscale   -fill x    -padx 2 \
-        11,0 $inner.bondscale_l -anchor w -pady {3 0} \
-        12,0 $inner.bondscale   -fill x   -padx 2 \
-        13,0 $inner.opacity_l   -anchor w -pady {3 0} \
-        14,0 $inner.opacity     -fill x    -padx 2 \
-        15,0 $inner.quality_l   -anchor w -pady {3 0} \
-        16,0 $inner.quality     -fill x    -padx 2
-    
+        1,0 $inner.outline      -anchor w -pady {1 0} \
+        2,0 $inner.label        -anchor w -pady {1 0} \
+        3,0 $inner.edges        -anchor w -pady {1 0} \
+        4,0 $inner.rep_l        -anchor w -pady { 2 0 } \
+        5,0 $inner.rep          -fill x    -pady 2 \
+        6,0 $inner.rscale_l     -anchor w -pady { 2 0 } \
+        7,0 $inner.rscale       -fill x    -pady 2 \
+        8,0 $inner.palette_l    -anchor w  -pady 0 \
+        9,0 $inner.palette      -fill x    -padx 2 \
+        10,0 $inner.atomscale_l  -anchor w -pady {3 0} \
+        11,0 $inner.atomscale   -fill x    -padx 2 \
+        12,0 $inner.bondscale_l -anchor w -pady {3 0} \
+        13,0 $inner.bondscale   -fill x   -padx 2 \
+        14,0 $inner.opacity_l   -anchor w -pady {3 0} \
+        15,0 $inner.opacity     -fill x    -padx 2 \
+        16,0 $inner.quality_l   -anchor w -pady {3 0} \
+        17,0 $inner.quality     -fill x    -padx 2
+
     blt::table configure $inner r* -resize none
-    blt::table configure $inner r17 -resize expand
-}
-
-#
-#  camera -- 
+    blt::table configure $inner r18 -resize expand
+}
+
+#
+#  camera --
 #
 itcl::body Rappture::VtkViewer::camera {option args} {
-    switch -- $option { 
+    switch -- $option {
         "show" {
             puts [array get _view]
         }
         "set" {
-            set who [lindex $args 0]
-            set x $_view($who)
+            set what [lindex $args 0]
+            set x $_view($what)
             set code [catch { string is double $x } result]
             if { $code != 0 || !$result } {
                 return
             }
-            switch -- $who {
-                "ortho" {
-                    if {$_view(ortho)} {
+            switch -- $what {
+                "-ortho" {
+                    if {$_view($what)} {
                         SendCmd "camera mode ortho"
                     } else {
@@ -2365 +2571 @@
                     }
                 }
-                "xpan" - "ypan" {
+                "-xpan" - "-ypan" {
                     PanCamera
                 }
-                "qx" - "qy" - "qz" - "qw" {
-                    set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
+                "-qx" - "-qy" - "-qz" - "-qw" {
+                    set q [ViewToQuaternion]
                     $_arcball quaternion $q
                     EventuallyRotate $q
                 }
-                "zoom" {
-                    SendCmd "camera zoom $_view(zoom)"
+                "-zoom" {
+                    SendCmd "camera zoom $_view($what)"
                 }
             }
@@ -2394 +2600 @@
 
 itcl::body Rappture::VtkViewer::GetImage { args } {
-    if { [image width $_image(download)] > 0 && 
+    if { [image width $_image(download)] > 0 &&
          [image height $_image(download)] > 0 } {
         set bytes [$_image(download) data -format "jpeg -quality 100"]
@@ -2407 +2613 @@
         -title "[Rappture::filexfer::label downloadWord] as..."
     set inner [$popup component inner]
-    label $inner.summary -text "" -anchor w 
+    label $inner.summary -text "" -anchor w
     radiobutton $inner.vtk_button -text "VTK data file" \
         -variable [itcl::scope _downloadPopup(format)] \
         -font "Helvetica 9 " \
-        -value vtk  
+        -value vtk
     Rappture::Tooltip::for $inner.vtk_button "Save as VTK data file."
     radiobutton $inner.image_button -text "Image File" \
         -variable [itcl::scope _downloadPopup(format)] \
-        -value image 
+        -value image
     Rappture::Tooltip::for $inner.image_button \
         "Save as digital image."
@@ -2436 +2642 @@
         2,0 $inner.image_button -anchor w -cspan 2 -padx { 4 0 } \
         4,1 $inner.cancel -width .9i -fill y \
-        4,0 $inner.ok -padx 2 -width .9i -fill y 
+        4,0 $inner.ok -padx 2 -width .9i -fill y
     blt::table configure $inner r3 -height 4
     blt::table configure $inner r4 -pady 4
@@ -2455 +2661 @@
         "glyphs" {
             array set settings {
-                -color \#FFFFFF
+                -color white
+                -edgecolor black
+                -edges 0
                 -gscale 1
-                -edges 0
-                -edgecolor black
+                -lighting 1
                 -linewidth 1.0
+                -normscale 0
                 -opacity 1.0
+                -orientGlyphs 0
+                -outline 0
+                -ptsize 1.0
+                -quality 1
+                -scaleMode "vcomp"
+                -shape "sphere"
+                -visible 1
                 -wireframe 0
-                -lighting 1
-                -visible 1
-            }
+            }
+            array set settings $style
             set shape [$dataobj shape $comp]
-            array set settings $style
-            SendCmd "glyphs add $shape $tag"
-            SendCmd "glyphs normscale 0 $tag"
+            if {$shape != ""} {
+                set settings(-shape) $shape
+            }
+            SendCmd "outline add $tag"
+            SendCmd "outline color [Color2RGB $settings(-color)] $tag"
+            SendCmd "outline visible $settings(-outline) $tag"
+            set _settings(glyphs-outline) $settings(-outline)
+
+            SendCmd "glyphs add $settings(-shape) $tag"
+            SendCmd "glyphs normscale $settings(-normscale) $tag"
             SendCmd "glyphs gscale $settings(-gscale) $tag"
             SendCmd "glyphs wireframe $settings(-wireframe) $tag"
             SendCmd "glyphs color [Color2RGB $settings(-color)] $tag"
             #SendCmd "glyphs colormode constant {} $tag"
-            SendCmd "glyphs gorient 0 {} $tag"
-            SendCmd "glyphs smode vcomp {} $tag"
+            # Omitting field name for gorient and smode commands
+            # defaults to active scalars or vectors depending on mode
+            SendCmd "glyphs gorient $settings(-orientGlyphs) {} $tag"
+            SendCmd "glyphs smode $settings(-scaleMode) {} $tag"
+            SendCmd "glyphs edges $settings(-edges) $tag"
+            SendCmd "glyphs linecolor [Color2RGB $settings(-edgecolor)] $tag"
+            SendCmd "glyphs linewidth $settings(-linewidth) $tag"
+            SendCmd "glyphs ptsize $settings(-ptsize) $tag"
+            SendCmd "glyphs quality $settings(-quality) $tag"
+            SendCmd "glyphs lighting $settings(-lighting) $tag"
             SendCmd "glyphs opacity $settings(-opacity) $tag"
+            set _settings(glyphs-opacity) [expr 100.0 * $settings(-opacity)]
             SendCmd "glyphs visible $settings(-visible) $tag"
             set _settings(glyphs-wireframe) $settings(-wireframe)
         }
         "molecule" {
+            array set settings {
+                -atomscale 0.3
+                -atomsvisible 1
+                -bondscale 0.075
+                -bondstyle "cylinder"
+                -bondsvisible 1
+                -color "elementDefault"
+                -edgecolor black
+                -edges 0
+                -labels 0
+                -lighting 1
+                -linewidth 1.0
+                -opacity 1.0
+                -outline 0
+                -quality 1.0
+                -representation ""
+                -rscale "covalent"
+                -visible 1
+                -wireframe 0
+            }
+            array set settings $style
+
+            SendCmd "outline add $tag"
+            SendCmd "outline color [Color2RGB white] $tag"
+            SendCmd "outline visible $settings(-outline) $tag"
+            set _settings(molecule-outline) $settings(-outline)
+
             SendCmd "molecule add $tag"
-            SendCmd "molecule ascale $_settings(molecule-atomscale) $tag"
-            SendCmd "molecule bscale $_settings(molecule-bondscale) $tag"
-            SendCmd "molecule bstyle $_settings(molecule-bondstyle) $tag"
-            SendCmd "molecule atoms $_settings(molecule-atoms-visible) $tag"
-            SendCmd "molecule bonds $_settings(molecule-bonds-visible) $tag"
+            if {$settings(-representation) != ""} {
+                switch -- $settings(-representation) {
+                    "ballandstick" {
+                        set _settings(molecule-rscale) covalent
+                        set _settings(molecule-atoms-visible) 1
+                        set _settings(molecule-bonds-visible) 1
+                        set _settings(molecule-bondstyle) cylinder
+                        set _settings(molecule-atomscale) 0.3
+                        set _settings(molecule-bondscale) 0.075
+                    }
+                    "balls" - "spheres" {
+                        set _settings(molecule-rscale) covalent
+                        set _settings(molecule-atoms-visible) 1
+                        set _settings(molecule-bonds-visible) 0
+                        set _settings(molecule-bondstyle) cylinder
+                        set _settings(molecule-atomscale) 0.3
+                        set _settings(molecule-bondscale) 0.075
+                    }
+                    "sticks" {
+                        set _settings(molecule-rscale) none
+                        set _settings(molecule-atoms-visible) 1
+                        set _settings(molecule-bonds-visible) 1
+                        set _settings(molecule-bondstyle) cylinder
+                        set _settings(molecule-atomscale) 0.075
+                        set _settings(molecule-bondscale) 0.075
+                    }
+                    "spacefilling" {
+                        set _settings(molecule-rscale) van_der_waals
+                        set _settings(molecule-atoms-visible) 1
+                        set _settings(molecule-bonds-visible) 0
+                        set _settings(molecule-bondstyle) cylinder
+                        set _settings(molecule-atomscale) 1.0
+                        set _settings(molecule-bondscale) 0.075
+                    }
+                    "rods"  {
+                        set _settings(molecule-rscale) none
+                        set _settings(molecule-atoms-visible) 1
+                        set _settings(molecule-bonds-visible) 1
+                        set _settings(molecule-bondstyle) cylinder
+                        set _settings(molecule-atomscale) 0.1
+                        set _settings(molecule-bondscale) 0.1
+                    }
+                    "wireframe" - "lines" {
+                        set _settings(molecule-rscale) none
+                        set _settings(molecule-atoms-visible) 0
+                        set _settings(molecule-bonds-visible) 1
+                        set _settings(molecule-bondstyle) line
+                        set _settings(molecule-atomscale) 1.0
+                        set _settings(molecule-bondscale) 1.0
+                    }
+                    default {
+                        error "unknown representation $value"
+                    }
+                }
+                SendCmd "molecule rscale $_settings(molecule-rscale) $tag"
+                SendCmd "molecule atoms $_settings(molecule-atoms-visible) $tag"
+                SendCmd "molecule bonds $_settings(molecule-bonds-visible) $tag"
+                SendCmd "molecule bstyle $_settings(molecule-bondstyle) $tag"
+                SendCmd "molecule ascale $_settings(molecule-atomscale) $tag"
+                SendCmd "molecule bscale $_settings(molecule-bondscale) $tag"
+                $itk_component(representation) value [$itk_component(representation) label $settings(-representation)]
+                $itk_component(rscale) value [$itk_component(rscale) label $_settings(molecule-rscale)]
+                switch -- $settings(-representation) {
+                    "ballandstick" - "balls" - "spheres" {
+                        $itk_component(rscale) configure -state normal
+                    }
+                    default {
+                        $itk_component(rscale) configure -state disabled
+                    }
+                }
+            } else {
+                SendCmd "molecule rscale $settings(-rscale) $tag"
+                set _settings(molecule-rscale) $settings(-rscale)
+                SendCmd "molecule atoms $settings(-atomsvisible) $tag"
+                set _settings(molecule-atoms-visible) $settings(-atomsvisible)
+                SendCmd "molecule bonds $settings(-bondsvisible) $tag"
+                set _settings(molecule-bonds-visible) $settings(-bondsvisible)
+                SendCmd "molecule bstyle $settings(-bondstyle) $tag"
+                set _settings(molecule-bondstyle) $settings(-bondstyle)
+                SendCmd "molecule ascale $settings(-atomscale) $tag"
+                set _settings(molecule-atomscale) $settings(-atomscale)
+                SendCmd "molecule bscale $settings(-bondscale) $tag"
+                set _settings(molecule-bondscale) $settings(-bondscale)
+            }
+            SendCmd "molecule labels $settings(-labels) $tag"
+            set _settings(molecule-labels) $settings(-labels)
+            SendCmd "molecule linecolor [Color2RGB $settings(-edgecolor)] $tag"
+            SendCmd "molecule linewidth $settings(-linewidth) $tag"
+            SendCmd "molecule edges $settings(-edges) $tag"
+            set _settings(molecule-edges) $settings(-edges)
+            SendCmd "molecule lighting $settings(-lighting) $tag"
+            set _settings(molecule-lighting) $settings(-lighting)
+            SendCmd "molecule aquality $settings(-quality) $tag"
+            SendCmd "molecule bquality $settings(-quality) $tag"
+            set _settings(molecule-quality) $settings(-quality)
+            SendCmd "molecule visible $settings(-visible) $tag"
+            set _settings(molecule-visible) $settings(-visible)
             set _haveMolecules 1
         }
         "polydata" {
             array set settings {
-                -color \#FFFFFF
+                -cloudstyle "mesh"
+                -color white
+                -edgecolor black
                 -edges 1
-                -edgecolor black
+                -lighting 1
                 -linewidth 1.0
                 -opacity 1.0
+                -outline 0
+                -visible 1
                 -wireframe 0
-                -lighting 1
-                -visible 1
             }
             array set settings $style
+
+            SendCmd "outline add $tag"
+            SendCmd "outline color [Color2RGB $settings(-color)] $tag"
+            SendCmd "outline visible $settings(-outline) $tag"
+            set _settings(polydata-outline) $settings(-outline)
+
             SendCmd "polydata add $tag"
             SendCmd "polydata visible $settings(-visible) $tag"
@@ -2505 +2862 @@
             SendCmd "polydata edges $settings(-edges) $tag"
             set _settings(polydata-edges) $settings(-edges)
+            SendCmd "polydata cloudstyle $settings(-cloudstyle) $tag"
             SendCmd "polydata color [Color2RGB $settings(-color)] $tag"
             #SendCmd "polydata colormode constant {} $tag"
@@ -2561 +2919 @@
     set font "Arial 8"
     set lineht [font metrics $font -linespace]
-    
+
     if { $_settings(legend) } {
         set x [expr $w - 2]
@@ -2626 +2984 @@
     set font "Arial 8"
     set lineht [font metrics $font -linespace]
-    
+
     set imgHeight [image height $_image(legend)]
     set coords [$c coords colormap]
@@ -2640 +2998 @@
     }
     set color [eval format "\#%02x%02x%02x" $pixel]
-    $_image(swatch) put black  -to 0 0 23 23 
-    $_image(swatch) put $color -to 1 1 22 22 
+    $_image(swatch) put black  -to 0 0 23 23
+    $_image(swatch) put $color -to 1 1 22 22
     .rappturetooltip configure -icon $_image(swatch)
 
@@ -2647 +3005 @@
     set t [expr 1.0 - (double($imgY) / double($imgHeight-1))]
     set value [expr $t * ($_limits(vmax) - $_limits(vmin)) + $_limits(vmin)]
-    set tipx [expr $x + 15] 
+    set tipx [expr $x + 15]
     set tipy [expr $y - 5]
     Rappture::Tooltip::text $c "$_title $value"
-    Rappture::Tooltip::tooltip show $c +$tipx,+$tipy    
+    Rappture::Tooltip::tooltip show $c +$tipx,+$tipy
 }
 
@@ -2665 +3023 @@
         "move" {
             set axis [lindex $args 0]
-            set oldval $_axis(${axis}position)
             set newval [lindex $args 1]
             if {[llength $args] != 2} {
@@ -2684 +3041 @@
 }
 
-itcl::body Rappture::VtkViewer::SetOrientation { side } { 
+itcl::body Rappture::VtkViewer::SetOrientation { side } {
     array set positions {
         front "1 0 0 0"
@@ -2693 +3050 @@
         bottom "0.707107 0.707107 0 0"
     }
-    foreach name { qw qx qy qz } value $positions($side) {
+    foreach name { -qw -qx -qy -qz } value $positions($side) {
         set _view($name) $value
-    } 
-    set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
+    }
+    set q [ViewToQuaternion]
     $_arcball quaternion $q
     SendCmd "camera orient $q"
     SendCmd "camera reset"
-    set _view(xpan) 0
-    set _view(ypan) 0
-    set _view(zoom) 1.0
-}
-
-itcl::body Rappture::VtkViewer::SetOpacity { dataset } { 
+    set _view(-xpan) 0
+    set _view(-ypan) 0
+    set _view(-zoom) 1.0
+}
+
+itcl::body Rappture::VtkViewer::SetOpacity { dataset } {
     foreach {dataobj comp} [split $dataset -] break
     set type [$dataobj type $comp]