Changeset 4557


Ignore:
Timestamp:
Jul 17, 2014 9:52:43 PM (7 years ago)
Author:
ldelgass
Message:

merge r4404 from trunk

Location:
branches/1.3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

    • Property svn:mergeinfo changed
      /trunkmerged: 4404
  • branches/1.3/gui/scripts/flowvisviewer.tcl

    r4556 r4557  
    716716# ----------------------------------------------------------------------
    717717itcl::body Rappture::FlowvisViewer::scale {args} {
    718     array set style {
     718    array set styles {
    719719        -color BCGYR
    720720        -levels 6
     721        -markers ""
    721722        -opacity 1.0
    722         -markers ""
    723723    }
    724724    array unset _limits
     
    731731            if { ![info exists _volcomponents($cname)] } {
    732732                lappend _componentsList $cname
    733                 array set style [lindex [$dataobj components -style $cname] 0]
    734                 set cmap [ColorsToColormap $style(-color)]
     733                array set styles [lindex [$dataobj components -style $cname] 0]
     734                set cmap [ColorsToColormap $styles(-color)]
    735735                set _cname2defaultcolormap($cname) $cmap
    736                 set _settings($cname-colormap) $style(-color)
     736                set _settings($cname-colormap) $styles(-color)
    737737            }
    738738            lappend _volcomponents($cname) $dataobj-$cname
     
    12551255    foreach key [array names _serverObjs *-*] {
    12561256        if {[string match $_first-* $key]} {
    1257             array set style {
     1257            array set styles {
    12581258                -cutplanes 1
    12591259            }
    12601260            foreach {dataobj comp} [split $key -] break
    1261             array set style [lindex [$dataobj components -style $comp] 0]
    1262             if {$what != "-cutplanes" || $style(-cutplanes)} {
     1261            array set styles [lindex [$dataobj components -style $comp] 0]
     1262            if {$what != "-cutplanes" || $styles(-cutplanes)} {
    12631263                lappend rlist $_serverObjs($key)
    12641264            }
     
    17031703#
    17041704itcl::body Rappture::FlowvisViewer::NameTransferFunc { dataobj cname } {
    1705     array set style {
     1705    array set styles {
    17061706        -color BCGYR
    17071707        -levels 6
     
    17101710        -transp 50
    17111711    }
    1712     array set style [lindex [$dataobj components -style $cname] 0]
    1713     set _settings($this-light) $style(-light)
    1714     set _settings($this-transp) $style(-transp)
    1715     set _settings($this-opacity) [expr $style(-opacity) * 100]
     1712    array set styles [lindex [$dataobj components -style $cname] 0]
     1713    set _settings($this-light) $styles(-light)
     1714    set _settings($this-transp) $styles(-transp)
     1715    set _settings($this-opacity) [expr $styles(-opacity) * 100]
    17161716    set _obj2style($dataobj-$cname) $cname
    17171717    lappend _style2objs($cname) $dataobj $cname
     
    17291729#
    17301730itcl::body Rappture::FlowvisViewer::ComputeTransferFunc { tf } {
    1731     array set style {
     1731    array set styles {
    17321732        -color BCGYR
    17331733        -levels 6
     
    17411741        return 0
    17421742    }
    1743     array set style [lindex [$dataobj components -style $comp] 0]
     1743    array set styles [lindex [$dataobj components -style $comp] 0]
    17441744
    17451745
     
    17591759    if { ![info exists _isomarkers($tf)] } {
    17601760        # Have to defer creation of isomarkers until we have data limits
    1761         if { [info exists style(-markers)] &&
    1762              [llength $style(-markers)] > 0  } {
    1763             ParseMarkersOption $tf $style(-markers)
     1761        if { [info exists styles(-markers)] &&
     1762             [llength $styles(-markers)] > 0  } {
     1763            ParseMarkersOption $tf $styles(-markers)
    17641764        } else {
    1765             ParseLevelsOption $tf $style(-levels)
    1766         }
    1767     }
    1768     if { [info exists style(-nonuniformcolors)] } {
    1769         foreach { value color } $style(-nonuniformcolors) {
     1765            ParseLevelsOption $tf $styles(-levels)
     1766        }
     1767    }
     1768    if { [info exists styles(-nonuniformcolors)] } {
     1769        foreach { value color } $styles(-nonuniformcolors) {
    17701770            append cmap "$value [Color2RGB $color] "
    17711771        }
    17721772    } else {
    1773         set cmap [ColorsToColormap $style(-color)]
     1773        set cmap [ColorsToColormap $styles(-color)]
    17741774    }
    17751775    set tag $this-$tf
    17761776    if { ![info exists _settings($tag-opacity)] } {
    1777         set _settings($tag-opacity) $style(-opacity)
     1777        set _settings($tag-opacity) $styles(-opacity)
    17781778    }
    17791779    set max 1.0 ;#$_settings($tag-opacity)
Note: See TracChangeset for help on using the changeset viewer.