Changeset 5449 for branches/1.4

Timestamp:

May 6, 2015 7:38:28 PM (9 years ago)

Author:

ldelgass

Message:

merge r5374:5375 from trunk

Location:

branches/1.4

Files:

• . (modified) (1 prop)
• gui/scripts/flowvisviewer.tcl (modified) (8 diffs)

branches/1.4/gui/scripts/flowvisviewer.tcl

@@ -3 +3 @@
 #  COMPONENT: flowvisviewer - 3D flow rendering
 #
-# This widget performs volume and flow rendering on 3D scalar/vector datasets.
-# It connects to the Flowvis server running on a rendering farm, transmits
-# data, and displays the results.
+#  This widget performs volume and flow rendering on 3D scalar/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
 #
-# See the file "license.terms" for information on usage and redistribution of
-# this file, and for a DISCLAIMER OF ALL WARRANTIES.
+#  See the file "license.terms" for information on usage and
+#  redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # ======================================================================
 package require Itk
@@ -134 +134 @@
     private variable _dataset2flow     ;# Maps dataobj-component to a flow.
 
-    private variable _reset 1          ;# Connection to server has been reset
-    private variable _click            ;# info used for rotate operations
+    private variable _reset 1          ;# Connection to server has been reset.
+    private variable _click            ;# Info used for rotate operations.
     private variable _limits           ;# Autoscale min/max for all axes
     private variable _view             ;# View params for 3D view
@@ -280 +280 @@
     }
     pack $itk_component(reset) -side top -padx 2 -pady 2
-    Rappture::Tooltip::for $itk_component(reset) "Reset the view to the default zoom level"
+    Rappture::Tooltip::for $itk_component(reset) \
+        "Reset the view to the default zoom level"
 
     itk_component add zoomin {
@@ -957 +958 @@
     }
 
-    # Ensure that the global thickness setting (in the slider settings widget)
-    # is used for the active transfer-function. Update the values in the
-    # _settings varible.
+    # Ensure that the global thickness setting (in the slider
+    # settings widget) is used for the active transfer-function. Update
+    # the values in the _settings varible.
 
     set value $_settings(-thickness)
@@ -1075 +1076 @@
 #       the slave interpreter.  The purpose is to collect the min/max of the
 #       volume sent to the render server.  Since the client (flowvisviewer)
-#       doesn't parse 3D data formats, we rely on the server (flowvis) to
+#       doesn't parse 3D data formats, we rely on the server (nanovis) to
 #       tell us what the limits are.  Once we've received the limits to all
 #       the data we've sent (tracked by _recvdDatasets) we can then determine
-#       what the transfer functions are for these # volumes.
+#       what the transfer functions are for these volumes.
+#
 #
 #       Note: There is a considerable tradeoff in having the server report
@@ -1612 +1614 @@
 #       server parses the 3D data and sends back the limits via ReceiveData.]
 #
-#       FIXME: The current way we generate transfer-function names completely
-#              ignores the -markers option.  The problem is that we are forced
-#              to compute the name from an increasing complex set of values:
-#              color, levels, marker, opacity.  I think we're stuck doing it
-#              now.
-#
 itcl::body Rappture::FlowvisViewer::NameTransferFunction { dataobj cname } {
     array set style {
@@ -1659 +1655 @@
     # of the volumes (the first in the list) using the transfer-function as a
     # reference.
-    #
-    # FIXME: The current way we generate transfer-function names completely
-    #        ignores the -markers option.  The problem is that we are forced
-    #        to compute the name from an increasing complex set of values:
-    #        color, levels, marker, opacity.  I think the cow's out of the
-    #        barn on this one.
 
     if { ![info exists _isomarkers($tf)] } {
@@ -1854 +1844 @@
 }
 
-# ----------------------------------------------------------------------
-# USAGE: UpdateTransferFunctions
-# ----------------------------------------------------------------------
 itcl::body Rappture::FlowvisViewer::updateTransferFunctions {} {
     $_dispatcher event -after 100 !send_transfunc