Ignore:
Timestamp:
Apr 13, 2015 5:26:09 PM (9 years ago)
Author:
ldelgass
Message:

merge r5195 from trunk

Location:
branches/1.4
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.4

    • Property svn:mergeinfo changed
      /trunkmerged: 5195
  • branches/1.4/gui/scripts/vtkvolumeviewer.tcl

    r5187 r5206  
    119119    private variable _arcball ""
    120120    private variable _dlist ""     ;    # list of data objects
    121     private variable _obj2datasets
    122121    private variable _obj2ovride   ;    # maps dataobj => style override
    123122    private variable _datasets     ;    # contains all the dataobj-component
     
    852851    # disconnected -- no more data sitting on server
    853852    array unset _datasets
    854     array unset _data
    855853    array unset _colormaps
    856854    array unset _dataset2style
    857     array unset _obj2datasets
    858855
    859856    set _resizePending 0
     
    1000997            set _first $dataobj
    1001998        }
    1002         set _obj2datasets($dataobj) ""
    1003999        foreach comp [$dataobj components] {
    10041000            set tag $dataobj-$comp
     
    10291025                SetObjectStyle $dataobj $comp
    10301026            }
    1031             lappend _obj2datasets($dataobj) $tag
    10321027            if { [info exists _obj2ovride($dataobj-raise)] } {
    10331028                SendCmd "volume visible 1 $tag"
Note: See TracChangeset for help on using the changeset viewer.