Changeset 4725 for trunk

Timestamp:

Nov 13, 2014, 7:26:24 PM (10 years ago)

Author:

ldelgass

Message:

Collapse redundant transp/opacity settings in flowvisviewer in place of single
opacity setting.

Location:

trunk/gui/scripts

Files:

• flowvisviewer.tcl (modified) (12 diffs)
• nanovisviewer.tcl (modified) (1 diff)

trunk/gui/scripts/flowvisviewer.tcl

@@ -253 +253 @@
         $this-diffuse           40
         $this-light2side        1
-        $this-opacity           100
+        $this-opacity           50
         $this-specularLevel     30
         $this-specularExponent  90
         $this-thickness         350
-        $this-transp            50
         $this-cutplaneVisible   0
         $this-xcutplane         1
@@ -740 +739 @@
         -levels 6
         -markers ""
-        -opacity 1.0
+        -opacity 0.5
     }
     array unset _limits 
@@ -965 +964 @@
     }
 
-    # 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 value $_settings($this-opacity)
-    set opacity [expr { double($value) * 0.01 }]
-    set _settings($this-$tf-opacity) $opacity
+    # Ensure that the global thickness setting (in the slider settings widget)
+    # is used for the active transfer-function. Update the values in the
+    # _settings varible.
+
     set value $_settings($this-thickness)
     # Scale values between 0.00001 and 0.01000
@@ -1200 +1197 @@
     # Reset the camera and other view parameters
     InitSettings light2side ambient diffuse specularLevel specularExponent \
-        transp isosurface grid axes volume outline \
+        opacity isosurface grid axes volume outline \
         cutplaneVisible xcutplane ycutplane zcutplane
 
@@ -1622 +1619 @@
             }
         }
-        transp {
+        opacity {
             if { $_first != "" } {
                 set comp [lindex [$_first components] 0]
                 set tag $_first-$comp
-                set opacity [expr { 0.01 * double($_settings($this-transp)) }]
+                set opacity [expr { 0.01 * double($_settings($this-opacity)) }]
                 SendCmd "$tag configure -opacity $opacity"
             }
         }
-        opacity {
-            if { $_first != "" && $_activeTf != "" } {
-                set opacity [expr { 0.01 * double($_settings($this-opacity)) }]
-                set tf $_activeTf
-                set _settings($this-$tf-opacity) $opacity
-                updateTransferFunctions
-            }
-        }
-
         thickness {
             if { $_first != "" && $_activeTf != "" } {
@@ -1764 +1752 @@
         -color BCGYR
         -levels 6
-        -light 40
-        -opacity 1.0
-        -transp 50
+        -opacity 0.5
     }
     array set styles [lindex [$dataobj components -style $cname] 0]
-    set _settings($this-light) $styles(-light)
-    set _settings($this-transp) $styles(-transp)
     set _settings($this-opacity) [expr $styles(-opacity) * 100]
     set _obj2style($dataobj-$cname) $cname
@@ -1790 +1774 @@
         -color BCGYR
         -levels 6
-        -opacity 1.0
-        -light 40
-        -transp 50
+        -opacity 0.5
     }
     set dataobj ""; set comp ""
@@ -1800 +1782 @@
     }
     array set styles [lindex [$dataobj components -style $comp] 0]
-
 
     # We have to parse the style attributes for a volume using this
@@ -1831 +1812 @@
         set cmap [ColorsToColormap $styles(-color)]
     }
-    set tag $this-$tf
-    if { ![info exists _settings($tag-opacity)] } {
-        set _settings($tag-opacity) $styles(-opacity)
-    }
-    set max 1.0 ;#$_settings($tag-opacity)
-    
+
+    if { ![info exists _settings($this-opacity)] } {
+        set _settings($this-opacity) [expr $styles(-opacity) * 100]
+    }
+
+    # 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 {}
     foreach m $_isomarkers($tf) {
@@ -1844 +1829 @@
     set isovalues [lsort -real $isovalues]
 
+    set tag $this-$tf
     if { ![info exists _settings($tag-thickness)]} {
         set _settings($tag-thickness) 0.005
@@ -2222 +2208 @@
 
     label $inner.clear -text "Clear" -font $fg
-    ::scale $inner.transp -from 0 -to 100 -orient horizontal \
-        -variable [itcl::scope _settings($this-transp)] \
+    ::scale $inner.opacity -from 0 -to 100 -orient horizontal \
+        -variable [itcl::scope _settings($this-opacity)] \
         -width 10 \
-        -showvalue off -command [itcl::code $this AdjustSetting transp]
+        -showvalue off -command [itcl::code $this AdjustSetting opacity]
     label $inner.opaque -text "Opaque" -font $fg
 
@@ -2257 +2243 @@
         6,1 $inner.specularExponent -cspan 3 -pady 2 -fill x \
         7,0 $inner.clear -anchor e -pady 2 \
-        7,1 $inner.transp -cspan 2 -pady 2 -fill x \
+        7,1 $inner.opacity -cspan 2 -pady 2 -fill x \
         7,3 $inner.opaque -anchor w -pady 2 \
         8,0 $inner.thin -anchor e -pady 2 \

trunk/gui/scripts/nanovisviewer.tcl

@@ -2300 +2300 @@
     set isovalues [$_transferFunctionEditors($cname) values]
 
-    # Currently using volume shading opacity to scale opacity in
-    # the volume shader. The transfer function always sets full
-    # 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