Changeset 3922 for trunk

Timestamp:

Sep 13, 2013 6:36:28 AM (11 years ago)

Author:

gah

Message:

fix: add units and label method to cloud object

File:

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

trunk/gui/scripts/cloud.tcl

@@ -21 +21 @@
     private variable _cloud "";         # lib obj representing this cloud
     private variable _units "m m m" ;   # system of units for x, y, z
+    private variable _axis2label;       # 
+    private variable _axis2units;       # 
     private variable _limits;           # limits x, y, z
     private common _xp2obj ;            # Used for fetch/release ref counting
@@ -112 +114 @@
     set _cloud [$xmlobj element -as object $path]
 
-    set u [$_cloud get units]
-    if {"" != $u} {
-        while {[llength $u] < 3} {
-            lappend u [lindex $u end]
-        }
-        set _units $u
+    set _units [$_cloud 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 [$_cloud get labels] axis { x y z } {
+        if { $label != "" } {
+            set _axis2labels($axis) $label
+        } else {
+            set _axis2labels($axis) [string toupper $axis]
+        }
     }
 
@@ -246 +257 @@
 #
 itcl::body Rappture::Cloud::units { axis } {
-    if { [info exists _hints(${axis}units)] } {
-        return $_hints(${axis}units)
-    }
-    return ""
+    if { ![info exists _axis2units($axis)] } {
+        return ""
+    }
+    return $_axis2units($axis)
 }
 
@@ -258 +269 @@
 #
 itcl::body Rappture::Cloud::label { axis } {
-    if { [info exists _hints(${axis}label)] } {
-        return $_hints(${axis}label)
-    }
-    return ""
+    if { ![info exists axis2label($axis)] } {
+        return ""
+    }
+    return $axis2label($axis)
 }