Changeset 96 for trunk

Timestamp:

Oct 10, 2005, 3:29:58 PM (19 years ago)

Author:

dkearney

Message:

added units conversion to coerce to the number.py
added a command to exec a new process to launch the gui in interface.py
these might make it possible to run examples/app-fermi/2.0

Location:

trunk/python/Rappture

Files:

• interface.py (modified) (3 diffs)
• number.py (modified) (2 diffs)

trunk/python/Rappture/interface.py

@@ -14 +14 @@
 #  Copyright (c) 2005  Purdue Research Foundation, West Lafayette, IN
 # ======================================================================
-import getopt, sys
+import getopt, sys, os
 import atexit
 import Rappture
@@ -46 +46 @@
             lib = Rappture.library('<?xml version="1.0"?><run><tool>' +
                     '<about>Press Simulate to view results.</about>' +
-                    '<command>' +argv[0]+ ' -d @driver</command></tool></run>')
+                    '<command>python ' +argv[0]+ ' -d @driver</command></tool></run>')
 
             for module in args:
@@ -54 +54 @@
                         s.put(lib)
 
-            f = open("driver.xml","w")
+            toolFileName = "tool.xml"
+            f = open(toolFileName,"w")
             f.write( lib.xml() )
             f.close()
 
             print 'launch the gui...'
+            #
+            # this doesnt work, but needs to. when we 
+            # os.execvp('driver', driverArgs ) with following definition of 
+            # driverArgs (and we change the name of toolFileName), program
+            # does not send the driver program the arguments as expected.
+            #
+            #driverArgs = ('-tool', toolFileName)
+            driverArgs = ()
+            os.execvp('driver', driverArgs )
             sys.exit(0)
 

trunk/python/Rappture/number.py

@@ -7 +7 @@
 # ======================================================================
 import Rappture
+import Rappture.Units
 
 class number:
@@ -31 +32 @@
                 attrName = attr
         s = Rappture.driver.get(self.path+'.'+attrName)
-        return (float(s),other)
+        # return (float(s),other)
+        #
+        # the following code doesnt work if the <units> tag does not exist
+        # becasue it sends an empty string to convert and it fails there
+        toUnit = Rappture.driver.get(self.path+'.units')
+        if (toUnit != None):
+            val = Rappture.Units.convert(s,to=toUnit,units="off")
+        else :
+            # you have to hope the user didn't put units onto the <default>
+            # value (which is unlikely in most cases, btw)
+            val = float(s)
+        return (val,other)