Changeset 4119 for trunk/gui/scripts/vtkvolumeviewer.tcl

Timestamp:

Jan 15, 2014, 1:03:56 PM (11 years ago)

Author:

gah

Message:

fix: check correct array variable to determine if to initialize component settings in ComputeAlphamap? in vtkvolumeviewer

File:

• trunk/gui/scripts/vtkvolumeviewer.tcl (modified) (6 diffs)

trunk/gui/scripts/vtkvolumeviewer.tcl

@@ -1545 +1545 @@
             set _cutplanePending 0
         }
-        "thickness" {
-            set val $_settings($this-thickness)
-            set _settings($_current-thickness) $val
+        "volumeThickness" {
+            set _settings($_current-volumeThickness) $_settings(volumeThickness)
             updateTransferFunctions
         }
         "volumeColormap" {
             set color [$itk_component(colormap) value]
-            set _settings($this-colormap) $color
+            set _settings(colormap) $color
             set _settings($_current-colormap) $color
             ResetColormap $_current $color
@@ -1714 +1713 @@
     label $inner.thin -text "Thin" -font $font
     ::scale $inner.thickness -from 0 -to 1000 -orient horizontal \
-        -variable [itcl::scope _settings($this-thickness)] \
-        -showvalue off -command [itcl::code $this AdjustSetting thickness] \
+        -variable [itcl::scope _settings(volumeThickness)] \
+        -showvalue off -command [itcl::code $this AdjustSetting volumeThickness] \
         -troughcolor grey92
 
     label $inner.thick -text "Thick" -font $font
-
+    $inner.thickness set $_settings(volumeThickness)
 
     label $inner.colormap_l -text "Colormap" -font $font
@@ -2689 +2688 @@
 itcl::body Rappture::VtkVolumeViewer::InitComponentSettings { cname } { 
     array set _settings [subst {
-        $cname-ambient           60
-        $cname-colormap          default
-        $cname-diffuse           40
-        $cname-light2side        1
-        $cname-opacity           100
-        $cname-outline           0
-        $cname-specularExponent  90
-        $cname-specularLevel     30
-        $cname-thickness         350
-        $cname-transp            50
-        $cname-volumeVisible     1
+        $cname-colormap                 default
+        $cname-light2side               1
+        $cname-outline                  0
+        $cname-volumeAmbient            60
+        $cname-volumeBlendMode          composite
+        $cname-volumeDiffuse            60
+        $cname-volumeLighting           1
+        $cname-volumeOpacity            50
+        $cname-volumeQuality            50
+        $cname-volumeSpecularExponent   90
+        $cname-volumeSpecularLevel      30
+        $cname-volumeThickness          350
+        $cname-volumeVisible            1
     }]
 }
@@ -2711 +2712 @@
 #
 itcl::body Rappture::VtkVolumeViewer::SwitchComponent { cname } { 
-    if { ![info exists _settings($cname-ambient)] } {
+    if { ![info exists _settings(${cname}-volumeAmbient)] } {
         InitComponentSettings $cname
     }
     # _settings variables change widgets, except for colormap
-    set _settings($this-ambient)          $_settings($cname-ambient)
-    set _settings($this-colormap)         $_settings($cname-colormap)
-    set _settings($this-diffuse)          $_settings($cname-diffuse)
-    set _settings($this-light2side)       $_settings($cname-light2side)
-    set _settings($this-opacity)          $_settings($cname-opacity)
-    set _settings($this-outline)          $_settings($cname-outline)
-    set _settings($this-specularExponent) $_settings($cname-specularExponent)
-    set _settings($this-specularLevel)    $_settings($cname-specularLevel)
-    set _settings($this-thickness)        $_settings($cname-thickness)
-    set _settings($this-transp)           $_settings($cname-transp)
-    set _settings($this-volumeVisible)    $_settings($cname-volumeVisible)
+    foreach name {
+        light2side              
+        outline                 
+        volumeAmbient           
+        volumeBlendMode         
+        volumeDiffuse           
+        volumeLighting          
+        volumeOpacity           
+        volumeQuality           
+        volumeSpecularExponent  
+        volumeSpecularLevel     
+        volumeThickness         
+        volumeVisible           
+    } {
+        set _settings($name) $_settings(${cname}-${name})
+    }
     $itk_component(colormap) value        $_settings($cname-colormap)
     set _current $cname;                # Reset the current component
@@ -2734 +2740 @@
         return [list 0.0 0.0 1.0 1.0]
     }
-    if { ![info exists _settings($cname-ambient)] } {
+    if { ![info exists _settings($cname-volumeAmbient)] } {
         InitComponentSettings $cname
     }
@@ -2744 +2750 @@
     # settings widgets) are used for the active transfer-function.  Update
     # the values in the _settings varible.
-    set opacity [expr { double($_settings($cname-opacity)) * 0.01 }]
+    set opacity [expr { double($_settings($cname-volumeOpacity)) * 0.01 }]
 
     # Scale values between 0.00001 and 0.01000
-    set delta [expr {double($_settings($cname-thickness)) * 0.0001}]
-    
+    set delta [expr {double($_settings($cname-volumeThickness)) * 0.0001}]
     set first [lindex $isovalues 0]
     set last [lindex $isovalues end]