Changeset 6265


Ignore:
Timestamp:
Apr 13, 2016 11:19:55 AM (8 years ago)
Author:
ldelgass
Message:

merge r6259:6260 from trunk

Location:
branches/1.6
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/1.6

  • branches/1.6/gui/scripts/flowvisviewer.tcl

    r6242 r6265  
    127127
    128128    private variable _arcball ""
    129     private variable _dlist ""         ;# list of data objects
    130     private variable _obj2ovride       ;# maps dataobj => style override
    131     private variable _serverDatasets   ;# contains all the dataobj-component
    132                                        ;# to volumes in the server
    133     private variable _recvdDatasets    ;# list of data objs to send to server
    134     private variable _dataset2style    ;# maps dataobj-component to transfunc
    135     private variable _style2datasets   ;# maps tf back to list of
     129    private variable _dlist "";         # list of data objects
     130    private variable _obj2ovride;       # maps dataobj => style override
     131    private variable _serverDatasets;   # contains all the dataobj-component
     132                                        # to volumes in the server
     133    private variable _recvdDatasets;    # list of data objs to send to server
     134    private variable _dataset2style;    # maps dataobj-component to transfunc
     135    private variable _style2datasets;   # maps tf back to list of
    136136                                        # dataobj-components using the tf.
    137     private variable _dataset2flow     ;# Maps dataobj-component to a flow.
    138 
    139     private variable _reset 1          ;# Connection to server has been reset.
    140     private variable _click            ;# Info used for rotate operations.
    141     private variable _limits           ;# Autoscale min/max for all axes
    142     private variable _view             ;# View params for 3D view
    143     private variable _isomarkers       ;# array of isosurface level values 0..1
     137    private variable _dataset2flow;     # Maps dataobj-component to a flow.
     138
     139    private variable _reset 1;          # Connection to server has been reset.
     140    private variable _click;            # Info used for rotate operations.
     141    private variable _limits;           # Autoscale min/max for all axes
     142    private variable _view;             # View params for 3D view
     143    private variable _isomarkers;       # array of isosurface level values 0..1
    144144    private variable _settings
    145     private variable _activeTf ""      ;# Currently active transfer function
    146     private variable _first ""         ;# This is the topmost volume.
    147     private variable _volcomponents    ;# Maps component name to list of
    148                                        ;# dataobj-component tags
    149     private variable _componentsList   ;# List of components found
     145    private variable _activeTf "";      # Currently active transfer function
     146    private variable _first "";         # This is the topmost volume.
     147    private variable _volcomponents;    # Maps component name to list of
     148                                        # dataobj-component tags
     149    private variable _componentsList;   # List of components found
    150150    private variable _nextToken 0
    151151    private variable _icon 0
     
    157157    private variable _gotoPending 0
    158158
    159     private common _downloadPopup      ;# download options from popup
     159    private common _downloadPopup;      # download options from popup
    160160    private common _hardcopy
    161161}
  • branches/1.6/gui/scripts/nanovisviewer.tcl

    r6242 r6265  
    113113
    114114    private variable _arcball ""
    115     private variable _dlist ""         ;# list of data objects
    116     private variable _obj2ovride       ;# maps dataobj => style override
    117     private variable _serverDatasets   ;# contains all the dataobj-component
    118                                        ;# to volumes in the server
    119     private variable _recvdDatasets    ;# list of data objs to send to server
    120     private variable _dataset2style    ;# maps dataobj-component to transfunc
    121     private variable _style2datasets   ;# maps tf back to list of
     115    private variable _dlist "";         # list of data objects
     116    private variable _obj2ovride;       # maps dataobj => style override
     117    private variable _serverDatasets;   # contains all the dataobj-component
     118                                        # to volumes in the server
     119    private variable _recvdDatasets;    # list of data objs to send to server
     120    private variable _dataset2style;    # maps dataobj-component to transfunc
     121    private variable _style2datasets;   # maps tf back to list of
    122122                                        # dataobj-components using the tf.
    123123
    124     private variable _reset 1          ;# Connection to server has been reset.
    125     private variable _click            ;# Info used for rotate operations.
    126     private variable _limits           ;# Autoscale min/max for all axes
    127     private variable _view             ;# View params for 3D view
    128     private variable _isomarkers       ;# array of isosurface level values 0..1
     124    private variable _reset 1;          # Connection to server has been reset.
     125    private variable _click;            # Info used for rotate operations.
     126    private variable _limits;           # Autoscale min/max for all axes
     127    private variable _view;             # View params for 3D view
     128    private variable _isomarkers;       # array of isosurface level values 0..1
    129129    # Array of transfer functions in server.  If 0 the transfer has been
    130130    # defined but not loaded.  If 1 the transfer function has been named
     
    132132    private variable _activeTfs
    133133    private variable _settings
    134     private variable _first ""         ;# This is the topmost volume.
     134    private variable _first "";         # This is the topmost volume.
    135135    private variable _width 0
    136136    private variable _height 0
     
    138138    private variable _resizeLegendPending 0
    139139
    140     private common _downloadPopup      ;# download options from popup
     140    private common _downloadPopup;      # download options from popup
    141141    private common _hardcopy
    142142}
  • branches/1.6/gui/scripts/vtkheightmapviewer.tcl

    r6237 r6265  
    951951
    952952    set _first ""
    953     # Start off with no datasets are visible.
     953    # Start off with no datasets visible.
    954954    SendCmd "dataset visible 0"
    955955    set scale [GetHeightmapScale]
  • branches/1.6/gui/scripts/vtkimageviewer.tcl

    r6237 r6265  
    930930
    931931    set _first ""
    932     # Start off with no datasets are visible.
     932    # Start off with no datasets visible.
    933933    SendCmd "dataset visible 0"
    934934    foreach dataobj [get -objects] {
Note: See TracChangeset for help on using the changeset viewer.