Changeset 1531 for trunk/gui/scripts/heightmapviewer.tcl

Timestamp:

Jun 26, 2009, 1:16:20 PM (15 years ago)

Author:

gah

Message:

fixed bug when displaying ALL in molvisviewer

File:

• trunk/gui/scripts/heightmapviewer.tcl (modified) (3 diffs)

trunk/gui/scripts/heightmapviewer.tcl

@@ -24 +24 @@
 option add *HeightmapViewer.plotForeground white widgetDefault
 option add *HeightmapViewer.plotOutline white widgetDefault
-option add *HeightmapViewer.font \
-    -*-helvetica-medium-r-normal-*-12-* widgetDefault
+option add *HeightmapViewer.font -*-helvetica-medium-r-normal-*-12-* widgetDefault
 
 # must use this name -- plugs into Rappture::resources::load
@@ -660 +659 @@
         if {"" == [$c find withtag transfunc]} {
             $c create image 0 [expr $lineht] -anchor ne \
-                 -image $_image(legend) -tags transfunc
+                 -image $_image(legend) -tags transfunc 
             $c create text 10 [expr {$h-8}] -anchor se \
-                 -fill $itk_option(-plotforeground) -tags vmin
+                -fill $itk_option(-plotforeground) -tags vmin \
+                -font "Arial 8 bold"
             $c create text [expr {$w-10}] [expr {$h-8}] -anchor ne \
-                 -fill $itk_option(-plotforeground) -tags vmax
+                 -fill $itk_option(-plotforeground) -tags vmax \
+                -font "Arial 8 bold"
         }
         $c coords transfunc [expr $w - 5] [expr $lineht]
@@ -1037 +1038 @@
         set style(-color) "white:yellow:green:cyan:blue:magenta"
     }
-    set clist [split $style(-color) :]
-    set color white
-    set cmap "0.0 [Color2RGB $color] "
-    set range [expr $_limits(vmax) - $_limits(vmin)]
-    for {set i 0} {$i < [llength $clist]} {incr i} {
-        set xval [expr {double($i+1)/([llength $clist]+1)}]
-        set color [lindex $clist $i]
-        append cmap "$xval [Color2RGB $color] "
-    }
-    append cmap "1.0 [Color2RGB $color] "
-
+    if { [info exists style(-nonuniformcolors)] } {
+        foreach { value color } $style(-nonuniformcolors) {
+            append cmap "$value [Color2RGB $color] "
+        }
+    } else {
+        set clist [split $style(-color) :]
+        set cmap "0.0 [Color2RGB white] "
+        for {set i 0} {$i < [llength $clist]} {incr i} {
+            set x [expr {double($i+1)/([llength $clist]+1)}]
+            set color [lindex $clist $i]
+            append cmap "$x [Color2RGB $color] "
+        }
+        append cmap "1.0 [Color2RGB $color]"
+    }
     set opacity $style(-opacity)
     set levels $style(-levels)