Changeset 4664

Timestamp:

Nov 8, 2014, 5:32:52 AM (10 years ago)

Author:

gah

Message:

fix global opacity

Location:

branches/1.3/gui/scripts

Files:

• field.tcl (modified) (6 diffs)
• nanovisviewer.tcl (modified) (6 diffs)

branches/1.3/gui/scripts/field.tcl

@@ -427 +427 @@
     set min ""
     set max ""
-    blt::vector tmp zero
 
     foreach cname [array names _comp2dims] {
+        puts stderr "cname=$cname dims=$_comp2dims($cname)"
         switch -- $_comp2dims($cname) {
             1D {
@@ -453 +453 @@
 
                 if {$log} {
+                    blt::vector tmp zero
                     # on a log scale, use abs value and ignore 0's
                     $vname dup tmp
@@ -461 +462 @@
                     set axisMin [blt::vector expr min(tmp)]
                     set axisMax [blt::vector expr max(tmp)]
+                    blt::vector destroy tmp zero
                 } else {
                     set axisMin [$vname min]
@@ -477 +479 @@
                 }
             }
-            2D - 3D {
+            default {
                 if {[info exists _comp2limits($cname)]} {
                     array set limits $_comp2limits($cname) 
@@ -519 +521 @@
         }
     }
-    blt::vector destroy tmp zero
     set val [$_field get "${axis}axis.min"]
     if {"" != $val && "" != $min} {
@@ -919 +920 @@
                 continue;               # Ignore this component
             }
-            if 0 {
+            if 1 {
                 set f [open /tmp/$_path.$cname.dx "w"]
                 puts -nonewline $f $contents

branches/1.3/gui/scripts/nanovisviewer.tcl

@@ -238 +238 @@
         -thickness              350
         -volume                 1
-        -volumeopacity          0.5
+        -volumeopacity          1.0
         -volumevisible          1
         -xcutplaneposition      50
@@ -251 +251 @@
     }
     array set _widget {
-        -volumeopacity          0.5
+        -volumeopacity          100
     }
     itk_component add 3dview {
@@ -1314 +1314 @@
             set _settings($what) [expr $_widget($what) * 0.01]
             set _settings($_current${what}) $_settings($what)
-            foreach tag [GetDatasetsWithComponent $_current] {
-                SendCmd "volume shading opacity $_settings($what) $tag"
-            }
+        
+            foreach {cmap wmap} $_cname2transferFunction($_current) break
+            set wmap [ComputeAlphamap $_current]
+            set _cname2transferFunction($_current) [list $cmap $wmap]
+            SendCmd [list transfunc define $_current $cmap $wmap]
         }
         "-volumevisible" {
@@ -2103 +2105 @@
         -light2side        1
         -thickness         350
-        -volumeopacity     0.5
+        -volumeopacity     1.0
         -volumevisible     1
     } {
@@ -2244 +2246 @@
 
     # Currently using volume shading opacity to scale opacity in
-    # the volume shader. The transfer function always sets full
-    # opacity
-    set max 1.0
+    # the volume shader. 
+    set max $_settings($cname-volumeopacity)
 
     # Use the component-wise thickness setting from the slider
@@ -2468 +2469 @@
 itcl::body Rappture::NanovisViewer::SetObjectStyle { dataobj cname } {
     array set styles {
-        -opacity  0.6
-    }
-    array set styles [lindex [$dataobj components -style $cname] 0]
-    set _settings($cname-volumeopacity) $styles(-opacity)
-    NameTransferFunction $dataobj $cname
-}
-
-
-
-
+-opacity  0.6
+}
+array set styles [lindex [$dataobj components -style $cname] 0]
+set _settings($cname-volumeopacity) $styles(-opacity)
+NameTransferFunction $dataobj $cname
+}
+
+
+
+