Changeset 435 for trunk/examples

Timestamp:

May 9, 2006, 5:56:32 PM (19 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.

Location:

trunk/examples/zoo/sequence

Files:

• sequence2.tcl (modified) (1 diff)
• tool2.xml (modified) (2 diffs)

trunk/examples/zoo/sequence/sequence2.tcl

@@ -16 +16 @@
 
 set func [$driver get input.string(func).current]
-set pvals [$driver get input.string(pvals).current]
+set avals [$driver get input.string(avals).current]
+set bvals [$driver get input.string(bvals).current]
 
-# remove any commas in the pvals list
-regsub -all {,} $pvals {} pvals
+# remove any commas in the avals/bvals lists
+regsub -all {,} $avals {} avals
+regsub -all {,} $bvals {} bvals
 
 # change "x" to $x in expression
 regsub -all {x} $func {$x} func
-regsub -all {P} $func {$P} func
+regsub -all {A} $func {$A} func
+regsub -all {B} $func {$B} func
 
 set xmin -1
 set xmax 1
 set npts 30
-foreach P $pvals {
-    $driver put output.sequence(outs).element($P).index $P
-    $driver put output.sequence(outs).element($P).curve.xaxis.label "x"
-    $driver put output.sequence(outs).element($P).curve.yaxis.label \
-        "Function y(x)"
+foreach A $avals {
+    set elem output.sequence(outs).element($A)
+    $driver put $elem.index $A
 
-    for {set i 0} {$i < $npts} {incr i} {
-        set x [expr {$i*($xmax-$xmin)/double($npts) + $xmin}]
-        set y [expr $func]
-        $driver put -append yes \
-          output.sequence(outs).element($P).curve.component.xy "$x $y\n"
+    if {[llength $bvals] > 0} {
+        # one or more B values -- put out a separate curve for each B value
+        foreach B $bvals {
+            $driver put $elem.curve($B).about.label "B = $B"
+            $driver put $elem.curve($B).about.group "A = $A"
+            $driver put $elem.curve($B).xaxis.label "x"
+            $driver put $elem.curve($B).yaxis.label "Function y(x)"
+
+            for {set i 0} {$i < $npts} {incr i} {
+                set x [expr {$i*($xmax-$xmin)/double($npts) + $xmin}]
+                set y [expr $func]
+                $driver put -append yes \
+                  $elem.curve($B).component.xy "$x $y\n"
+            }
+        }
+    } else {
+        # no B values -- put out a single curve for each element
+        $driver put $elem.curve.xaxis.label "x"
+        $driver put $elem.curve.yaxis.label "Function y(x)"
+
+        for {set i 0} {$i < $npts} {incr i} {
+            set x [expr {$i*($xmax-$xmin)/double($npts) + $xmin}]
+            set y [expr $func]
+            $driver put -append yes \
+              output.sequence(outs).element($A).curve.component.xy "$x $y\n"
+        }
     }
 }

trunk/examples/zoo/sequence/tool2.xml

@@ -17 +17 @@
     <about>
       <label>Function</label>
-      <description>Function to plot y=f(x), where x is the range, and P is some other parameter, set below.</description>
+      <description>Function to plot y=f(x), where x is the range, and A and B are some other parameters, set below.</description>
     </about>
-    <default>P*x + 2</default>
+    <default>A*x + 2</default>
   </string>
-  <string id="pvals">
+  <string id="avals">
     <about>
-      <label>P values</label>
-      <description>List of values for parameter P in the function above.</description>
+      <label>A values</label>
+      <description>List of values for parameter A in the function above.</description>
+      <diffs>ignore</diffs>
     </about>
     <default>0, 1, 2</default>
+  </string>
+  <string id="bvals">
+    <about>
+      <label>B values</label>
+      <description>List of values for parameter B in the function above.</description>
+      <diffs>ignore</diffs>
+    </about>
+    <default></default>
   </string>
 </input>
@@ -32 +41 @@
   <sequence id="outs">
     <about><label>Sequence of Plots</label></about>
-    <index><label>Parameter P</label></index>
+    <index><label>Parameter A</label></index>
   </sequence>
 </output>