Changeset 55 for trunk/python/Rappture

Timestamp:

Sep 9, 2005 10:03:21 AM (18 years ago)

Author:

dkearney

Message:

python/Rappture/number.py

• added ability for number to choose between default and current tags
• changed structure of init so the basePath and the id are separate arguments to keep compatibility with how the driver program expects a number xml structure

python/Rappture/interface.py

• included a more complete xml structure including tool and command i structures, for writing the xml to the file when the -g option is used
• adjusted the finish() function to utilize the new Rappture.result() function

examples/app-fermi/fermi_io.py

• adjusted the Rappture.number() fxn call to split the path and id.
• commented out the result = [] because we now write the result to xml

examples/app-fermi/fermi.py

• added output section with curve xml details for writing to xml
• directly write the results to xml instead of to a result[] array

gui/apps/rerun

• added script to re-visualize output from previously created run.xml file

Location:

trunk/python/Rappture

Files:

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

trunk/python/Rappture/interface.py

@@ -44 +44 @@
             # and interrogating them for symbols.
             #
-            lib = Rappture.library('<?xml version="1.0"?><run></run>')
+            lib = Rappture.library('<?xml version="1.0"?><run><tool>' +
+                    '<about>Press Simulate to view results.</about>' +
+                    '<command>' +argv[0]+ ' -d @driver</command></tool></run>')
 
             for module in args:
@@ -76 +78 @@
     representing the entire run.
     """
-    f = open("run.xml","w")
-    f.write( Rappture.driver.xml() )
-    f.close()
+#    f = open("run.xml","w")
+#    f.write( Rappture.driver.xml() )
+#    f.close()
+
+    Rappture.result(Rappture.driver)

trunk/python/Rappture/number.py

@@ -9 +9 @@
 
 class number:
-    def __init__(self,path,**kwargs):
+    def __init__(self,path,id,**kwargs):
         """
         Blah, blah...
         """
 
-        self.path = path
+        self.basePath = path
+        self.path = path + ".number(" + id + ")"
+        self.id = id
         self.attribs = kwargs
 
@@ -23 +25 @@
 
     def __coerce__(self,other):
-        s = Rappture.driver.get(self.path+'.current')
+        attrList = Rappture.driver.children(self.path, "id")
+        attrName = 'default'
+        for attr in attrList:
+            if attr == 'current':
+                attrName = attr
+        s = Rappture.driver.get(self.path+'.'+attrName)
         return (float(s),other)