Changeset 5183 for branches/1.4/gui

Timestamp:

Apr 2, 2015 9:03:35 AM (9 years ago)

Author:

ldelgass

Message:

s/wmap/amap/

Location:

branches/1.4/gui/scripts

Files:

• flowvisviewer.tcl (modified) (2 diffs)
• nanovisviewer.tcl (modified) (20 diffs)
• vtkglyphviewer.tcl (modified) (1 diff)
• vtkheightmapviewer.tcl (modified) (1 diff)
• vtkimageviewer.tcl (modified) (1 diff)
• vtkisosurfaceviewer.tcl (modified) (1 diff)
• vtkstreamlinesviewer.tcl (modified) (1 diff)
• vtksurfaceviewer.tcl (modified) (1 diff)
• vtkviewer.tcl (modified) (1 diff)
• vtkvolumeviewer.tcl (modified) (1 diff)

branches/1.4/gui/scripts/flowvisviewer.tcl

@@ -1782 +1782 @@
     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 {
@@ -1812 +1812 @@
         }
         # 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
-    }
-    SendCmd "transfunc define $tf { $cmap } { $wmap }"
+        lappend amap 1.0 0.0
+    }
+    SendCmd "transfunc define $tf { $cmap } { $amap }"
     return [SendCmd "$dataobj-$comp configure -transferfunction $tf"]
 }

branches/1.4/gui/scripts/nanovisviewer.tcl

@@ -1399 +1399 @@
         # changes.
         set cmap [ColorsToColormap $styles(-color)]
-        set wmap [list 0.0 0.0 1.0 1.0]
-        set _cname2transferFunction($cname) [list $cmap $wmap]
-        SendCmd [list transfunc define $cname $cmap $wmap]
+        set amap [list 0.0 0.0 1.0 1.0]
+        set _cname2transferFunction($cname) [list $cmap $amap]
+        SendCmd [list transfunc define $cname $cmap $amap]
     }
     SendCmd "volume shading transfunc $cname $tag"
@@ -1425 +1425 @@
 #
 itcl::body Rappture::NanovisViewer::ComputeTransferFunction { cname } {
-    foreach {cmap wmap} $_cname2transferFunction($cname) break
+    foreach {cmap amap} $_cname2transferFunction($cname) break
 
     # We have to parse the style attributes for a volume using this
@@ -1454 +1454 @@
 
     }
-    set wmap [ComputeAlphamap $cname]
-    set _cname2transferFunction($cname) [list $cmap $wmap]
-    SendCmd [list transfunc define $cname $cmap $wmap]
+    set amap [ComputeAlphamap $cname]
+    set _cname2transferFunction($cname) [list $cmap $amap]
+    SendCmd [list transfunc define $cname $cmap $amap]
 }
 
@@ -2239 +2239 @@
         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 transfunc define $cname $cmap $wmap]
+    set _cname2transferFunction($cname) [list $cmap $amap]
+    SendCmd [list transfunc define $cname $cmap $amap]
     EventuallyRedrawLegend
 }
@@ -2268 +2268 @@
     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 {
@@ -2298 +2298 @@
         }
         # 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
 }
 
