Changeset 5562 for trunk

Timestamp:

May 19, 2015, 11:52:47 AM (9 years ago)

Author:

ldelgass

Message:

Add title to flowvis legend, fix legend text tags for settings text color

Location:

trunk/gui/scripts

Files:

• flowvisviewer.tcl (modified) (3 diffs)
• isomarker.tcl (modified) (1 diff)
• nanovisviewer.tcl (modified) (2 diffs)
• transferfunctioneditor.tcl (modified) (1 diff)

trunk/gui/scripts/flowvisviewer.tcl

@@ -1000 +1000 @@
             -image $_image(legend) -tags colorbar
         $c create text $lx $ly -anchor sw \
-            -fill $itk_option(-plotforeground) -tags "limits labels vmin"
+            -fill $itk_option(-plotforeground) -tags "limits text vmin"
         $c create text [expr {$w-$lx}] $ly -anchor se \
-            -fill $itk_option(-plotforeground) -tags "limits labels vmax"
+            -fill $itk_option(-plotforeground) -tags "limits text vmax"
+        $c create text [expr {$w/2}] $ly -anchor s \
+            -fill $itk_option(-plotforeground) -tags "title text"
         $c lower colorbar
         $c bind colorbar <ButtonRelease-1> [itcl::code $this AddIsoMarker %x %y]
@@ -1015 +1017 @@
     $c itemconfigure vmax -text [format %g $max]
     $c coords vmax [expr {$w-$lx}] $ly
+
+    set title [$_first hints label]
+    set units [$_first hints units]
+    if { $units != "" } {
+        set title "$title ($units)"
+    }
+    $c itemconfigure title -text $title
+    $c coords title [expr {$w/2}] $ly
 
     if { [info exists _isomarkers($tf)] } {
@@ -1796 +1806 @@
         SendCmd "grid axiscolor $rgb"
         SendCmd "grid linecolor $rgb"
-        $itk_component(legend) itemconfigure labels -fill $color
-        $itk_component(legend) itemconfigure limits -fill $color
+        $itk_component(legend) itemconfigure text -fill $color
     }
 }

trunk/gui/scripts/isomarker.tcl

@@ -56 +56 @@
     set _label [$c create text 0 $h \
                     -anchor n -fill white -font "Helvetica 8" \
-                    -tags "labels $this $obj" -state hidden]
+                    -tags "labels text $this $obj" -state hidden]
     $c bind $_tick <Enter>           [itcl::code $this EnterTick]
     $c bind $_tick <Leave>           [itcl::code $this LeaveTick]

trunk/gui/scripts/nanovisviewer.tcl

@@ -769 +769 @@
             -fill $itk_option(-plotforeground) -tags "limits text vmax"
         $c create text [expr {$w/2}] $ly -anchor s \
-            -fill $itk_option(-plotforeground) -tags "limits text title"
+            -fill $itk_option(-plotforeground) -tags "title text"
         $c lower colorbar
         $c bind colorbar <ButtonRelease-1> [itcl::code $this AddNewMarker %x %y]
@@ -1523 +1523 @@
         SendCmd "grid axiscolor $rgb"
         SendCmd "grid linecolor $rgb"
-        $itk_component(legend) itemconfigure labels -fill $color
-        $itk_component(legend) itemconfigure limits -fill $color
+        $itk_component(legend) itemconfigure text -fill $color
     }
 }

trunk/gui/scripts/transferfunctioneditor.tcl

@@ -127 +127 @@
     set _labels($name) [$_canvas create text 0 $h \
                             -anchor n -fill white -font "Helvetica 8" \
-                            -tags "labels $this $_name" -state $state]
+                            -tags "labels text $this $_name" -state $state]
     set _id2name($_ticks($name)) $name
     $_canvas bind $_ticks($name) <Enter> [itcl::code $this EnterTick $name]