Changeset 5262 for branches/1.4

Timestamp:

Apr 17, 2015, 8:43:49 PM (10 years ago)

Author:

ldelgass

Message:

merge r5261 from trunk

Location:

branches/1.4

Files:

• . (modified) (1 prop)
• gui/scripts/nanovisviewer.tcl (modified) (4 diffs)

branches/1.4/gui/scripts/nanovisviewer.tcl

@@ -81 +81 @@
 
     # The following methods are only used by this class.
-
     private method AddNewMarker { x y }
     private method AdjustSetting {what {value ""}}
@@ -138 +137 @@
     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 _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 _recvdDatasets    ;# list of data objs to send to server
+
+    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 _parsedFunction
     private variable _transferFunctionEditors
@@ -149 +148 @@
     private variable _widget
 
-    private variable _first "" ;        # This is the topmost volume.
-    private variable _current "";       # Currently selected component
+    private variable _first ""         ;# This is the topmost volume.
+    private variable _current ""       ;# Currently selected component
     private variable _volcomponents    ;# Array of components found
     private variable _componentsList   ;# Array of components found
@@ -156 +155 @@
     private variable _cname2defaultcolormap
 
-    common _downloadPopup          ;# download options from popup
+    common _downloadPopup              ;# download options from popup
     private common _hardcopy
     private variable _width 0