Changeset 2540 for branches/blt4


Ignore:
Timestamp:
Sep 21, 2011, 2:27:23 PM (13 years ago)
Author:
gah
Message:

update from trunk

Location:
branches/blt4/examples/zoo
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/blt4/examples/zoo/Makefile.in

    r2296 r2540  
    4848all:
    4949        for i in $(examples) ; do \
    50           $(MAKE) -C $$i all; \
     50          $(MAKE) -C $$i all || exit 1; \
    5151        done
    5252
    5353install:
    5454        for i in $(examples) ; do \
    55           $(MAKE) -C $$i install; \
     55          $(MAKE) -C $$i install || exit 1; \
    5656        done
    5757
    5858clean:
    5959        for i in $(examples) ; do \
    60           $(MAKE) -C $$i clean; \
     60          $(MAKE) -C $$i clean || exit 1; \
    6161        done
    6262
    6363distclean:
    6464        for i in $(examples) ; do \
    65           $(MAKE) -C $$i distclean; \
     65          $(MAKE) -C $$i distclean || exit 1; \
    6666        done
    6767        $(RM) Makefile *~

  • branches/blt4/examples/zoo/cloud/cloud.tcl

    r1587 r2540  
    4646$driver put output.cloud(m3d).hide "yes"
    4747
    48 $driver put output.field(f3d).about.label "2D Field"
     48$driver put output.field(f3d).about.label "3D Field"
    4949$driver put output.field(f3d).component.mesh "output.cloud(m3d)"
    5050for {set n 0} {$n < $npts} {incr n} {

  • branches/blt4/examples/zoo/histogram/histogram.tcl

    r2296 r2540  
    1414
    1515set npts [$driver get input.(points).current]
    16 set min 0.01
     16set min 1
    1717set max 10.0
    1818set dx [expr {($max-$min)/double($npts)}]
    … …  
    4444        "Frequency of the input source."
    4545    $driver put output.histogram(multi$factor).xaxis.units "Hz"
    46     $driver put output.histogram(multi$factor).xaxis.scale "log"
    4746    $driver put output.histogram(multi$factor).yaxis.label "Current"
    4847    $driver put output.histogram(multi$factor).yaxis.description \
    … …  
    8079    set name [lindex $labels $count]
    8180    incr count
    82     $driver put -append yes $prefix.component.namevalue "[list $name $y]\n"
     81    $driver put -append yes $prefix.component.xy "[list $name $y]\n"
    8382}
    8483

  • branches/blt4/examples/zoo/histogram/tool.xml

    r2296 r2540  
    2424  </integer>
    2525</input>
     26<output>
     27<histogram id="example">
     28    <about>
     29      <label>Single dataset</label>
     30      <description>This is an example of a single histogram.</description>
     31    </about>
     32    <xaxis>
     33      <label>Time</label>
     34      <description>Time during the experiment.</description>
     35      <units>s</units>
     36      <marker>
     37        <at>5</at>
     38        <label>Look here</label>
     39        <style>-foreground red -linewidth 2</style>
     40       </marker>
     41    </xaxis>
     42    <yaxis>
     43      <label>Voltage v(11)</label>
     44      <description>Output from the amplifier.</description>
     45      <units>V</units>
     46    </yaxis>
     47    <component>
     48      <xy>
     49       1 0.99
     50       2 0.34
     51       4 0.57
     52       6 0.22
     53       7 0.11
     54       </xy>
     55     </component>
     56   </histogram>
     57</output>
    2658</run>

  • branches/blt4/examples/zoo/image/image.tcl

    r2409 r2540  
    1818set data [$driver get input.image.current]
    1919set angle [$driver get input.(angle).current]
    20 set angle [Rappture::Units::convert 20rad -to deg -units off]
    21 puts stderr "angle=$angle from Rappture::Units::convert 20deg -to deg -units off"
     20set angle [Rappture::Units::convert $angle -to deg -units off]
    2221
    2322set imh [image create picture -data $data]
Note: See TracChangeset for help on using the changeset viewer.