Changeset 5729

Timestamp:

Jun 22, 2015 1:17:20 PM (9 years ago)

Author:

ldelgass

Message:

Start syncing up code between viewers

Location:

trunk/gui/scripts

Files:

• flowvisviewer.tcl (modified) (34 diffs)
• molvisviewer.tcl (modified) (16 diffs)
• nanovisviewer.tcl (modified) (35 diffs)
• vtkvolumeviewer.tcl (modified) (14 diffs)

trunk/gui/scripts/flowvisviewer.tcl

@@ -3 +3 @@
 #  COMPONENT: flowvisviewer - 3D flow rendering
 #
-#  This widget performs volume and flow rendering on 3D scalar/vector datasets.
+#  This widget performs volume and flow rendering on 3D vector datasets.
 #  It connects to the Nanovis server running on a rendering farm,
 #  transmits data, and displays the results.
 # ======================================================================
 #  AUTHOR:  Michael McLennan, Purdue University
-#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
+#  Copyright (c) 2004-2015  HUBzero Foundation, LLC
 #
 #  See the file "license.terms" for information on usage and
@@ -171 +171 @@
     set _serverType "nanovis"
 
-    # Draw legend event
+    #DebugOn
+    EnableWaitDialog 900
+
+    # Rebuild event
+    $_dispatcher register !rebuild
+    $_dispatcher dispatch $this !rebuild "[itcl::code $this Rebuild]; list"
+
+    # Resize event
+    $_dispatcher register !resize
+    $_dispatcher dispatch $this !resize "[itcl::code $this DoResize]; list"
+
+    # Legend event
     $_dispatcher register !legend
     $_dispatcher dispatch $this !legend "[itcl::code $this FixLegend]; list"
@@ -179 +190 @@
     $_dispatcher dispatch $this !send_transfunc \
         "[itcl::code $this SendTransferFunctions]; list"
-
-    # Rebuild event
-    $_dispatcher register !rebuild
-    $_dispatcher dispatch $this !rebuild "[itcl::code $this Rebuild]; list"
-
-    # Resize event
-    $_dispatcher register !resize
-    $_dispatcher dispatch $this !resize "[itcl::code $this DoResize]; list"
 
     $_dispatcher register !play
@@ -211 +214 @@
     # Initialize the view to some default parameters.
     array set _view {
-        -qw      0.853553
-        -qx      -0.353553
-        -qy      0.353553
-        -qz      0.146447
-        -xpan    0
-        -ypan    0
-        -zoom    1.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]
@@ -266 +269 @@
     }]
 
-    itk_component add 3dview {
+    itk_component add view {
         label $itk_component(plotarea).view -image $_image(plot) \
             -highlightthickness 0 -borderwidth 0
@@ -273 +276 @@
         ignore -highlightthickness -borderwidth  -background
     }
-    bind $itk_component(3dview) <Control-F1> [itcl::code $this ToggleConsole]
+    bind $itk_component(view) <Control-F1> [itcl::code $this ToggleConsole]
 
     set f [$itk_component(main) component controls]
@@ -317 +320 @@
             -onimage [Rappture::icon volume-on] \
             -offimage [Rappture::icon volume-off] \
-            -command [itcl::code $this AdjustSetting -volume] \
-            -variable [itcl::scope _settings(-volume)]
+            -variable [itcl::scope _settings(-volume)] \
+            -command [itcl::code $this AdjustSetting -volume]
     }
     $itk_component(volume) select
@@ -362 +365 @@
     # the server.  So the panewindow uses the tiny size.
     set w 10000
-    pack forget $itk_component(3dview)
+    pack forget $itk_component(view)
     blt::table $itk_component(plotarea) \
-        0,0 $itk_component(3dview) -fill both -reqwidth $w \
+        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
@@ -511 +514 @@
     blt::table configure $itk_component(flowcontrols) r0 -pady 1
     # Bindings for rotation via mouse
-    bind $itk_component(3dview) <ButtonPress-1> \
+    bind $itk_component(view) <ButtonPress-1> \
         [itcl::code $this Rotate click %x %y]
-    bind $itk_component(3dview) <B1-Motion> \
+    bind $itk_component(view) <B1-Motion> \
         [itcl::code $this Rotate drag %x %y]
-    bind $itk_component(3dview) <ButtonRelease-1> \
+    bind $itk_component(view) <ButtonRelease-1> \
         [itcl::code $this Rotate release %x %y]
 
-    bind $itk_component(3dview) <Configure> \
+    bind $itk_component(view) <Configure> \
         [itcl::code $this EventuallyResize %w %h]
 
     # Bindings for panning via mouse
-    bind $itk_component(3dview) <ButtonPress-2> \
+    bind $itk_component(view) <ButtonPress-2> \
         [itcl::code $this Pan click %x %y]
-    bind $itk_component(3dview) <B2-Motion> \
+    bind $itk_component(view) <B2-Motion> \
         [itcl::code $this Pan drag %x %y]