@@ -2312 +2312 @@
     switch -- $name {
         "ramp-up" {
-            set wmap {
+            set amap {
                 0.0 0.0
                 1.0 1.0
@@ -2318 +2318 @@
         }
         "ramp-down" {
-            set wmap {
+            set amap {
                 0.0 1.0
                 1.0 0.0
@@ -2324 +2324 @@
         }
         "vee" {
-            set wmap {
+            set amap {
                 0.0 1.0
                 0.5 0.0
@@ -2331 +2331 @@
         }
         "tent-1" {
-            set wmap {
+            set amap {
                 0.0 0.0
                 0.5 1.0
@@ -2338 +2338 @@
         }
         "tent-2" {
-            set wmap {
+            set amap {
                 0.0 0.0
                 0.25 1.0
@@ -2347 +2347 @@
         }
         "tent-3" {
-            set wmap {
+            set amap {
                 0.0 0.0
                 0.16666 1.0
@@ -2358 +2358 @@
         }
         "tent-4" {
-            set wmap {
+            set amap {
                 0.0     0.0
                 0.125   1.0
@@ -2371 +2371 @@
         }
         "sinusoid-1" {
-            set wmap {
+            set amap {
                 0.0                     0.000 0.600 0.800
                 0.14285714285714285     0.400 0.900 1.000
@@ -2383 +2383 @@
         }
         "sinusoid-2" {
-            set wmap {
+            set amap {
                 0.0                     0.900 1.000 1.000
                 0.1111111111111111      0.800 0.983 1.000
@@ -2397 +2397 @@
         }
         "sinusoid-6" {
-            set wmap {
+            set amap {
                 0.0                             0.200   0.100   0.000
                 0.09090909090909091             0.400   0.187   0.000
@@ -2413 +2413 @@
         }
         "sinusoid-10" {
-            set wmap {
+            set amap {
                 0.0                             0.000   0.480   0.600
                 0.09090909090909091             0.000   0.667   0.800
@@ -2429 +2429 @@
         }
         "step-2" {
-            set wmap {
+            set amap {
                 0.0                             0.000   0.167   1.000
                 0.09090909090909091             0.100   0.400   1.000
@@ -2445 +2445 @@
         }
         "step-5" {
-            set wmap {
+            set amap {
                 0.0                             1.000   0.167   0.000
                 0.09090909090909091             1.000   0.400   0.100
@@ -2461 +2461 @@
         }
         "step-12" {
-            set wmap {
+            set amap {
                 "#EE82EE"
                 "#4B0082"

branches/1.4/gui/scripts/vtkglyphviewer.tcl

@@ -2547 +2547 @@
         set cmap "0.0 0.0 0.0 0.0 1.0 1.0 1.0 1.0"
     }
-    set wmap "0.0 1.0 1.0 1.0"
-    SendCmd "colormap add $name { $cmap } { $wmap }"
+    set amap "0.0 1.0 1.0 1.0"
+    SendCmd "colormap add $name { $cmap } { $amap }"
 }
 

branches/1.4/gui/scripts/vtkheightmapviewer.tcl

@@ -1807 +1807 @@
         set cmap "0.0 0.0 0.0 0.0 1.0 1.0 1.0 1.0"
     }
-    set wmap "0.0 1.0 1.0 1.0"
-    SendCmd "colormap add $name { $cmap } { $wmap }"
+    set amap "0.0 1.0 1.0 1.0"
+    SendCmd "colormap add $name { $cmap } { $amap }"
 }
 

branches/1.4/gui/scripts/vtkimageviewer.tcl

@@ -1594 +1594 @@
         set cmap "0.0 0.0 0.0 0.0 1.0 1.0 1.0 1.0"
     }
-    set wmap "0.0 1.0 1.0 1.0"
-    SendCmd "colormap add $name { $cmap } { $wmap }"
+    set amap "0.0 1.0 1.0 1.0"
+    SendCmd "colormap add $name { $cmap } { $amap }"
 }
 

branches/1.4/gui/scripts/vtkisosurfaceviewer.tcl

@@ -3088 +3088 @@
         set cmap "0.0 0.0 0.0 0.0 1.0 1.0 1.0 1.0"
     }
-    set wmap "0.0 1.0 1.0 1.0"
-    SendCmd "colormap add $name { $cmap } { $wmap }"
+    set amap "0.0 1.0 1.0 1.0"
+    SendCmd "colormap add $name { $cmap } { $amap }"
 }
 

branches/1.4/gui/scripts/vtkstreamlinesviewer.tcl

@@ -1595 +1595 @@
     set max $_settings(-volumeopacity)
 
-    set wmap "0.0 1.0 1.0 1.0"
-    SendCmd "colormap add $name { $cmap } { $wmap }"
+    set amap "0.0 1.0 1.0 1.0"
+    SendCmd "colormap add $name { $cmap } { $amap }"
 }
 

branches/1.4/gui/scripts/vtksurfaceviewer.tcl

@@ -2283 +2283 @@
         set cmap "0.0 0.0 0.0 0.0 1.0 1.0 1.0 1.0"
     }
-    set wmap "0.0 1.0 1.0 1.0"
-    SendCmd "colormap add $name { $cmap } { $wmap }"
+    set amap "0.0 1.0 1.0 1.0"
+    SendCmd "colormap add $name { $cmap } { $amap }"
 }
 

branches/1.4/gui/scripts/vtkviewer.tcl

@@ -1878 +1878 @@
     set max $_settings(polydata-opacity)
 
-    set wmap "0.0 1.0 1.0 1.0"
-    SendCmd "colormap add $name { $cmap } { $wmap }"
+    set amap "0.0 1.0 1.0 1.0"
+    SendCmd "colormap add $name { $cmap } { $amap }"
 }
 

branches/1.4/gui/scripts/vtkvolumeviewer.tcl

@@ -1608 +1608 @@
 
     set opaqueWmap "0.0 1.0 1.0 1.0"
-    #set wmap "0.0 0.0 0.1 0.0 0.2 0.8 0.98 0.8 0.99 0.0 1.0 0.0"
+    #set amap "0.0 0.0 0.1 0.0 0.2 0.8 0.98 0.8 0.99 0.0 1.0 0.0"
     # Approximate cubic opacity curve
-    set wmap "0.0 0.0 0.1 0.001 0.2 0.008 0.3 0.027 0.4 0.064 0.5 0.125 0.6 0.216 0.7 0.343 0.8 0.512 0.9 0.729 1.0 1.0"
-    SendCmd "colormap add $name { $cmap } { $wmap }"
+    set amap "0.0 0.0 0.1 0.001 0.2 0.008 0.3 0.027 0.4 0.064 0.5 0.125 0.6 0.216 0.7 0.343 0.8 0.512 0.9 0.729 1.0 1.0"
+    SendCmd "colormap add $name { $cmap } { $amap }"
     SendCmd "colormap add $name-opaque { $cmap } { $opaqueWmap }"
 }