Changeset 3752 for branches/1.3


Ignore:
Timestamp:
Jul 6, 2013 2:52:57 PM (11 years ago)
Author:
ldelgass
Message:

merge in mesh example fixes from trunk

Location:
branches/1.3/examples/zoo/mesh
Files:
4 edited
1 moved

Legend:

Unmodified
Added
Removed

  • branches/1.3/examples/zoo/mesh/Makefile.in

    r3471 r3752  
    1616
    1717FILES           = \
    18                 $(srcdir)/data.tcl \
    19                 $(srcdir)/datatri.tcl \
    2018                $(srcdir)/file.vtk \
     19                $(srcdir)/mesh.m \
    2120                $(srcdir)/mesh.tcl \
    2221                $(srcdir)/mesh.vtk \
    23                 $(srcdir)/tool.xml
     22                $(srcdir)/particle_data.txt \
     23                $(srcdir)/points.txt \
     24                $(srcdir)/substrate_data.txt \
     25                $(srcdir)/tool.xml \
     26                $(srcdir)/tool_octave.xml \
     27                $(srcdir)/triangles.txt
    2428
    2529destdir         = $(prefix)/examples/zoo/mesh

  • branches/1.3/examples/zoo/mesh/mesh.m

    r3739 r3752  
    33lib = rpLib(infile);
    44
    5 meshtype = rpLibGetString(lib, 'input.choice.current');
    6 contour = rpLibGetString(lib, 'input.boolean.current')
     5meshtype = rpLibGetString(lib, 'input.choice(mesh).current');
     6contour = rpLibGetString(lib, 'input.boolean(contour).current')
    77switch contour
    88  case 'yes'

  • branches/1.3/examples/zoo/mesh/mesh.tcl

    r3739 r3752  
    1010set driver [Rappture::library [lindex $argv 0]]
    1111
    12 set meshtype [$driver get input.choice.current]
    13 set contour [$driver get input.boolean.current]
     12set meshtype [$driver get "input.choice(mesh).current"]
     13set contour [$driver get "input.boolean(contour).current"]
    1414if { $contour  == "yes" } {
    1515    set view contour

  • branches/1.3/examples/zoo/mesh/tool.xml

    r3739 r3752  
    7979    <default>triangular</default>
    8080   </choice>
     81   <boolean id="contour">
     82     <about>
     83       <label>Contour Plot</label>
     84       <description>Display as a contour plot or surface plot</description>
     85     </about>
     86     <default>yes</default>
     87   </boolean>
    8188 </input>
    8289</run>

  • branches/1.3/examples/zoo/mesh/tool_octave.xml

    r3751 r3752  
    77 <input>
    88   <choice id="mesh">
    9     </option>
    109    <option>
    1110     <about>
    … …  
    8079    <default>triangular</default>
    8180   </choice>
    82  <boolean>
    83    <about>
    84      <label>Contour Plot</label>
    85      <description>Display as a contour plot or surface plot</description>
    86    </about>
    87    <default>yes</default>
    88  </boolean>
     81   <boolean id="contour">
     82     <about>
     83       <label>Contour Plot</label>
     84       <description>Display as a contour plot or surface plot</description>
     85     </about>
     86     <default>yes</default>
     87   </boolean>
    8988 </input>
    9089</run>
Note: See TracChangeset for help on using the changeset viewer.