Ignore:
Timestamp:
Nov 11, 2014 1:18:10 PM (10 years ago)
Author:
ldelgass
Message:

merge r4697 from trunk

Location:
branches/1.3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

    • Property svn:mergeinfo changed
      /trunkmerged: 4697
  • branches/1.3/gui/scripts/vtkmeshviewer.tcl

    r4695 r4698  
    5757    public method get {args}
    5858    public method isconnected {}
    59     public method limits { colormap }
     59    public method limits { dataobj }
    6060    public method parameters {title args} {
    6161        # do nothing
     
    8181    private method BuildAxisTab {}
    8282    private method BuildCameraTab {}
    83     private method BuildCutawayTab {}
    8483    private method BuildDownloadPopup { widget command }
    8584    private method BuildPolydataTab {}
     
    101100    private variable _datasets;         # contains all the dataobj-component
    102101                                        # datasets in the server
    103     private variable _colormaps;        # contains all the colormaps
    104                                         # in the server.
    105102    private variable _dataset2style;    # maps dataobj-component to transfunc
    106103    private variable _style2datasets;   # maps tf back to list of
     
    713710
    714711    # disconnected -- no more data sitting on server
    715     array unset _datasets
    716     array unset _data
    717     array unset _colormaps
     712    array unset _datasets
     713    array unset _data
    718714    global readyForNextFrame
    719715    set readyForNextFrame 1
     
    11551151        }
    11561152        "-polydataopacity" {
     1153            set _settings($what) [expr $_widget($what) * 0.01]
    11571154            EventuallySetPolydataOpacity
    11581155        }
Note: See TracChangeset for help on using the changeset viewer.