Changeset 435 for trunk/gui/scripts/sequence.tcl

Timestamp:

May 9, 2006 5:56:32 PM (18 years ago)

Author:

mmc

Message:

Fixed the <sequence> object so that it can support multiple objects
within each <element>. For example, the zoo/sequence demo now includes
two parameters A and B, and the B parameters are used to generate a
series of <curve> objects within each <element>.

Fixed the <sequence> so it works correctly when an index has units.

File:

• trunk/gui/scripts/sequence.tcl (modified) (5 diffs)

trunk/gui/scripts/sequence.tcl

@@ -51 +51 @@
         }
 
+        set ctype ""
+        set _dataobjs($index) ""
         foreach cname [$_xmlobj children $name] {
             set type [$xmlobj element -as type $path.$name.$cname]
@@ -56 +58 @@
                 index {
                     # ignore this
+                    continue
                 }
                 curve {
                     set obj [Rappture::Curve ::#auto $xmlobj $path.$name.$cname]
-                    break
                 }
                 field {
                     set obj [Rappture::Field ::#auto $xmlobj $path.$name.$cname]
-                    break
                 }
                 image {
                     set obj [Rappture::Image ::#auto $xmlobj $path.$name.$cname]
-                    break
                 }
                 default {
@@ -73 +73 @@
                 }
             }
+            if {"" == $ctype} {
+                set ctype $type
+            }
+            if {$type == $ctype} {
+                lappend _dataobjs($index) $obj
+            } else {
+                itcl::delete object $obj
+            }
         }
-        set _dataobjs($index) $obj
     }
 
@@ -80 +87 @@
     # Generate a list of sorted index values.
     #
-    set units [$xmlobj get path.index.units]
+    set units [$xmlobj get $path.index.units]
     if {"" != $units} {
         # build up a list:  {10m 10} {10cm 0.1} ...
@@ -125 +132 @@
 itcl::body Rappture::Sequence::destructor {} {
     foreach key [array names _dataobjs] {
-        itcl::delete object $_dataobjs($key)
+        eval itcl::delete object $_dataobjs($key)
     }
     itcl::delete object $_xmlobj