Changeset 5262


Ignore:
Timestamp:
Apr 17, 2015 8:43:49 PM (5 years ago)
Author:
ldelgass
Message:

merge r5261 from trunk

Location:
branches/1.4
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.4

    • Property svn:mergeinfo changed
      /trunkmerged: 5261
  • branches/1.4/gui/scripts/nanovisviewer.tcl

    r5248 r5262  
    8181
    8282    # The following methods are only used by this class.
    83 
    8483    private method AddNewMarker { x y }
    8584    private method AdjustSetting {what {value ""}}
     
    138137    private variable _serverDatasets   ;# contains all the dataobj-component
    139138                                       ;# to volumes in the server
    140     private variable _recvdDatasets;    # list of data objs to send to server
    141 
    142     private variable _reset 1;          # Connection to server has been reset.
    143     private variable _click;            # Info used for rotate operations.
    144     private variable _limits;           # Autoscale min/max for all axes
    145     private variable _view;             # View params for 3D view
     139    private variable _recvdDatasets    ;# list of data objs to send to server
     140
     141    private variable _reset 1          ;# Connection to server has been reset.
     142    private variable _click            ;# Info used for rotate operations.
     143    private variable _limits           ;# Autoscale min/max for all axes
     144    private variable _view             ;# View params for 3D view
    146145    private variable _parsedFunction
    147146    private variable _transferFunctionEditors
     
    149148    private variable _widget
    150149
    151     private variable _first "" ;        # This is the topmost volume.
    152     private variable _current "";       # Currently selected component
     150    private variable _first ""         ;# This is the topmost volume.
     151    private variable _current ""       ;# Currently selected component
    153152    private variable _volcomponents    ;# Array of components found
    154153    private variable _componentsList   ;# Array of components found
     
    156155    private variable _cname2defaultcolormap
    157156
    158     common _downloadPopup          ;# download options from popup
     157    common _downloadPopup              ;# download options from popup
    159158    private common _hardcopy
    160159    private variable _width 0
Note: See TracChangeset for help on using the changeset viewer.