Changeset 4727

Timestamp:

Nov 13, 2014 7:47:56 PM (10 years ago)

Author:

ldelgass

Message:

Merge opacity fixes for flowvisviewer from trunk

Location:

branches/1.3

Files:

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

branches/1.3/examples/flow/flowtest.tcl

@@ -39 +39 @@
     $f1.component.flow.particles(right).color khaki
     $f1.component.flow.particles(right).position 90%
-    $f1.component.style  "-color blue:red -levels 6 -opacity 1"
+    $f1.component.style  "-color blue:red -levels 6"
     $f1.component.flow.box(one).label "Region 1"
     $f1.component.flow.box(one).color cyan
@@ -75 +75 @@
     $f2.component.flow.particles(right).color pink
     $f2.component.flow.particles(right).position 90%
-    $f2.component.style  "-color rainbow -levels 6 -opacity 1"
+    $f2.component.style  "-color rainbow -levels 6"
     $f2.camera.position {
         qw 1 qx 0 qy 0 qz 0 pan-x 0 pan-y 0 zoom 1.0
@@ -100 +100 @@
     $f3.component.flow.particles(right).color khaki
     $f3.component.flow.particles(right).position 90%
-    $f3.component.style  "-color blue:red -levels 6 -opacity 1"
+    $f3.component.style  "-color blue:red -levels 6"
     $f3.component.elemtype vectors
     $f3.component.elemsize 3

branches/1.3/gui/scripts/flowvisviewer.tcl

@@ -250 +250 @@
         $this-streams           0
         $this-volume            1
+        $this-light             40
+        $this-light2side        1
+        $this-opacity           50
+        $this-thickness         350
         $this-xcutplane         0
         $this-xcutposition      0
@@ -720 +724 @@
         -levels 6
         -markers ""
-        -opacity 1.0
+        -opacity 0.5
     }
     array unset _limits 
@@ -945 +949 @@
     }
 
-    # 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
@@ -1174 +1176 @@
 
     # Reset the camera and other view parameters
-    InitSettings light2side light transp isosurface grid axes volume outline
-    
+    InitSettings light2side light opacity isosurface grid axes volume outline
+
     # nothing to send -- activate the proper volume
     if {"" != $_first} {
-        AdjustSetting light
-        AdjustSetting transp
         set axis [$_first hints updir]
         if {"" != $axis} {
@@ -1574 +1574 @@
             }
         }
-        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 != "" } {
@@ -1710 +1701 @@
         -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
@@ -1736 +1723 @@
         -color BCGYR
         -levels 6
-        -opacity 1.0
-        -light 40
-        -transp 50
+        -opacity 0.5
     }
     set dataobj ""; set comp ""
@@ -1746 +1731 @@
     }
     array set styles [lindex [$dataobj components -style $comp] 0]
-
 
     # We have to parse the style attributes for a volume using this
@@ -1777 +1761 @@
         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) {
@@ -1790 +1778 @@
     set isovalues [lsort -real $isovalues]
 
+    set tag $this-$tf
     if { ![info exists _settings($tag-thickness)]} {
         set _settings($tag-thickness) 0.005
@@ -2123 +2112 @@
 
 itcl::body Rappture::FlowvisViewer::BuildVolumeTab {} {
-    foreach { key value } {
-        light2side      1
-        light           40
-        transp          50
-        opacity         100
-        thickness       350
-    } {
-        set _settings($this-$key) $value
-    }
-
     set inner [$itk_component(main) insert end \
         -title "Volume Settings" \
@@ -2159 +2138 @@
         -showvalue off -command [itcl::code $this AdjustSetting light]
     label $inner.bright -text "Surface" -font $fg
-
-    label $inner.fog -text "Clear" -font $fg
-    ::scale $inner.transp -from 0 -to 100 -orient horizontal \
-        -variable [itcl::scope _settings($this-transp)] \
-        -width 10 \
-        -showvalue off -command [itcl::code $this AdjustSetting transp]
-    label $inner.plastic -text "Opaque" -font $fg
 
     label $inner.clear -text "Clear" -font $fg
@@ -2198 +2170 @@
         3,1 $inner.light -cspan 2 -pady 2 -fill x \
         3,3 $inner.bright -anchor w -pady 2 \
-        4,0 $inner.fog -anchor e -pady 2 \
-        4,1 $inner.transp -cspan 2 -pady 2 -fill x \
-        4,3 $inner.plastic -anchor w -pady 2 \
+        4,0 $inner.clear -anchor e -pady 2 \
+        4,1 $inner.opacity -cspan 2 -pady 2 -fill x \
+        4,3 $inner.opaque -anchor w -pady 2 \
         5,0 $inner.thin -anchor e -pady 2 \
         5,1 $inner.thickness -cspan 2 -pady 2 -fill x\

branches/1.3/gui/scripts/nanovisviewer.tcl

@@ -2250 +2250 @@
     # Transfer function should be normalized with [0,1] range
     # The volume shading opacity setting is used to scale opacity
-    # in the volume shader. 
+    # in the volume shader.
     set max 1.0