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

Timestamp:

Nov 12, 2013 5:34:24 PM (11 years ago)

Author:

ldelgass

Message:

More colormap fixes for cutplanes

File:

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

trunk/gui/scripts/vtkvolumeviewer.tcl

@@ -2146 +2146 @@
     SetInitialTransferFunction $dataobj $cname
     SendCmd "volume colormap $cname $tag"
+    SendCmd "cutplane colormap $cname-opaque $tag"
 }
 
@@ -2561 +2562 @@
         }
     } else {
-        foreach {cmap wmap} $_cname2transferFunction($cname) break
-    }
-
-    set wmap [ComputeAlphamap $cname]
-    set opaqueWmap "0.0 1.0 1.0 1.0" 
-    set _cname2transferFunction($cname) [list $cmap $wmap]
-    SendCmd [list colormap add $cname $cmap $wmap]
-    SendCmd [list colormap add $cname-opaque $cmap $opaqueWmap]
+        foreach {cmap amap} $_cname2transferFunction($cname) break
+    }
+
+    set amap [ComputeAlphamap $cname]
+    set opaqueAmap "0.0 1.0 1.0 1.0" 
+    set _cname2transferFunction($cname) [list $cmap $amap]
+    SendCmd [list colormap add $cname $cmap $amap]
+    SendCmd [list colormap add $cname-opaque $cmap $opaqueAmap]
 }
 
@@ -2581 +2582 @@
         return
     }
-    foreach { cmap wmap } $_cname2transferFunction($cname) break
+    foreach { cmap amap } $_cname2transferFunction($cname) break
     set cmap [GetColormap $cname $color]
-    set _cname2transferFunction($cname) [list $cmap $wmap]
-    SendCmd [list colormap add $cname $cmap $wmap]
-    SendCmd [list cutplane colormap $cname-opaque]
+    set _cname2transferFunction($cname) [list $cmap $amap]
+    set opaqueAmap "0.0 1.0 1.0 1.0" 
+    SendCmd [list colormap add $cname $cmap $amap]
+    SendCmd [list colormap add $cname-opaque $cmap $opaqueAmap]
     EventuallyRequestLegend
 }
@@ -2699 +2701 @@
     set first [lindex $isovalues 0]
     set last [lindex $isovalues end]
-    set wmap ""
+    set amap ""
     if { $first == "" || $first != 0.0 } {
-        lappend wmap 0.0 0.0
+        lappend amap 0.0 0.0
     }
     foreach x $isovalues {
@@ -2729 +2731 @@
         }
         # add spikes in the middle
-        lappend wmap $x1 0.0
-        lappend wmap $x2 $max
-        lappend wmap $x3 $max
-        lappend wmap $x4 0.0
+        lappend amap $x1 0.0
+        lappend amap $x2 $max
+        lappend amap $x3 $max
+        lappend amap $x4 0.0
     }
     if { $last == "" || $last != 1.0 } {
-        lappend wmap 1.0 0.0
-    }
-    return $wmap
+        lappend amap 1.0 0.0
+    }
+    return $amap
 }