Changeset 11 for trunk/python/Rappture/library.py

Timestamp:

May 30, 2005 9:33:49 PM (19 years ago)

Author:

mmc

Message:

Major reorganization of the entire package. The config.xml file
is now irrelevant. All the action is in the tool.xml file. The
main program now organizes all input into 1) side-by-side pages,
2) input/result (wizard-style) pages, or 3) a series of wizard-
style pages. The <input> can have <phase> parts representing
the various pages.

Added a new ContourResult? widget based on Swaroop's vtk plotting
code.

Also, added easymesh and showmesh to the "tools" directory.
We need these for Eric Polizzi's code.

File:

• trunk/python/Rappture/library.py (modified) (5 diffs)

trunk/python/Rappture/library.py

@@ -40 +40 @@
 
     # ------------------------------------------------------------------
-    def element(self, path="", flavor="object"):
+    def element(self, path="", as="object"):
         """
         Clients use this to query a particular element within the
@@ -51 +51 @@
         By default, this method returns an object representing the
         DOM node referenced by the path.  This is changed by setting
-        the "flavor" argument to "id" (for name of the tail element),
+        the "as" argument to "id" (for name of the tail element),
         to "type" (for the type of the tail element), to "component"
         (for the component name "type(id)"), or to "object"
@@ -61 +61 @@
             return None
 
-        if flavor == 'object':
+        if as == 'object':
             return library(node)
-        elif flavor == 'component':
+        elif as == 'component':
             return self._node2comp(node)
-        elif flavor == 'id':
+        elif as == 'id':
             return self._node2name(node)
-        elif flavor == 'type':
+        elif as == 'type':
             return node.tagName
 
-        raise ValueError, "bad flavor '%s': should be object, id, type" % flavor
-
-    # ------------------------------------------------------------------
-    def children(self, path="", flavor="object", type=None):
+        raise ValueError, "bad as value '%s': should be component, id, object, type" % as
+
+    # ------------------------------------------------------------------
+    def children(self, path="", as="object", type=None):
         """
         Clients use this to query the children of a particular element
@@ -83 +83 @@
 
         By default, this method returns a list of objects representing
-        the children.  This is changed by setting the "flavor" argument
+        the children.  This is changed by setting the "as" argument
         to "id" (for tail names of all children), to "type" (for the
         types of all children), to "component" (for the path component
@@ -99 +99 @@
             nlist = [n for n in nlist if n.nodeName == type]
 
-        if flavor == 'object':
+        if as == 'object':
             return [library(n) for n in nlist]
-        elif flavor == 'component':
+        elif as == 'component':
             return [self._node2comp(n) for n in nlist]
-        elif flavor == 'id':
+        elif as == 'id':
             return [self._node2name(n) for n in nlist]
-        elif flavor == 'type':
+        elif as == 'type':
             return [n.tagName for n in nlist]
+
+        raise ValueError, "bad as value '%s': should be component, id, object, type" % as
 
     # ------------------------------------------------------------------