Changeset 5176

Timestamp:

Apr 1, 2015 6:34:02 PM (6 years ago)

Author:

ldelgass

Message:

merge r5126 from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• gui/scripts/visviewer.tcl (modified) (11 diffs)

branches/1.3/gui/scripts/visviewer.tcl

@@ -933 +933 @@
 
 itcl::body Rappture::VisViewer::ColorsToColormap { colors } {
+    set cmap {}
     switch -- $colors {
         "grey-to-blue" {
-            return {
+            set cmap {
                 0.0                      0.200 0.200 0.200
                 0.14285714285714285      0.400 0.400 0.400
@@ -947 +948 @@
         }
         "blue-to-grey" {
-            return {
+            set cmap {
                 0.0                     0.000 0.600 0.800
                 0.14285714285714285     0.400 0.900 1.000
@@ -959 +960 @@
         }
         "white-to-blue" {
-            return {
+            set cmap {
                 0.0                     0.900 1.000 1.000
                 0.1111111111111111      0.800 0.983 1.000
@@ -973 +974 @@
         }
         "brown-to-blue" {
-            return {
+            set cmap {
                 0.0                             0.200   0.100   0.000
                 0.09090909090909091             0.400   0.187   0.000
@@ -989 +990 @@
         }
         "blue-to-brown" {
-            return {
+            set cmap {
                 0.0                             0.000   0.480   0.600
                 0.09090909090909091             0.000   0.667   0.800
@@ -1005 +1006 @@
         }
         "blue-to-orange" {
-            return {
+            set cmap {
                 0.0                             0.000   0.167   1.000
                 0.09090909090909091             0.100   0.400   1.000
@@ -1021 +1022 @@
         }
         "orange-to-blue" {
-            return {
+            set cmap {
                 0.0                             1.000   0.167   0.000
                 0.09090909090909091             1.000   0.400   0.100
@@ -1084 +1085 @@
         }
         "spectral" {
-            return {
+            set cmap {
                 0.0 0.150 0.300 1.000
                 0.1 0.250 0.630 1.000
@@ -1099 +1100 @@
         }
         "green-to-magenta" {
-            return {
+            set cmap {
                 0.0 0.000 0.316 0.000
                 0.06666666666666667 0.000 0.526 0.000
@@ -1119 +1120 @@
         }
         "greyscale" {
-            return {
+            set cmap {
                 0.0 0.0 0.0 0.0 1.0 1.0 1.0 1.0
             }
@@ -1130 +1131 @@
         }
     }
-    set cmap {}
-    if { [llength $clist] == 1 } {
-        set rgb [Color2RGB $clist]
-        append cmap "0.0 $rgb 1.0 $rgb"
+    if {$cmap == ""} {
+        if { [llength $clist] == 1 } {
+            set rgb [Color2RGB $clist]
+            append cmap "0.0 $rgb 1.0 $rgb"
+        } else {
+            for {set i 0} {$i < [llength $clist]} {incr i} {
+                set x [expr {double($i)/([llength $clist]-1)}]
+                set color [lindex $clist $i]
+                append cmap "$x [Color2RGB $color] "
+            }
+        }
     } else {
-        for {set i 0} {$i < [llength $clist]} {incr i} {
-            set x [expr {double($i)/([llength $clist]-1)}]
-            set color [lindex $clist $i]
-            append cmap "$x [Color2RGB $color] "
-        }
+        regsub -all "\[ \t\r\n\]+" [string trim $cmap] " " cmap
     }
     return $cmap