Changeset 3923 for trunk

Timestamp:

Sep 13, 2013, 2:51:22 PM (11 years ago)

Author:

gah

Message:

fix z-axis labels for contour/heightmap

Location:

trunk/gui/scripts

Files:

• cloud.tcl (modified) (4 diffs)
• visviewer.tcl (modified) (1 diff)
• vtkglyphviewer.tcl (modified) (1 diff)
• vtkheightmapviewer.tcl (modified) (5 diffs)
• vtkisosurfaceviewer.tcl (modified) (2 diffs)
• vtkstreamlinesviewer.tcl (modified) (1 diff)
• vtkviewer.tcl (modified) (1 diff)
• vtkvolumeviewer.tcl (modified) (1 diff)

trunk/gui/scripts/cloud.tcl

@@ -20 +20 @@
     private variable _xmlobj "";        # ref to XML obj with device data
     private variable _cloud "";         # lib obj representing this cloud
-    private variable _units "m m m" ;   # system of units for x, y, z
+    private variable _units "" ;        # system of units for x, y, z
     private variable _axis2label;       # 
     private variable _axis2units;       # 
@@ -116 +116 @@
     set _units [$_cloud get units]
     set first [lindex $_units 0]
+    set list {}
     foreach u $_units axis { x y z } {
         if { $u != "" } {
@@ -122 +123 @@
             set _axis2units($axis) $first 
         }
-    }
+        lappend list $_axis2units($axis)
+    }
+    set _units $list
     foreach label [$_cloud get labels] axis { x y z } {
         if { $label != "" } {
@@ -148 +151 @@
         foreach axis {x y z} units $_units {
             set value [Rappture::Units::convert [set $axis] \
-                -context $units -to $units -units off]
-
+                        -context $units -to $units -units off]
             set $axis $value;           # Set the (x/y/z) coordinate to 
                                         # converted value.

trunk/gui/scripts/visviewer.tcl

@@ -628 +628 @@
         set inner [frame $itk_component(plotarea).view.splash]
         $inner configure -relief raised -bd 2 
-        label $inner.text1 -text "Rendering...\nPlease wait." \
+        label $inner.text1 -text "Working...\nPlease wait." \
             -font "Arial 10" 
         label $inner.icon 

trunk/gui/scripts/vtkglyphviewer.tcl

@@ -1718 +1718 @@
         "static_triad"    "static" \
         "closest_triad"   "closest" \
-        "furthest_triad"  "furthest" \
+        "furthest_triad"  "farthest" \
         "outer_edges"     "outer"         
     $itk_component(axisMode) value "static"

trunk/gui/scripts/vtkheightmapviewer.tcl

@@ -218 +218 @@
         axisFlymode             "static"
         axisMinorTicks          1
-        stretchToFit            1
+        stretchToFit            0
         axisLabels              1
         axisVisible             1
@@ -1041 +1041 @@
         
         foreach axis { x y z } {
-            set label [$_first hints ${axis}label]
+            if { $axis == "z" } {
+                set label [$_first hints label]
+            } else {
+                set label [$_first hints ${axis}label]
+            }
+ puts stderr "axis=$axis label=$label"
             if { $label == "" } {
                 if {$axis == "z"} {
@@ -1053 +1058 @@
                 }
             }
+ puts stderr "[list axis name $axis $label]"
             # May be a space in the axis label.
             SendCmd [list axis name $axis $label]
@@ -1441 +1447 @@
                 return
             }
-            set label [$_first hints zlabel]
+            set label [$_first hints label]
             if { $label == "" } {
                 if { [string match "component*" $_curFldName] } {
@@ -2077 +2083 @@
         "static_triad"    "static" \
         "closest_triad"   "closest" \
-        "furthest_triad"  "furthest" \
+        "furthest_triad"  "farthest" \
         "outer_edges"     "outer"         
     $itk_component(axisflymode) value "static"

trunk/gui/scripts/vtkisosurfaceviewer.tcl

@@ -440 +440 @@
 
     eval itk_initialize $args
+
+    EnableWaitDialog 500
     Connect
     update
@@ -1772 +1774 @@
         "static_triad"    "static" \
         "closest_triad"   "closest" \
-        "furthest_triad"  "furthest" \
+        "furthest_triad"  "farthest" \
         "outer_edges"     "outer"         
     $itk_component(axisMode) value "static"

trunk/gui/scripts/vtkstreamlinesviewer.tcl

@@ -1822 +1822 @@
         "static_triad"    "static" \
         "closest_triad"   "closest" \
-        "furthest_triad"  "furthest" \
+        "furthest_triad"  "farthest" \
         "outer_edges"     "outer"         
     $itk_component(axismode) value "static"

trunk/gui/scripts/vtkviewer.tcl

@@ -1952 +1952 @@
         "static_triad"    "static" \
         "closest_triad"   "closest" \
-        "furthest_triad"  "furthest" \
+        "furthest_triad"  "farthest" \
         "outer_edges"     "outer"         
     $itk_component(axismode) value "static"

trunk/gui/scripts/vtkvolumeviewer.tcl

@@ -1703 +1703 @@
         "static_triad"    "static" \
         "closest_triad"   "closest" \
-        "furthest_triad"  "furthest" \
+        "furthest_triad"  "farthest" \
         "outer_edges"     "outer"         
     $itk_component(axismode) value "static"