Changeset 5249


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

merge r5195 from trunk

Location:
branches/1.3
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • branches/1.3

    • Property svn:mergeinfo changed
      /trunkmerged: 5195

  • branches/1.3/gui/scripts/vtkglyphviewer.tcl

    r5230 r5249  
    113113
    114114    private variable _dlist ""     ;    # list of data objects
    115     private variable _obj2datasets
    116115    private variable _obj2ovride   ;    # maps dataobj => style override
    117116    private variable _datasets     ;    # contains all the dataobj-component
    … …  
    122121    # heightmaps displayed.
    123122    private variable _currentColormap ""
    124 
    125     private variable _dataset2style    ;# maps dataobj-component to transfunc
    126123
    127124    private variable _click        ;    # info used for rotate operations
    … …  
    840837    array unset _data
    841838    array unset _colormaps
    842     array unset _dataset2style
    843     array unset _obj2datasets
    844839}
    845840
    … …  
    974969            set _first $dataobj
    975970        }
    976         set _obj2datasets($dataobj) ""
    977971        foreach comp [$dataobj components] {
    978972            set tag $dataobj-$comp
    … …  
    1003997                SetObjectStyle $dataobj $comp
    1004998            }
    1005             lappend _obj2datasets($dataobj) $tag
    1006999            if { [info exists _obj2ovride($dataobj-raise)] } {
    10071000                # Setting dataset visible enables outline

  • branches/1.3/gui/scripts/vtkheightmapviewer.tcl

    r5230 r5249  
    114114    private variable _arcball ""
    115115    private variable _dlist ""     ;    # list of data objects
    116     private variable _obj2datasets
    117116    private variable _obj2ovride   ;    # maps dataobj => style override
    118117    private variable _comp2scale;       # maps dataset to the heightmap scale.
    … …  
    813812    # disconnected -- no more data sitting on server
    814813    array unset _datasets
    815     array unset _data
    816814    array unset _colormaps
    817     array unset _obj2datasets
    818815    global readyForNextFrame
    819816    set readyForNextFrame 1
    … …  
    973970            set _first $dataobj
    974971        }
    975         set _obj2datasets($dataobj) ""
    976972        foreach comp [$dataobj components] {
    977973            set tag $dataobj-$comp
    … …  
    1002998                SetObjectStyle $dataobj $comp
    1003999            }
    1004             lappend _obj2datasets($dataobj) $tag
    10051000            if { [info exists _obj2ovride($dataobj-raise)] } {
    10061001                # Setting dataset visible enables outline

  • 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

  • branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl

    r5230 r5249  
    129129
    130130    private variable _dlist ""     ;    # list of data objects
    131     private variable _obj2datasets
    132131    private variable _obj2ovride   ;    # maps dataobj => style override
    133132    private variable _datasets     ;    # contains all the dataobj-component
    … …  
    139138    private variable _currentColormap ""
    140139    private variable _currentNumContours -1
    141 
    142     private variable _dataset2style    ;# maps dataobj-component to transfunc
    143140
    144141    private variable _click        ;    # info used for rotate operations
    … …  
    950947    # disconnected -- no more data sitting on server
    951948    array unset _datasets
    952     array unset _data
    953949    array unset _colormaps
    954     array unset _dataset2style
    955     array unset _obj2datasets
    956950}
    957951
    … …  
    10861080            SetCurrentFieldName $dataobj
    10871081        }
    1088         set _obj2datasets($dataobj) ""
    10891082        foreach comp [$dataobj components] {
    10901083            set tag $dataobj-$comp
    … …  
    11151108                SetObjectStyle $dataobj $comp
    11161109            }
    1117             lappend _obj2datasets($dataobj) $tag
    11181110            if { [info exists _obj2ovride($dataobj-raise)] } {
    11191111                SendCmd "contour3d visible 1 $tag"

  • branches/1.3/gui/scripts/vtkmeshviewer.tcl

    r5219 r5249  
    101101    private variable _arcball ""
    102102    private variable _dlist "";         # list of data objects
    103     private variable _obj2datasets
    104103    private variable _obj2ovride;       # maps dataobj => style override
    105104    private variable _datasets;         # contains all the dataobj-component
    106105                                        # datasets in the server
    107     private variable _dataset2style;    # maps dataobj-component to transfunc
    108     private variable _style2datasets;   # maps tf back to list of
    109                                         # dataobj-components using the tf.
    110106    private variable _click;            # info used for rotate operations
    111107    private variable _limits;           # autoscale min/max for all axes
    … …  
    714710    # disconnected -- no more data sitting on server
    715711    array unset _datasets
    716     array unset _data
    717712    global readyForNextFrame
    718713    set readyForNextFrame 1
    … …  
    840835            set _first $dataobj
    841836        }
    842         set _obj2datasets($dataobj) ""
    843837        set tag $dataobj
    844838        if { ![info exists _datasets($tag)] } {
    … …  
    871865            SetObjectStyle $dataobj
    872866        }
    873         lappend _obj2datasets($dataobj) $tag
    874867        if { [info exists _obj2ovride($dataobj-raise)] } {
    875868            SendCmd "dataset visible 1 $tag"

  • branches/1.3/gui/scripts/vtkstreamlinesviewer.tcl

    r5230 r5249  
    116116
    117117    private variable _dlist ""     ;    # list of data objects
    118     private variable _obj2datasets
    119118    private variable _obj2ovride   ;    # maps dataobj => style override
    120119    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 _seeds
    857855    array unset _dataset2style
    858     array unset _obj2datasets
    859856}
    860857
    … …  
    983980            set _first $dataobj
    984981        }
    985         set _obj2datasets($dataobj) ""
    986982        foreach comp [$dataobj components] {
    987983            set tag $dataobj-$comp
    … …  
    10121008                SetObjectStyle $dataobj $comp
    10131009            }
    1014             lappend _obj2datasets($dataobj) $tag
    10151010            if { [info exists _obj2ovride($dataobj-raise)] } {
    10161011                SendCmd "dataset visible 1 $tag"

  • branches/1.3/gui/scripts/vtksurfaceviewer.tcl

    r5230 r5249  
    112112
    113113    private variable _dlist ""     ;    # list of data objects
    114     private variable _obj2datasets
    115114    private variable _obj2ovride   ;    # maps dataobj => style override
    116115    private variable _datasets     ;    # contains all the dataobj-component
    … …  
    122121    private variable _currentColormap ""
    123122    private variable _currentNumContours -1
    124 
    125     private variable _dataset2style    ;# maps dataobj-component to transfunc
    126123
    127124    private variable _click        ;    # info used for rotate operations
    … …  
    793790    # disconnected -- no more data sitting on server
    794791    array unset _datasets
    795     array unset _data
    796792    array unset _colormaps
    797     array unset _dataset2style
    798     array unset _obj2datasets
    799793}
    800794
    … …  
    931925            SetCurrentFieldName $dataobj
    932926        }
    933         set _obj2datasets($dataobj) ""
    934927        foreach comp [$dataobj components] {
    935928            set tag $dataobj-$comp
    … …  
    960953                SetObjectStyle $dataobj $comp
    961954            }
    962             lappend _obj2datasets($dataobj) $tag
    963955            if { [info exists _obj2ovride($dataobj-raise)] } {
    964956                SendCmd "polydata visible 1 $tag"

  • branches/1.3/gui/scripts/vtkviewer.tcl

    r5230 r5249  
    126126    private variable _arcball ""
    127127    private variable _dlist "";         # list of data objects
    128     private variable _obj2datasets
    129128    private variable _obj2ovride;       # maps dataobj => style override
    130129    private variable _datasets;         # contains all the dataobj-component
    … …  
    133132                                        # in the server.
    134133    private variable _dataset2style;    # maps dataobj-component to transfunc
    135     private variable _style2datasets;   # maps tf back to list of
    136                                         # dataobj-components using the tf.
    137134    private variable _click;            # info used for rotate operations
    138135    private variable _limits;           # autoscale min/max for all axes
    … …  
    927924    # disconnected -- no more data sitting on server
    928925    array unset _datasets
    929     array unset _data
    930926    array unset _colormaps
    931927    global readyForNextFrame
    … …  
    10551051            set _first $dataobj
    10561052        }
    1057         set _obj2datasets($dataobj) ""
    10581053        foreach comp [$dataobj components] {
    10591054            set tag $dataobj-$comp
    … …  
    10871082                SetObjectStyle $dataobj $comp
    10881083            }
    1089             lappend _obj2datasets($dataobj) $tag
    10901084            set type [$dataobj type $comp]
    10911085            if { [info exists _obj2ovride($dataobj-raise)] } {

  • branches/1.3/gui/scripts/vtkvolumeviewer.tcl

    r5243 r5249  
    113113    private variable _arcball ""
    114114    private variable _dlist ""     ;    # list of data objects
    115     private variable _obj2datasets
    116115    private variable _obj2ovride   ;    # maps dataobj => style override
    117116    private variable _datasets     ;    # contains all the dataobj-component
    … …  
    808807    # disconnected -- no more data sitting on server
    809808    array unset _datasets
    810     array unset _data
    811809    array unset _colormaps
    812810    array unset _dataset2style
    813     array unset _obj2datasets
    814811
    815812    set _resizePending 0
    … …  
    959956            set _first $dataobj
    960957        }
    961         set _obj2datasets($dataobj) ""
    962958        foreach comp [$dataobj components] {
    963959            set tag $dataobj-$comp
    … …  
    988984                SetObjectStyle $dataobj $comp
    989985            }
    990             lappend _obj2datasets($dataobj) $tag
    991986            if { [info exists _obj2ovride($dataobj-raise)] } {
    992987                SendCmd "volume visible 1 $tag"
Note: See TracChangeset for help on using the changeset viewer.