Changeset 3917 for trunk/gui/scripts/mesh.tcl

Timestamp:

Sep 12, 2013, 12:13:53 PM (11 years ago)

Author:

gah

Message:

fix axis labels for contour/heightmap

File:

• trunk/gui/scripts/mesh.tcl (modified) (4 diffs)

trunk/gui/scripts/mesh.tcl

@@ -27 +27 @@
     private variable _dim       0;      # Dimension of mesh (1, 2, or 3)
     private variable _type "";          # Indicates the type of mesh.
-    private variable _units "m m m" ;   # System of units for x, y, z
+    private variable _axis2units;       # System of units for x, y, z
+    private variable _axis2labels;      # 
     private variable _limits        ;   # Array of mesh limits. Keys are 
                                         # xmin, xmax, ymin, ymax, ...
@@ -46 +47 @@
     public method dimensions {}
     public method limits {which}
+    public method units { axis }
+    public method label { axis }
     public method hints {{key ""}}
     public method isvalid {} {
@@ -149 +152 @@
         set _limits($axis) ""
     }
-    set u [$_mesh get units]
-    if {"" != $u} {
-        while {[llength $u] < 3} {
-            lappend u [lindex $u end]
-        }
-        set _units $u
+    set units [$_mesh get units]
+    set first [lindex $units 0]
+    foreach u $units axis { x y z } {
+        if { $u != "" } {
+            set _axis2units($axis) $u 
+        } else {
+            set _axis2units($axis) $first 
+        }
+    }
+    foreach label [$_mesh get labels] axis { x y z } {
+        if { $label != "" } {
+            set _axis2labels($axis) $label
+        } else {
+            set _axis2labels($axis) [string toupper $axis]
+        }
     }
 
@@ -237 +249 @@
 itcl::body Rappture::Mesh::points {} {
     return ""
+}
+
+#
+# units --
+#
+#       Returns the units of the given axis.
+#
+itcl::body Rappture::Mesh::units { axis } {
+    if { ![info exists _axis2units($axis)] } {
+        return ""
+    }
+    return $_axis2units($axis)
+}
+
+#
+# label --
+#
+#       Returns the label of the given axis.
+#
+itcl::body Rappture::Mesh::label { axis } {
+    if { ![info exists axis2label($axis)] } {
+        return ""
+    }
+    return $axis2label($axis)
 }