Changeset 4481 for branches/1.3/gui/scripts/vtkglyphviewer.tcl

Timestamp:

Jul 10, 2014 6:08:15 AM (10 years ago)

Author:

ldelgass

Message:

Merge r4169,r4344 from trunk: merge field 2D/3D result, add VTK surface viewer

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• gui/scripts/vtkglyphviewer.tcl (modified) (5 diffs)

branches/1.3/gui/scripts/vtkglyphviewer.tcl

@@ -1 +1 @@
 # -*- mode: tcl; indent-tabs-mode: nil -*- 
-
 # ----------------------------------------------------------------------
 #  COMPONENT: vtkglyphviewer - Vtk 3D glyphs object viewer
@@ -8 +7 @@
 # ======================================================================
 #  AUTHOR:  Michael McLennan, Purdue University
-#  Copyright (c) 2004-2005  Purdue Research Foundation
+#  Copyright (c) 2004-2014  HUBzero Foundation, LLC
 #
 #  See the file "license.terms" for information on usage and
@@ -1478 +1477 @@
 itcl::body Rappture::VtkGlyphViewer::RequestLegend {} {
     set _legendPending 0
-    if { ![info exists _fields($_curFldName)] } {
-        return
-    }
+    set font "Arial 8"
+    set w 12
+    set lineht [font metrics $font -linespace]
+    # color ramp height = (canvas height) - (min and max value lines) - 2 
+    set h [expr {$_height - 2 * ($lineht + 2)}]
+
     set fname $_curFldName
-    set font "Arial 8"
-    set lineht [font metrics $font -linespace]
-    set w 12
-    set h [expr {$_height - 2 * ($lineht + 2)}]
-    if { $h < 1 } {
-        return
-    }
     if { [string match "component*" $fname] } {
         set title ""
@@ -1504 +1499 @@
     if { $title != "" } {
         incr h -$lineht 
+    }
+    if { $h < 1 } {
+        return
     }
     # Set the legend on the first heightmap dataset.
@@ -2299 +2297 @@
         # If there's a legend title, create a text item for the title.
         $c create text $x $y \
-                -anchor ne \
-                -fill $itk_option(-plotforeground) -tags "title legend" \
-                -font $font 
-            incr y $lineht
+            -anchor ne \
+            -fill $itk_option(-plotforeground) -tags "title legend" \
+            -font $font 
+        if { $title != "" } {
+            incr y $lineht
+        }
         $c create text $x $y \
-            -anchor ne \
-            -fill $itk_option(-plotforeground) -tags "vmax legend" \
-            -font $font
+            -anchor ne \
+            -fill $itk_option(-plotforeground) -tags "vmax legend" \
+            -font $font
         incr y $lineht
         $c create image $x $y \
-            -anchor ne \
-            -image $_image(legend) -tags "colormap legend"
+            -anchor ne \
+            -image $_image(legend) -tags "colormap legend"
         $c create rectangle $x $y 1 1 \
-            -fill "" -outline "" -tags "sensor legend"
+            -fill "" -outline "" -tags "sensor legend"
         $c create text $x [expr {$h-2}] \
-            -anchor se \
-            -fill $itk_option(-plotforeground) -tags "vmin legend" \
-            -font $font
+            -anchor se \
+            -fill $itk_option(-plotforeground) -tags "vmin legend" \
+            -font $font
         $c bind sensor <Enter> [itcl::code $this EnterLegend %x %y]
         $c bind sensor <Leave> [itcl::code $this LeaveLegend]