Changeset 4693

Timestamp:

Nov 10, 2014 1:39:31 PM (10 years ago)

Author:

ldelgass

Message:

Fix for volume opacity style. I think this should be a better fix than r4664.
We always normalize transfer functions, we just need to appy the opacity
component style to the volume at creation time.

File:

• branches/1.3/gui/scripts/nanovisviewer.tcl (modified) (5 diffs)

branches/1.3/gui/scripts/nanovisviewer.tcl

@@ -238 +238 @@
         -thickness              350
         -volume                 1
-        -volumeopacity          1.0
+        -volumeopacity          0.5
         -volumevisible          1
         -xcutplaneposition      50
@@ -251 +251 @@
     }
     array set _widget {
-        -volumeopacity          100
+        -volumeopacity          50
     }
     itk_component add 3dview {
@@ -1318 +1318 @@
             set _settings($what) [expr $_widget($what) * 0.01]
             set _settings($_current${what}) $_settings($what)
-        
-            foreach {cmap wmap} $_cname2transferFunction($_current) break
-            set wmap [ComputeAlphamap $_current]
-            set _cname2transferFunction($_current) [list $cmap $wmap]
-            SendCmd [list transfunc define $_current $cmap $wmap]
+            foreach tag [GetDatasetsWithComponent $_current] {
+                SendCmd "volume shading opacity $_settings($what) $tag"
+            }
         }
         "-volumevisible" {
@@ -2249 +2247 @@
     set isovalues [$_transferFunctionEditors($cname) values]
 
-    # Currently using volume shading opacity to scale opacity in
-    # the volume shader. 
-    set max $_settings($cname-volumeopacity)
+    # 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
 
     # Use the component-wise thickness setting from the slider
@@ -2471 +2470 @@
 itcl::body Rappture::NanovisViewer::SetObjectStyle { dataobj cname } {
     array set styles {
-        -opacity  0.6
+        -opacity  0.5
     }
     array set styles [lindex [$dataobj components -style $cname] 0]
     set _settings($cname-volumeopacity) $styles(-opacity)
+    set tag $dataobj-$cname
+    SendCmd "volume shading opacity $_settings($cname-volumeopacity) $tag"
     NameTransferFunction $dataobj $cname
 }