Changeset 521 for trunk

Timestamp:

Sep 7, 2006, 6:46:54 AM (18 years ago)

Author:

dkearney

Message:

adjusted the matlab example, matlab commands no longer need delimited single quotes, this was fixed when the tcl rappture was updated when nick added TEA support.
also added units to the image example in zoo, not it recognized the units deg and rad for the angle of how much to turn the image.

Location:

trunk/examples

Files:

• app-fermi/matlab/fermi.m (modified) (1 diff)
• app-fermi/matlab/tool.xml (modified) (1 diff)
• zoo/image/image.tcl (modified) (1 diff)
• zoo/image/tool.xml (modified) (1 diff)

trunk/examples/app-fermi/matlab/fermi.m

@@ -18 +18 @@
 % matlab -nodisplay -r infile=\'driver1234.xml\',fermi
 % the above command sets variable infile to the name 'driver1234.xml'
+
+% infile = 'driver31619.xml'
 
 % open our xml input file.

trunk/examples/app-fermi/matlab/tool.xml

@@ -3 +3 @@
     <tool>
         <about>Press Simulate to view results.</about>
-        <command>matlab -nodisplay -r infile=\'@driver\',fermi</command>
+        <command>matlab -nojvm -nosplash -nodisplay -r infile='@driver',fermi</command>
     </tool>
     <input>

trunk/examples/zoo/image/image.tcl

@@ -19 +19 @@
 set data [$driver get input.image.current]
 set angle [$driver get input.(angle).current]
+set angle [Rappture::Units::convert $angle -to deg -units off]
 
 set imh [image create photo -data $data]

trunk/examples/zoo/image/tool.xml

@@ -30 +30 @@
       <description>Rotate image by this amount in degrees.</description>
     </about>
-    <min>0</min>
-    <max>360</max>
-    <default>0</default>
+    <units>deg</units>
+    <min>0deg</min>
+    <max>360deg</max>
+    <default>0deg</default>
   </number>
 </input>