Changeset 5206


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

merge r5195 from trunk

Location:
branches/1.4
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • branches/1.4

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

    r5187 r5206  
    734734                array set style [lindex [$dataobj components -style $cname] 0]
    735735                set cmap [ColorsToColormap $style(-color)]
    736                 set _cname2defaultcolormap($cname) $cmap
    737736                set _settings($cname-colormap) $style(-color)
    738737            }
  • branches/1.4/gui/scripts/nanovisviewer.tcl

    r5203 r5206  
    142142                                       ;# to volumes in the server
    143143    private variable _recvdDatasets;    # list of data objs to send to server
    144     private variable _dataset2style;    # maps dataobj-component to transfunc
    145144    private variable _style2datasets;   # maps tf back to list of
    146145                                        # dataobj-components using the tf.
     
    159158    private variable _volcomponents    ;# Array of components found
    160159    private variable _componentsList   ;# Array of components found
    161     private variable _cname2style
    162160    private variable _cname2transferFunction
    163161    private variable _cname2defaultcolormap
     
    542540            set _dlist [lreplace $_dlist $pos $pos]
    543541            array unset _obj2ovride $dataobj-*
    544             array unset _dataset2style $dataobj-*
    545542            set changed 1
    546543        }
     
    13971394                 -command [itcl::code $this updateTransferFunctions]]
    13981395    }
    1399     set _dataset2style($tag) $cname
    14001396    lappend _style2datasets($cname) $tag
    14011397    return $cname
  • branches/1.4/gui/scripts/vtkglyphviewer.tcl

    r5187 r5206  
    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
     
    838835    array unset _data
    839836    array unset _colormaps
    840     array unset _dataset2style
    841     array unset _obj2datasets
    842837}
    843838
     
    972967            set _first $dataobj
    973968        }
    974         set _obj2datasets($dataobj) ""
    975969        foreach comp [$dataobj components] {
    976970            set tag $dataobj-$comp
     
    1001995                SetObjectStyle $dataobj $comp
    1002996            }
    1003             lappend _obj2datasets($dataobj) $tag
    1004997            if { [info exists _obj2ovride($dataobj-raise)] } {
    1005998                # Setting dataset visible enables outline
  • branches/1.4/gui/scripts/vtkheightmapviewer.tcl

    r5187 r5206  
    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.
     
    812811    # disconnected -- no more data sitting on server
    813812    array unset _datasets
    814     array unset _data
    815813    array unset _colormaps
    816     array unset _obj2datasets
    817814    global readyForNextFrame
    818815    set readyForNextFrame 1
     
    972969            set _first $dataobj
    973970        }
    974         set _obj2datasets($dataobj) ""
    975971        foreach comp [$dataobj components] {
    976972            set tag $dataobj-$comp
     
    1001997                SetObjectStyle $dataobj $comp
    1002998            }
    1003             lappend _obj2datasets($dataobj) $tag
    1004999            if { [info exists _obj2ovride($dataobj-raise)] } {
    10051000                # Setting dataset visible enables outline
  • branches/1.4/gui/scripts/vtkimageviewer.tcl

    r5187 r5206  
    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
     
    802801    # disconnected -- no more data sitting on server
    803802    array unset _datasets
    804     array unset _data
    805803    array unset _colormaps
    806     array unset _obj2datasets
    807804    global readyForNextFrame
    808805    set readyForNextFrame 1
     
    950947            set _first $dataobj
    951948        }
    952         set _obj2datasets($dataobj) ""
    953949        foreach comp [$dataobj components] {
    954950            set tag $dataobj-$comp
     
    979975                SetObjectStyle $dataobj $comp
    980976            }
    981             lappend _obj2datasets($dataobj) $tag
    982977            if { [info exists _obj2ovride($dataobj-raise)] } {
    983978                # Setting dataset visible enables outline
  • branches/1.4/gui/scripts/vtkisosurfaceviewer.tcl

    r5187 r5206  
    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
     
    948945    # disconnected -- no more data sitting on server
    949946    array unset _datasets
    950     array unset _data
    951947    array unset _colormaps
    952     array unset _dataset2style
    953     array unset _obj2datasets
    954948}
    955949
     
    10841078            SetCurrentFieldName $dataobj
    10851079        }
    1086         set _obj2datasets($dataobj) ""
    10871080        foreach comp [$dataobj components] {
    10881081            set tag $dataobj-$comp
     
    11131106                SetObjectStyle $dataobj $comp
    11141107            }
    1115             lappend _obj2datasets($dataobj) $tag
    11161108            if { [info exists _obj2ovride($dataobj-raise)] } {
    11171109                SendCmd "contour3d visible 1 $tag"
  • branches/1.4/gui/scripts/vtkmeshviewer.tcl

    r5187 r5206  
    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
     
    712708    # disconnected -- no more data sitting on server
    713709    array unset _datasets
    714     array unset _data
    715710    global readyForNextFrame
    716711    set readyForNextFrame 1
     
    838833            set _first $dataobj
    839834        }
    840         set _obj2datasets($dataobj) ""
    841835        set tag $dataobj
    842836        if { ![info exists _datasets($tag)] } {
     
    869863            SetObjectStyle $dataobj
    870864        }
    871         lappend _obj2datasets($dataobj) $tag
    872865        if { [info exists _obj2ovride($dataobj-raise)] } {
    873866            SendCmd "dataset visible 1 $tag"
  • branches/1.4/gui/scripts/vtkstreamlinesviewer.tcl

    r5183 r5206  
    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.4/gui/scripts/vtksurfaceviewer.tcl

    r5187 r5206  
    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
     
    791788    # disconnected -- no more data sitting on server
    792789    array unset _datasets
    793     array unset _data
    794790    array unset _colormaps
    795     array unset _dataset2style
    796     array unset _obj2datasets
    797791}
    798792
     
    929923            SetCurrentFieldName $dataobj
    930924        }
    931         set _obj2datasets($dataobj) ""
    932925        foreach comp [$dataobj components] {
    933926            set tag $dataobj-$comp
     
    958951                SetObjectStyle $dataobj $comp
    959952            }
    960             lappend _obj2datasets($dataobj) $tag
    961953            if { [info exists _obj2ovride($dataobj-raise)] } {
    962954                SendCmd "polydata visible 1 $tag"
  • branches/1.4/gui/scripts/vtkviewer.tcl

    r5183 r5206  
    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.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.