Changeset 5257 for branches/1.3

Timestamp:

Apr 17, 2015 8:01:57 PM (9 years ago)

Author:

ldelgass

Message:

fixes for flow/nanovis viewers, merge r5246 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• gui/scripts/flowvisviewer.tcl (modified) (3 diffs)
• gui/scripts/nanovisviewer.tcl (modified) (1 diff)

branches/1.3/gui/scripts/flowvisviewer.tcl

@@ -1849 +1849 @@
         set _settings($tag-opacity) $style(-opacity)
     }
-    set max 1.0 ;#$_settings($tag-opacity)
+
+    # Transfer function should be normalized with [0,1] range
+    # The volume shading opacity setting is used to scale opacity
+    # in the volume shader.
+    set max 1.0
 
     set isovalues {}
@@ -2004 +2008 @@
 
 # ----------------------------------------------------------------------
-# USAGE: UndateTransferFuncs
+# USAGE: UpdateTransferFuncs
 # ----------------------------------------------------------------------
 itcl::body Rappture::FlowvisViewer::updateTransferFunctions {} {
@@ -2603 +2607 @@
         "set" {
             set what [lindex $args 0]
-            set x $_settings($this-$what)
+            set x $_settings(${this}${what})
             set code [catch { string is double $x } result]
             if { $code != 0 || !$result } {
-                set _settings($this-$what) $_view($what)
+                set _settings(${this}${what}) $_view($what)
                 return
             }

branches/1.3/gui/scripts/nanovisviewer.tcl

@@ -1546 +1546 @@
 
 # ----------------------------------------------------------------------
-# USAGE: UndateTransferFuncs
+# USAGE: UpdateTransferFuncs
 # ----------------------------------------------------------------------
 itcl::body Rappture::NanovisViewer::updateTransferFunctions {} {