Changeset 6265 for branches/1.6

Timestamp:

Apr 13, 2016, 11:19:55 AM (9 years ago)

Author:

ldelgass

Message:

merge r6259:6260 from trunk

Location:

branches/1.6

Files:

• . (modified) (1 prop)
• gui/scripts/flowvisviewer.tcl (modified) (2 diffs)
• gui/scripts/nanovisviewer.tcl (modified) (3 diffs)
• gui/scripts/vtkheightmapviewer.tcl (modified) (1 diff)
• gui/scripts/vtkimageviewer.tcl (modified) (1 diff)

branches/1.6/gui/scripts/flowvisviewer.tcl

@@ -127 +127 @@
 
     private variable _arcball ""
-    private variable _dlist ""         ;# list of data objects
-    private variable _obj2ovride       ;# maps dataobj => style override
-    private variable _serverDatasets   ;# contains all the dataobj-component
-                                       ;# to volumes in the server
-    private variable _recvdDatasets    ;# list of data objs to send to server
-    private variable _dataset2style    ;# maps dataobj-component to transfunc
-    private variable _style2datasets   ;# maps tf back to list of
+    private variable _dlist "";         # list of data objects
+    private variable _obj2ovride;       # maps dataobj => style override
+    private variable _serverDatasets;   # contains all the dataobj-component
+                                        # to volumes in the server
+    private variable _recvdDatasets;    # list of data objs to send to server
+    private variable _dataset2style;    # maps dataobj-component to transfunc
+    private variable _style2datasets;   # maps tf back to list of
                                         # dataobj-components using the tf.
-    private variable _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 _limits           ;# Autoscale min/max for all axes
-    private variable _view             ;# View params for 3D view
-    private variable _isomarkers       ;# array of isosurface level values 0..1
+    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 _limits;           # Autoscale min/max for all axes
+    private variable _view;             # View params for 3D view
+    private variable _isomarkers;       # array of isosurface level values 0..1
     private variable _settings
-    private variable _activeTf ""      ;# Currently active transfer function
-    private variable _first ""         ;# This is the topmost volume.
-    private variable _volcomponents    ;# Maps component name to list of
-                                       ;# dataobj-component tags
-    private variable _componentsList   ;# List of components found
+    private variable _activeTf "";      # Currently active transfer function
+    private variable _first "";         # This is the topmost volume.
+    private variable _volcomponents;    # Maps component name to list of
+                                        # dataobj-component tags
+    private variable _componentsList;   # List of components found
     private variable _nextToken 0
     private variable _icon 0
@@ -157 +157 @@
     private variable _gotoPending 0
 
-    private common _downloadPopup      ;# download options from popup
+    private common _downloadPopup;      # download options from popup
     private common _hardcopy
 }

branches/1.6/gui/scripts/nanovisviewer.tcl

@@ -113 +113 @@
 
     private variable _arcball ""
-    private variable _dlist ""         ;# list of data objects
-    private variable _obj2ovride       ;# maps dataobj => style override
-    private variable _serverDatasets   ;# contains all the dataobj-component
-                                       ;# to volumes in the server
-    private variable _recvdDatasets    ;# list of data objs to send to server
-    private variable _dataset2style    ;# maps dataobj-component to transfunc
-    private variable _style2datasets   ;# maps tf back to list of
+    private variable _dlist "";         # list of data objects
+    private variable _obj2ovride;       # maps dataobj => style override
+    private variable _serverDatasets;   # contains all the dataobj-component
+                                        # to volumes in the server
+    private variable _recvdDatasets;    # list of data objs to send to server
+    private variable _dataset2style;    # maps dataobj-component to transfunc
+    private variable _style2datasets;   # maps tf back to list of
                                         # dataobj-components using the tf.
 
-    private variable _reset 1          ;# Connection to server has been reset.
-    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
-    private variable _isomarkers       ;# array of isosurface level values 0..1
+    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
+    private variable _isomarkers;       # array of isosurface level values 0..1
     # Array of transfer functions in server.  If 0 the transfer has been
     # defined but not loaded.  If 1 the transfer function has been named
@@ -132 +132 @@
     private variable _activeTfs
     private variable _settings
-    private variable _first ""         ;# This is the topmost volume.
+    private variable _first "";         # This is the topmost volume.
     private variable _width 0
     private variable _height 0
@@ -138 +138 @@
     private variable _resizeLegendPending 0
 
-    private common _downloadPopup      ;# download options from popup
+    private common _downloadPopup;      # download options from popup
     private common _hardcopy
 }

branches/1.6/gui/scripts/vtkheightmapviewer.tcl

@@ -951 +951 @@
 
     set _first ""
-    # Start off with no datasets are visible.
+    # Start off with no datasets visible.
     SendCmd "dataset visible 0"
     set scale [GetHeightmapScale]

branches/1.6/gui/scripts/vtkimageviewer.tcl

@@ -930 +930 @@
 
     set _first ""
-    # Start off with no datasets are visible.
+    # Start off with no datasets visible.
     SendCmd "dataset visible 0"
     foreach dataobj [get -objects] {