Changeset 4191 for trunk/gui/scripts

Timestamp:

Feb 21, 2014 3:57:25 AM (10 years ago)

Author:

ldelgass

Message:

Clean up some cruft from removal of "transp" setting. Note that opacity is
not used as a style parameter, and the transfer functions are no longer
scaled, the peaks are always at full opacity. The volume shading opacity
setting is used to scale opacity in the volume shader instead. There are still
some bugs with applying all the component-wise shading/transfer function
settings, e.g. with newly added volumes in a sequence.

File:

• trunk/gui/scripts/nanovisviewer.tcl (modified) (13 diffs)

trunk/gui/scripts/nanovisviewer.tcl

@@ -225 +225 @@
         -diffuse                40
         -light2side             1
-        -opacity                100
+        -opacity                50
+        -outlinevisible         0
         -qw                     0.853553
         -qx                     -0.353553
@@ -233 +234 @@
         -specularlevel          30
         -thickness              350
-        -opacity                 50
         -volume                 1
         -volumevisible          1
@@ -558 +558 @@
         -color BCGYR
         -levels 6
-        -opacity 1.0
         -markers ""
     }
@@ -1264 +1263 @@
         }
         "-ambient" {
+            # Other parts of the code use the ambient setting to 
+            # tell if the component settings have been initialized
+            if { ![info exists _settings($_current${what})] } {
+                InitComponentSettings $_current
+            }
+            set _settings($_current${what}) $_settings($what)
             set val $_settings($what)
             set val [expr {0.01*$val}]
@@ -1271 +1276 @@
         }
         "-diffuse" {
+            set _settings($_current${what}) $_settings($what)
             set val $_settings($what)
             set val [expr {0.01*$val}]
@@ -1278 +1284 @@
         }
         "-specularlevel" {
+            set _settings($_current${what}) $_settings($what)
             set val $_settings($what)
             set val [expr {0.01*$val}]
@@ -1285 +1292 @@
         }
         "-specularexponent" {
+            set _settings($_current${what}) $_settings($what)
             set val $_settings($what)
             foreach tag [GetDatasetsWithComponent $_current] {
@@ -1421 +1429 @@
         -color BCGYR
         -levels 6
-        -opacity 1.0
         -markers ""
     }
@@ -1468 +1475 @@
             -color BCGYR
             -levels 6
-            -opacity 1.0
             -markers ""
         }
@@ -2216 +2222 @@
         $cname-diffuse           40
         $cname-light2side        1
-        $cname-opacity           100
-        $cname-outline           0
+        $cname-opacity           50
         $cname-specularexponent  90
         $cname-specularlevel     30
         $cname-thickness         350
-        $cname-opacity            50
         $cname-volumevisible     1
     }]
@@ -2243 +2247 @@
     set _settings(-light2side)       $_settings($cname-light2side)
     set _settings(-opacity)          $_settings($cname-opacity)
-    set _settings(-outline)          $_settings($cname-outline)
     set _settings(-specularexponent) $_settings($cname-specularexponent)
     set _settings(-specularlevel)    $_settings($cname-specularlevel)
     set _settings(-thickness)        $_settings($cname-thickness)
-    set _settings(-opacity)          $_settings($cname-opacity)
     set _settings(-volumevisible)    $_settings($cname-volumevisible)
     $itk_component(colormap) value   $_settings($cname-colormap)
@@ -2352 +2354 @@
         InitComponentSettings $cname
     }
-    set max 1.0 ;                       #$_settings($tag-opacity)
 
     set isovalues [$_transferFunctionEditors($cname) values]
 
-    # Ensure that the global opacity and thickness settings (in the slider
-    # 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 }]
-
+    # Currently using volume shading opacity to scale opacity in
+    # the volume shader. The transfer function always sets full
+    # opacity
+    set max 1.0
+
+    # Use the component-wise thickness setting from the slider
+    # settings widget
     # Scale values between 0.00001 and 0.01000
     set delta [expr {double($_settings($cname-thickness)) * 0.0001}]
@@ -2573 +2576 @@
         }
     }
-    # Multiply each component by the global opacity value.
     return ""
 }