Changeset 5257 for branches/1.3


Ignore:
Timestamp:
Apr 17, 2015, 11:01:57 PM (5 years ago)
Author:
ldelgass
Message:

fixes for flow/nanovis viewers, merge r5246 from trunk

Location:
branches/1.3
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

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

    r5256 r5257  
    18491849        set _settings($tag-opacity) $style(-opacity)
    18501850    }
    1851     set max 1.0 ;#$_settings($tag-opacity)
     1851
     1852    # Transfer function should be normalized with [0,1] range
     1853    # The volume shading opacity setting is used to scale opacity
     1854    # in the volume shader.
     1855    set max 1.0
    18521856
    18531857    set isovalues {}
     
    20042008
    20052009# ----------------------------------------------------------------------
    2006 # USAGE: UndateTransferFuncs
     2010# USAGE: UpdateTransferFuncs
    20072011# ----------------------------------------------------------------------
    20082012itcl::body Rappture::FlowvisViewer::updateTransferFunctions {} {
     
    26032607        "set" {
    26042608            set what [lindex $args 0]
    2605             set x $_settings($this-$what)
     2609            set x $_settings(${this}${what})
    26062610            set code [catch { string is double $x } result]
    26072611            if { $code != 0 || !$result } {
    2608                 set _settings($this-$what) $_view($what)
     2612                set _settings(${this}${what}) $_view($what)
    26092613                return
    26102614            }
  • branches/1.3/gui/scripts/nanovisviewer.tcl

    r5254 r5257  
    15461546
    15471547# ----------------------------------------------------------------------
    1548 # USAGE: UndateTransferFuncs
     1548# USAGE: UpdateTransferFuncs
    15491549# ----------------------------------------------------------------------
    15501550itcl::body Rappture::NanovisViewer::updateTransferFunctions {} {
Note: See TracChangeset for help on using the changeset viewer.