-    bind $itk_component(3dview) <ButtonRelease-2> \
+    bind $itk_component(view) <ButtonRelease-2> \
         [itcl::code $this Pan release %x %y]
 
     # Bindings for panning via keyboard
-    bind $itk_component(3dview) <KeyPress-Left> \
+    bind $itk_component(view) <KeyPress-Left> \
         [itcl::code $this Pan set -10 0]
-    bind $itk_component(3dview) <KeyPress-Right> \
+    bind $itk_component(view) <KeyPress-Right> \
         [itcl::code $this Pan set 10 0]
-    bind $itk_component(3dview) <KeyPress-Up> \
+    bind $itk_component(view) <KeyPress-Up> \
         [itcl::code $this Pan set 0 -10]
-    bind $itk_component(3dview) <KeyPress-Down> \
+    bind $itk_component(view) <KeyPress-Down> \
         [itcl::code $this Pan set 0 10]
-    bind $itk_component(3dview) <Shift-KeyPress-Left> \
+    bind $itk_component(view) <Shift-KeyPress-Left> \
         [itcl::code $this Pan set -2 0]
-    bind $itk_component(3dview) <Shift-KeyPress-Right> \
+    bind $itk_component(view) <Shift-KeyPress-Right> \
         [itcl::code $this Pan set 2 0]
-    bind $itk_component(3dview) <Shift-KeyPress-Up> \
+    bind $itk_component(view) <Shift-KeyPress-Up> \
         [itcl::code $this Pan set 0 -2]
-    bind $itk_component(3dview) <Shift-KeyPress-Down> \
+    bind $itk_component(view) <Shift-KeyPress-Down> \
         [itcl::code $this Pan set 0 2]
 
     # Bindings for zoom via keyboard
-    bind $itk_component(3dview) <KeyPress-Prior> \
+    bind $itk_component(view) <KeyPress-Prior> \
         [itcl::code $this Zoom out]
-    bind $itk_component(3dview) <KeyPress-Next> \
+    bind $itk_component(view) <KeyPress-Next> \
         [itcl::code $this Zoom in]
 
-    bind $itk_component(3dview) <Enter> "focus $itk_component(3dview)"
+    bind $itk_component(view) <Enter> "focus $itk_component(view)"
 
     if {[string equal "x11" [tk windowingsystem]]} {
         # Bindings for zoom via mouse
-        bind $itk_component(3dview) <4> [itcl::code $this Zoom out]
-        bind $itk_component(3dview) <5> [itcl::code $this Zoom in]
+        bind $itk_component(view) <4> [itcl::code $this Zoom out]
+        bind $itk_component(view) <5> [itcl::code $this Zoom in]
     }
 
@@ -565 +568 @@
     eval itk_initialize $args
 
-    EnableWaitDialog 900
     Connect
 }
@@ -629 +631 @@
 # ----------------------------------------------------------------------
 # USAGE: get ?-objects?
-# USAGE: get ?-image 3dview|legend?
+# USAGE: get ?-image view|legend?
 #
 # Clients use this to query the list of objects being plotted, in
@@ -659 +661 @@
         -image {
             if {[llength $args] != 2} {
-                error "wrong # args: should be \"get -image 3dview|legend\""
+                error "wrong # args: should be \"get -image view|legend\""
             }
             switch -- [lindex $args end] {
-                3dview {
+                view {
                     return $_image(plot)
                 }
@@ -669 +671 @@
                 }
                 default {
-                    error "bad image name \"[lindex $args end]\": should be 3dview or legend"
+                    error "bad image name \"[lindex $args end]\": should be view or legend"
                 }
             }
@@ -682 +684 @@
 # USAGE: delete ?<dataobj1> <dataobj2> ...?
 #
-#       Clients use this to delete a dataobj from the plot.  If no dataobjs
-#       are specified, then all dataobjs are deleted.  No data objects are
-#       deleted.  They are only removed from the display list.
-#
+# Clients use this to delete a dataobj from the plot.  If no dataobjs
+# are specified, then all dataobjs are deleted.  No data objects are
+# deleted.  They are only removed from the display list.
 # ----------------------------------------------------------------------
 itcl::body Rappture::FlowvisViewer::delete {args} {
@@ -868 +869 @@
         }
 
-        set w [winfo width $itk_component(3dview)]
-        set h [winfo height $itk_component(3dview)]
+        set w [winfo width $itk_component(view)]
+        set h [winfo height $itk_component(view)]
         EventuallyResize $w $h
     }
@@ -878 +879 @@
 # isconnected --
 #
