Ignore:
Timestamp:
Apr 17, 2015, 2:55:50 PM (9 years ago)
Author:
ldelgass
Message:

merge r5195 from trunk

Location:
branches/1.3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

    • Property svn:mergeinfo changed
      /trunkmerged: 5195
  • branches/1.3/gui/scripts/vtkimageviewer.tcl

    r5230 r5249  
    110110    private variable _arcball ""
    111111    private variable _dlist ""     ;    # list of data objects
    112     private variable _obj2datasets
    113112    private variable _obj2ovride   ;    # maps dataobj => style override
    114113    private variable _datasets     ;    # contains all the dataobj-component
     
    803802    # disconnected -- no more data sitting on server
    804803    array unset _datasets
    805     array unset _data
    806804    array unset _colormaps
    807     array unset _obj2datasets
    808805    global readyForNextFrame
    809806    set readyForNextFrame 1
     
    951948            set _first $dataobj
    952949        }
    953         set _obj2datasets($dataobj) ""
    954950        foreach comp [$dataobj components] {
    955951            set tag $dataobj-$comp
     
    980976                SetObjectStyle $dataobj $comp
    981977            }
    982             lappend _obj2datasets($dataobj) $tag
    983978            if { [info exists _obj2ovride($dataobj-raise)] } {
    984979                # Setting dataset visible enables outline
Note: See TracChangeset for help on using the changeset viewer.