-#       Indicates if we are currently connected to the visualization server.
+# Indicates if we are currently connected to the visualization server.
 #
 itcl::body Rappture::FlowvisViewer::isconnected {} {
@@ -894 +895 @@
 # Disconnect --
 #
-#       Clients use this method to disconnect from the current rendering
-#       server.
+# Clients use this method to disconnect from the current rendering server.
 #
 itcl::body Rappture::FlowvisViewer::Disconnect {} {
@@ -1025 +1025 @@
 # ReceiveLegend --
 #
-#       The procedure is the response from the render server to each "legend"
-#       command.  The server sends back a "legend" command invoked our
-#       the slave interpreter.  The purpose is to collect data of the image
-#       representing the legend in the canvas.  In addition, the
-#       active transfer function is displayed.
+# The procedure is the response from the render server to each "legend"
+# command.  The server sends back a "legend" command invoked our
+# the slave interpreter.  The purpose is to collect data of the image
+# representing the legend in the canvas.  In addition, the
+# active transfer function is displayed.
 #
 itcl::body Rappture::FlowvisViewer::ReceiveLegend { tag vmin vmax size } {
@@ -1045 +1045 @@
 # ReceiveData --
 #
-#       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 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.
 #
 itcl::body Rappture::FlowvisViewer::ReceiveData { args } {
@@ -1071 +1071 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::FlowvisViewer::Rebuild {} {
-    set w [winfo width $itk_component(3dview)]
-    set h [winfo height $itk_component(3dview)]
+    set w [winfo width $itk_component(view)]
+    set h [winfo height $itk_component(view)]
     if { $w < 2 || $h < 2 } {
         update
@@ -1183 +1183 @@
         PanCamera
         SendCmd "camera zoom $_view(-zoom)"
+        set _reset 0
     }
 
@@ -1197 +1198 @@
     StopBufferingCommands
     blt::busy release $itk_component(hull)
-    set _reset 0
 }
 
@@ -1295 +1295 @@
     switch -- $option {
         click {
-            $itk_component(3dview) configure -cursor fleur
+            $itk_component(view) configure -cursor fleur
             set _click(x) $x
             set _click(y) $y
@@ -1303 +1303 @@
                 Rotate click $x $y
             } else {
-                set w [winfo width $itk_component(3dview)]
-                set h [winfo height $itk_component(3dview)]
+                set w [winfo width $itk_component(view)]
+                set h [winfo height $itk_component(view)]
                 if {$w <= 0 || $h <= 0} {
                     return
@@ -1331 +1331 @@
         release {
             Rotate drag $x $y
-            $itk_component(3dview) configure -cursor ""
+            $itk_component(view) configure -cursor ""
             catch {unset _click}
         }
@@ -1350 +1350 @@
 itcl::body Rappture::FlowvisViewer::Pan {option x y} {
     # Experimental stuff
-    set w [winfo width $itk_component(3dview)]
-    set h [winfo height $itk_component(3dview)]
+    set w [winfo width $itk_component(view)]
+    set h [winfo height $itk_component(view)]
     if { $option == "set" } {
         set x [expr $x / double($w)]
@@ -1365 +1365 @@
         set _click(x) $x
         set _click(y) $y
-        $itk_component(3dview) configure -cursor hand1
+        $itk_component(view) configure -cursor hand1
     }
     if { $option == "drag" || $option == "release" } {
@@ -1379 +1379 @@
     }
     if { $option == "release" } {
-        $itk_component(3dview) configure -cursor ""
+        $itk_component(view) configure -cursor ""
     }
 }
@@ -1470 +1470 @@
             if { $_settings($what) } {
                 blt::table $itk_component(plotarea) \
-                    0,0 $itk_component(3dview) -fill both \
+                    0,0 $itk_component(view) -fill both \
                     1,0 $itk_component(legend) -fill x
                 blt::table configure $itk_component(plotarea) r1 -resize none
@@ -1591 +1591 @@
 # NameTransferFunction --
 #
-#       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.]
+# 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::FlowvisViewer::NameTransferFunction { dataobj cname } {
@@ -1616 +1616 @@
 # 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.
+# 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::FlowvisViewer::ComputeTransferFunction { tf } {
@@ -2603 +2603 @@
         }
         "next" {
-            if { ![winfo viewable $itk_component(3dview)] } {
+            if { ![winfo viewable $itk_component(view)] } {
                 flow stop
                 return
@@ -2918 +2918 @@
 # 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.
+# 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::FlowvisViewer::BuildVolumeComponents {} {
@@ -2937 +2937 @@
 # 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.
+# 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::FlowvisViewer::GetDatasetsWithComponent { cname } {

trunk/gui/scripts/molvisviewer.tcl

@@ -8 +8 @@
 # ======================================================================
 #  AUTHOR:  Michael McLennan, Purdue University
-#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
+#  Copyright (c) 2004-2015  HUBzero Foundation, LLC
 #
 #  See the file "license.terms" for information on usage and
@@ -230 +230 @@
     }]
 
-    itk_component add 3dview {
+    itk_component add view {
         label $itk_component(plotarea).view -image $_image(plot) \
             -highlightthickness 0 -borderwidth 0
@@ -237 +237 @@
         ignore -highlightthickness -borderwidth  -background
     }
-    bind $itk_component(3dview) <Control-F1> [itcl::code $this ToggleConsole]
+    bind $itk_component(view) <Control-F1> [itcl::code $this ToggleConsole]
 
     set f [$itk_component(main) component controls]
@@ -312 +312 @@
     BuildSettingsTab
 
-    # HACK ALERT. Initially force a requested width of the 3dview label.
-
-    # It's a chicken-and-the-egg problem.  The size of the 3dview label is set
+    # HACK ALERT. Initially force a requested width of the view label.
+
+    # It's a chicken-and-the-egg problem.  The size of the view label is set
     # from the size of the image retrieved from the server.  But the size of
     # the image is specified by the viewport which is the size of the label.
@@ -324 +324 @@
     # (that's why we're using the blt::table to manage the geometry).  It has
     # to be big, because we don't know how big the user may want to stretch
-    # the window.  This at least forces the sidebarframe to give the 3dview
+    # the window.  This at least forces the sidebarframe to give the view
     # the maximum size available, which is perfect for an initially closed
     # sidebar.
 
     blt::table $itk_component(plotarea) \
-        0,0 $itk_component(3dview) -fill both -reqwidth 10000
+        0,0 $itk_component(view) -fill both -reqwidth 10000
     #
     # RENDERING AREA
@@ -338 +338 @@
     if { $_useVmouseEvents } {
         # set up bindings to bridge mouse events to server
-        bind $itk_component(3dview) <ButtonPress> \
+        bind $itk_component(view) <ButtonPress> \
             [itcl::code $this Vmouse click %b %s %x %y]
-        bind $itk_component(3dview) <ButtonRelease> \
+        bind $itk_component(view) <ButtonRelease> \
             [itcl::code $this Vmouse release %b %s %x %y]
-        bind $itk_component(3dview) <B1-Motion> \
+        bind $itk_component(view) <B1-Motion> \
             [itcl::code $this Vmouse drag 1 %s %x %y]
-        bind $itk_component(3dview) <B2-Motion> \
+        bind $itk_component(view) <B2-Motion> \
             [itcl::code $this Vmouse drag 2 %s %x %y]
-        bind $itk_component(3dview) <B3-Motion> \
+        bind $itk_component(view) <B3-Motion> \
             [itcl::code $this Vmouse drag 3 %s %x %y]
-        bind $itk_component(3dview) <Motion> \
+        bind $itk_component(view) <Motion> \
             [itcl::code $this Vmouse move 0 %s %x %y]
     } else {
         # set up bindings for rotation with mouse
-        bind $itk_component(3dview) <ButtonPress-1> \
+        bind $itk_component(view) <ButtonPress-1> \
             [itcl::code $this Rotate click %x %y]
-        bind $itk_component(3dview) <B1-Motion> \
+        bind $itk_component(view) <B1-Motion> \
             [itcl::code $this Rotate drag %x %y]
-        bind $itk_component(3dview) <ButtonRelease-1> \
+        bind $itk_component(view) <ButtonRelease-1> \
             [itcl::code $this Rotate release %x %y]
 
         # set up bindings for panning with mouse
-        bind $itk_component(3dview) <ButtonPress-2> \
+        bind $itk_component(view) <ButtonPress-2> \
             [itcl::code $this Pan click %x %y]
-        bind $itk_component(3dview) <B2-Motion> \
+        bind $itk_component(view) <B2-Motion> \
             [itcl::code $this Pan drag %x %y]
-        bind $itk_component(3dview) <ButtonRelease-2> \
+        bind $itk_component(view) <ButtonRelease-2> \
             [itcl::code $this Pan release %x %y]
 
         # scroll wheel zoom
         if {[string equal "x11" [tk windowingsystem]]} {
-            bind $itk_component(3dview) <4> [itcl::code $this Zoom out 2]
-            bind $itk_component(3dview) <5> [itcl::code $this Zoom in 2]
+            bind $itk_component(view) <4> [itcl::code $this Zoom out 2]
+            bind $itk_component(view) <5> [itcl::code $this Zoom in 2]
         }
     }
 
     # Set up bindings for panning with keyboard
-    bind $itk_component(3dview) <KeyPress-Left> \
+    bind $itk_component(view) <KeyPress-Left> \
         [itcl::code $this Pan set -10 0]
-    bind $itk_component(3dview) <KeyPress-Right> \
+    bind $itk_component(view) <KeyPress-Right> \
         [itcl::code $this Pan set 10 0]
-    bind $itk_component(3dview) <KeyPress-Up> \
+    bind $itk_component(view) <KeyPress-Up> \
         [itcl::code $this Pan set 0 -10]
-    bind $itk_component(3dview) <KeyPress-Down> \
+    bind $itk_component(view) <KeyPress-Down> \
         [itcl::code $this Pan set 0 10]
-    bind $itk_component(3dview) <Shift-KeyPress-Left> \
+    bind $itk_component(view) <Shift-KeyPress-Left> \
         [itcl::code $this Pan set -50 0]
-    bind $itk_component(3dview) <Shift-KeyPress-Right> \
+    bind $itk_component(view) <Shift-KeyPress-Right> \
         [itcl::code $this Pan set 50 0]
-    bind $itk_component(3dview) <Shift-KeyPress-Up> \
+    bind $itk_component(view) <Shift-KeyPress-Up> \
         [itcl::code $this Pan set 0 -50]
-    bind $itk_component(3dview) <Shift-KeyPress-Down> \
+    bind $itk_component(view) <Shift-KeyPress-Down> \
         [itcl::code $this Pan set 0 50]
 
     # Set up bindings for zoom with keyboard
-    bind $itk_component(3dview) <KeyPress-Prior> \
+    bind $itk_component(view) <KeyPress-Prior> \
         [itcl::code $this Zoom out 2]
-    bind $itk_component(3dview) <KeyPress-Next> \
+    bind $itk_component(view) <KeyPress-Next> \
         [itcl::code $this Zoom in 2]
 
-    bind $itk_component(3dview) <Enter> "focus $itk_component(3dview)"
-
-    bind $itk_component(3dview) <Configure> \
+    bind $itk_component(view) <Enter> "focus $itk_component(view)"
+
+    bind $itk_component(view) <Configure> \
         [itcl::code $this EventuallyResize %w %h]
-    bind $itk_component(3dview) <Unmap> \
+    bind $itk_component(view) <Unmap> \
         [itcl::code $this Unmap]
-    bind $itk_component(3dview) <Map> \
+    bind $itk_component(view) <Map> \
         [itcl::code $this Map]
 
@@ -1106 +1106 @@
         # Set or restore viewing parameters.  We do this for the first
         # model and assume this works for everything else.
-        set w  [winfo width $itk_component(3dview)]
-        set h  [winfo height $itk_component(3dview)]
+        set w  [winfo width $itk_component(view)]
+        set h  [winfo height $itk_component(view)]
         SendCmd "reset"
         SendCmd "screen $w $h"
@@ -1240 +1240 @@
     }
     if { $option == "click" } {
-        $itk_component(3dview) configure -cursor hand1
+        $itk_component(view) configure -cursor hand1
     }
     if { $option == "drag" || $option == "release" } {
@@ -1253 +1253 @@
     set _mevent(y) $y
     if { $option == "release" } {
-        $itk_component(3dview) configure -cursor ""
+        $itk_component(view) configure -cursor ""
     }
 }
@@ -1307 +1307 @@
         unset _rocker(afterid)
     }
-    if { ![winfo viewable $itk_component(3dview)] } {
+    if { ![winfo viewable $itk_component(view)] } {
         return
     }
@@ -1379 +1379 @@
     }
     if { $option == "click" } {
-        $itk_component(3dview) configure -cursor fleur
+        $itk_component(view) configure -cursor fleur
     }
     if { $option == "drag" || $option == "release" } {
@@ -1388 +1388 @@
             return
         }
-        set w [winfo width $itk_component(3dview)]
-        set h [winfo height $itk_component(3dview)]
+        set w [winfo width $itk_component(view)]
+        set h [winfo height $itk_component(view)]
         if {$w <= 0 || $h <= 0} {
             return
@@ -1430 +1430 @@
     set _mevent(time) $now
     if { $option == "release" } {
-        $itk_component(3dview) configure -cursor ""
+        $itk_component(view) configure -cursor ""
     }
 }
@@ -1452 +1452 @@
     switch -- $option {
         click {
-            $itk_component(3dview) configure -cursor fleur
+            $itk_component(view) configure -cursor fleur
             set _click(x) $x
             set _click(y) $y
@@ -1462 +1462 @@
                 Rotate.old click $x $y
             } else {
-                set w [winfo width $itk_component(3dview)]
-                set h [winfo height $itk_component(3dview)]
+                set w [winfo width $itk_component(view)]
+                set h [winfo height $itk_component(view)]
                 if {$w <= 0 || $h <= 0} {
                     return
@@ -1528 +1528 @@
         release {
             Rotate.old drag $x $y
-            $itk_component(3dview) configure -cursor ""
+            $itk_component(view) configure -cursor ""
             catch {unset _click}
         }

trunk/gui/scripts/nanovisviewer.tcl

@@ -8 +8 @@
 # ======================================================================
 #  AUTHOR:  Michael McLennan, Purdue University
-#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
+#  Copyright (c) 2004-2015  HUBzero Foundation, LLC
 #
 #  See the file "license.terms" for information on usage and
@@ -158 +158 @@
     set _serverType "nanovis"
 
-    # Draw legend event
+    #DebugOn
+    EnableWaitDialog 900
+
+    # Rebuild event
+    $_dispatcher register !rebuild
+    $_dispatcher dispatch $this !rebuild "[itcl::code $this Rebuild]; list"
+
+    # Resize event
+    $_dispatcher register !resize
+    $_dispatcher dispatch $this !resize "[itcl::code $this DoResize]; list"
+
+    # Legend event
     $_dispatcher register !legend
     $_dispatcher dispatch $this !legend "[itcl::code $this FixLegend]; list"
@@ -166 +177 @@
     $_dispatcher dispatch $this !send_transfunc \
         "[itcl::code $this SendTransferFunctions]; list"
-
-    # Rebuild event
-    $_dispatcher register !rebuild
-    $_dispatcher dispatch $this !rebuild "[itcl::code $this Rebuild]; list"
-
-    # Resize event
-    $_dispatcher register !resize
-    $_dispatcher dispatch $this !resize "[itcl::code $this DoResize]; list"
 
     #
@@ -184 +187 @@
     # Initialize the view to some default parameters.
     array set _view {
-        -qw      0.853553
-        -qx      -0.353553
-        -qy      0.353553
-        -qz      0.146447
-        -xpan    0
-        -ypan    0
-        -zoom    1.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]
     $_arcball quaternion [ViewToQuaternion]
-
-    set _reset 1
 
     array set _settings [subst {
@@ -230 +231 @@
     }]
 
-    itk_component add 3dview {
+    itk_component add view {
         label $itk_component(plotarea).view -image $_image(plot) \
             -highlightthickness 0 -borderwidth 0
@@ -237 +238 @@
         ignore -highlightthickness -borderwidth  -background
     }
-    bind $itk_component(3dview) <Control-F1> [itcl::code $this ToggleConsole]
+    bind $itk_component(view) <Control-F1> [itcl::code $this ToggleConsole]
 
     set f [$itk_component(main) component controls]
@@ -281 +282 @@
             -onimage [Rappture::icon volume-on] \
             -offimage [Rappture::icon volume-off] \
-            -command [itcl::code $this AdjustSetting -volume] \
-            -variable [itcl::scope _settings(-volume)]
+            -variable [itcl::scope _settings(-volume)] \
+            -command [itcl::code $this AdjustSetting -volume]
     }
     $itk_component(volume) select
@@ -330 +331 @@
     # the server.  So the panewindow uses the tiny size.
     set w 10000
-    pack forget $itk_component(3dview)
+    pack forget $itk_component(view)
     blt::table $itk_component(plotarea) \
-        0,0 $itk_component(3dview) -fill both -reqwidth $w \
+        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
 
     # Bindings for rotation via mouse
-    bind $itk_component(3dview) <ButtonPress-1> \
+    bind $itk_component(view) <ButtonPress-1> \
         [itcl::code $this Rotate click %x %y]
-    bind $itk_component(3dview) <B1-Motion> \
+    bind $itk_component(view) <B1-Motion> \
         [itcl::code $this Rotate drag %x %y]
-    bind $itk_component(3dview) <ButtonRelease-1> \
+    bind $itk_component(view) <ButtonRelease-1> \
         [itcl::code $this Rotate release %x %y]
 
-    bind $itk_component(3dview) <Configure> \
+    bind $itk_component(view) <Configure> \
         [itcl::code $this EventuallyResize %w %h]
 
     # Bindings for panning via mouse
-    bind $itk_component(3dview) <ButtonPress-2> \
+    bind $itk_component(view) <ButtonPress-2> \
         [itcl::code $this Pan click %x %y]
-    bind $itk_component(3dview) <B2-Motion> \
+    bind $itk_component(view) <B2-Motion> \
         [itcl::code $this Pan drag %x %y]
-    bind $itk_component(3dview) <ButtonRelease-2> \
+    bind $itk_component(view) <ButtonRelease-2> \
         [itcl::code $this Pan release %x %y]
 
     # Bindings for panning via keyboard
-    bind $itk_component(3dview) <KeyPress-Left> \
+    bind $itk_component(view) <KeyPress-Left> \
         [itcl::code $this Pan set -10 0]
-    bind $itk_component(3dview) <KeyPress-Right> \
+    bind $itk_component(view) <KeyPress-Right> \
         [itcl::code $this Pan set 10 0]
-    bind $itk_component(3dview) <KeyPress-Up> \
+    bind $itk_component(view) <KeyPress-Up> \
         [itcl::code $this Pan set 0 -10]
-    bind $itk_component(3dview) <KeyPress-Down> \
+    bind $itk_component(view) <KeyPress-Down> \
         [itcl::code $this Pan set 0 10]
-    bind $itk_component(3dview) <Shift-KeyPress-Left> \
+    bind $itk_component(view) <Shift-KeyPress-Left> \
         [itcl::code $this Pan set -2 0]
-    bind $itk_component(3dview) <Shift-KeyPress-Right> \
+    bind $itk_component(view) <Shift-KeyPress-Right> \
         [itcl::code $this Pan set 2 0]
-    bind $itk_component(3dview) <Shift-KeyPress-Up> \
+    bind $itk_component(view) <Shift-KeyPress-Up> \
         [itcl::code $this Pan set 0 -2]
-    bind $itk_component(3dview) <Shift-KeyPress-Down> \
+    bind $itk_component(view) <Shift-KeyPress-Down> \
         [itcl::code $this Pan set 0 2]
 
     # Bindings for zoom via keyboard
-    bind $itk_component(3dview) <KeyPress-Prior> \
+    bind $itk_component(view) <KeyPress-Prior> \
         [itcl::code $this Zoom out]
-    bind $itk_component(3dview) <KeyPress-Next> \
+    bind $itk_component(view) <KeyPress-Next> \
         [itcl::code $this Zoom in]
 
-    bind $itk_component(3dview) <Enter> "focus $itk_component(3dview)"
+    bind $itk_component(view) <Enter> "focus $itk_component(view)"
 
     if {[string equal "x11" [tk windowingsystem]]} {
         # Bindings for zoom via mouse
-        bind $itk_component(3dview) <4> [itcl::code $this Zoom out]
-        bind $itk_component(3dview) <5> [itcl::code $this Zoom in]
+        bind $itk_component(view) <4> [itcl::code $this Zoom out]
+        bind $itk_component(view) <5> [itcl::code $this Zoom in]
     }
 
@@ -390 +391 @@
 
     eval itk_initialize $args
-
-    EnableWaitDialog 900
     Connect
 }
@@ -450 +449 @@
 # ----------------------------------------------------------------------
 # USAGE: get ?-objects?
-# USAGE: get ?-image 3dview|legend?
+# USAGE: get ?-image view|legend?
 #
 # Clients use this to query the list of objects being plotted, in
@@ -480 +479 @@
         -image {
             if {[llength $args] != 2} {
-                error "wrong # args: should be \"get -image 3dview|legend\""
+                error "wrong # args: should be \"get -image view|legend\""
             }
             switch -- [lindex $args end] {
-                3dview {
+                view {
                     return $_image(plot)
                 }
@@ -490 +489 @@
                 }
                 default {
-                    error "bad image name \"[lindex $args end]\": should be 3dview or legend"
+                    error "bad image name \"[lindex $args end]\": should be view or legend"
                 }
             }
@@ -503 +502 @@
 # USAGE: delete ?<dataobj1> <dataobj2> ...?
 #
-#       Clients use this to delete a dataobj from the plot.  If no dataobjs
-#       are specified, then all dataobjs are deleted.  No data objects are
-#       deleted.  They are only removed from the display list.
-#
+# Clients use this to delete a dataobj from the plot.  If no dataobjs
+# are specified, then all dataobjs are deleted.  No data objects are
+# deleted.  They are only removed from the display list.
 # ----------------------------------------------------------------------
 itcl::body Rappture::NanovisViewer::delete {args} {
@@ -682 +680 @@
         }
 
-        set w [winfo width $itk_component(3dview)]
-        set h [winfo height $itk_component(3dview)]
+        set w [winfo width $itk_component(view)]
+        set h [winfo height $itk_component(view)]
         EventuallyResize $w $h
     }
@@ -692 +690 @@
 # isconnected --
 #
-#       Indicates if we are currently connected to the visualization server.
+# Indicates if we are currently connected to the visualization server.
 #
 itcl::body Rappture::NanovisViewer::isconnected {} {
@@ -708 +706 @@
 # Disconnect --
 #
-#       Clients use this method to disconnect from the current rendering
-#       server.
+# Clients use this method to disconnect from the current rendering server.
 #
 itcl::body Rappture::NanovisViewer::Disconnect {} {
@@ -809 +806 @@
 # ReceiveLegend --
 #
-#       The procedure is the response from the render server to each "legend"
-#       command.  The server sends back a "legend" command invoked our
-#       the slave interpreter.  The purpose is to collect data of the image
-#       representing the legend in the canvas.  In addition, the
-#       active transfer function is displayed.
+# The procedure is the response from the render server to each "legend"
+# command.  The server sends back a "legend" command invoked our
+# the slave interpreter.  The purpose is to collect data of the image
+# representing the legend in the canvas.  In addition, the
+# active transfer function is displayed.
 #
 itcl::body Rappture::NanovisViewer::ReceiveLegend { cname vmin vmax size } {
@@ -829 +826 @@
 # ReceiveData --
 #
-#       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 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.
 #
 itcl::body Rappture::NanovisViewer::ReceiveData { args } {
@@ -855 +852 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::NanovisViewer::Rebuild {} {
-    set w [winfo width $itk_component(3dview)]
-    set h [winfo height $itk_component(3dview)]
+    set w [winfo width $itk_component(view)]
+    set h [winfo height $itk_component(view)]
     if { $w < 2 || $h < 2 } {
         update
@@ -961 +958 @@
         PanCamera
         SendCmd "camera zoom $_view(-zoom)"
+        set _reset 0
     }
 
@@ -973 +971 @@
     StopBufferingCommands
     blt::busy release $itk_component(hull)
-    set _reset 0
 }
 
@@ -1071 +1068 @@
     switch -- $option {
         click {
-            $itk_component(3dview) configure -cursor fleur
+            $itk_component(view) configure -cursor fleur
             set _click(x) $x
             set _click(y) $y
@@ -1079 +1076 @@
                 Rotate click $x $y
             } else {
-                set w [winfo width $itk_component(3dview)]
-                set h [winfo height $itk_component(3dview)]
+                set w [winfo width $itk_component(view)]
+                set h [winfo height $itk_component(view)]
                 if {$w <= 0 || $h <= 0} {
                     return
@@ -1107 +1104 @@
         release {
             Rotate drag $x $y
-            $itk_component(3dview) configure -cursor ""
+            $itk_component(view) configure -cursor ""
             catch {unset _click}
         }
@@ -1126 +1123 @@
 itcl::body Rappture::NanovisViewer::Pan {option x y} {
     # Experimental stuff
-    set w [winfo width $itk_component(3dview)]
-    set h [winfo height $itk_component(3dview)]
+    set w [winfo width $itk_component(view)]
+    set h [winfo height $itk_component(view)]
     if { $option == "set" } {
         set x [expr $x / double($w)]
@@ -1141 +1138 @@
         set _click(x) $x
         set _click(y) $y
-        $itk_component(3dview) configure -cursor hand1
+        $itk_component(view) configure -cursor hand1
     }
     if { $option == "drag" || $option == "release" } {
@@ -1155 +1152 @@
     }
     if { $option == "release" } {
-        $itk_component(3dview) configure -cursor ""
+        $itk_component(view) configure -cursor ""
     }
 }
@@ -1248 +1245 @@
             if { $_settings($what) } {
                 blt::table $itk_component(plotarea) \
-                    0,0 $itk_component(3dview) -fill both \
+                    0,0 $itk_component(view) -fill both \
                     1,0 $itk_component(legend) -fill x
                 blt::table configure $itk_component(plotarea) r1 -resize none
@@ -1368 +1365 @@
 # NameTransferFunction --
 #
-#       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.]
+# 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::NanovisViewer::NameTransferFunction { dataobj cname } {
@@ -1403 +1400 @@
 # 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.
+# 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::NanovisViewer::ComputeTransferFunction { cname } {
@@ -2089 +2086 @@
 # 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.
+# 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 } {
@@ -2112 +2109 @@
 # 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.
+# 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 } {
@@ -2137 +2134 @@
 # 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.
+# 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 {} {
@@ -2168 +2165 @@
 # 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.
+# 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 } {
@@ -2190 +2187 @@
 # 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.
+# 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 {} {

trunk/gui/scripts/vtkvolumeviewer.tcl

@@ -568 +568 @@
 # USAGE: delete ?<dataobj1> <dataobj2> ...?
 #
-#       Clients use this to delete a dataobj from the plot.  If no dataobjs
-#       are specified, then all dataobjs are deleted.  No data objects are
-#       deleted.  They are only removed from the display list.
-#
+# Clients use this to delete a dataobj from the plot.  If no dataobjs
+# are specified, then all dataobjs are deleted.  No data objects are
+# deleted.  They are only removed from the display list.
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkVolumeViewer::delete {args} {
@@ -853 +852 @@
 # isconnected --
 #
-#       Indicates if we are currently connected to the visualization server.
+# Indicates if we are currently connected to the visualization server.
 #
 itcl::body Rappture::VtkVolumeViewer::isconnected {} {
@@ -870 +869 @@
 # Disconnect --
 #
-#       Clients use this method to disconnect from the current rendering
-#       server.
+# Clients use this method to disconnect from the current rendering server.
 #
 itcl::body Rappture::VtkVolumeViewer::Disconnect {} {
@@ -1359 +1357 @@
 # AdjustSetting --
 #
-#       Changes/updates a specific setting in the widget.  There are
-#       usually user-setable option.  Commands are sent to the render
-#       server.
+# Changes/updates a specific setting in the widget.  There are
+# usually user-setable option.  Commands are sent to the render
+# server.
 #
 itcl::body Rappture::VtkVolumeViewer::AdjustSetting {what {value ""}} {
@@ -1611 +1609 @@
 # RequestLegend --
 #
-#       Request a new legend from the server.  The size of the legend
-#       is determined from the height of the canvas.
+# Request a new legend from the server.  The size of the legend
+# is determined from the height of the canvas.
 #
 itcl::body Rappture::VtkVolumeViewer::RequestLegend {} {
@@ -2537 +2535 @@
 # 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.]
+# 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 } {
@@ -2556 +2554 @@
 # 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.
+# 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 } {
@@ -2628 +2626 @@
 # ResetColormap --
 #
-#       Changes only the colormap portion of the transfer function.
+# Changes only the colormap portion of the transfer function.
 #
 itcl::body Rappture::VtkVolumeViewer::ResetColormap { cname color } {
@@ -2647 +2645 @@
 # USAGE: updateTransferFunctions
 #
-#       This is called by the transfer function editor whenever the
-#       transfer function definition changes.
-#
+# This is called by the transfer function editor whenever the
+# transfer function definition changes.
 # ----------------------------------------------------------------------
 itcl::body Rappture::VtkVolumeViewer::updateTransferFunctions {} {
@@ -2698 +2695 @@
 # 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.
+# 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 } {
@@ -2724 +2721 @@
 # 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.
+# 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 } {
@@ -2821 +2818 @@
 # 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.
+# 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 {} {
@@ -2834 +2831 @@
 # GetDatasetsWithComponent --
 #
-#       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.
+# 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::VtkVolumeViewer::GetDatasetsWithComponent { cname } {
@@ -2849 +2846 @@
 # 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.
+# 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 {} {