Changeset 5592 for trunk

Timestamp:

May 21, 2015 4:28:27 AM (9 years ago)

Author:

ldelgass

Message:

Merge r5557:5561,r5574:5575 from 1.3 branch

Location:

trunk

Files:

• . (modified) (1 prop)
• gui/scripts/balloon.tcl (modified) (7 diffs)
• gui/scripts/histogram.tcl (modified) (12 diffs)
• lang/python/README (modified) (4 diffs)
• lang/python/Rappture/PyRpLibrary.cc (modified) (15 diffs)
• lang/python/Rappture/__init__.py (modified) (2 diffs)
• lang/python/Rappture/library.py (modified) (5 diffs)
• lang/python/Rappture/python_api.rst (copied) (copied from branches/1.3/lang/python/Rappture/python_api.rst)
• lang/python/Rappture/pyxml.py (copied) (copied from branches/1.3/lang/python/Rappture/pyxml.py) (1 diff)
• lang/python/Rappture/test (copied) (copied from branches/1.3/lang/python/Rappture/test)
• lang/python/Rappture/test/pyxml_test.py (copied) (copied from branches/1.3/lang/python/Rappture/test/pyxml_test.py)
• lang/python/Rappture/test/results.txt (copied) (copied from branches/1.3/lang/python/Rappture/test/results.txt)
• lang/python/Rappture/test/test.xml (copied) (copied from branches/1.3/lang/python/Rappture/test/test.xml)
• lang/python/Rappture/unittest_library.py (modified) (4 diffs)
• lang/python/setup.py.in (modified) (1 diff)

trunk/gui/scripts/balloon.tcl

@@ -1 @@
-# -*- mode: tcl; indent-tabs-mode: nil -*- 
+# -*- mode: tcl; indent-tabs-mode: nil -*-
 # ----------------------------------------------------------------------
 #  COMPONENT: Balloon - toplevel popup window, like a cartoon balloon
@@ -47 +47 @@
 
     protected method _createStems {}
+    protected method _place {where placement w h sw sh}
 
     protected variable _stems   ;# windows for cartoon balloon stems
@@ -123 +124 @@
 }
 
+
+# ----------------------------------------------------------------------
+# USAGE: _place <where> <place> <pw> <ph> <screenw> <screenh>
+#
+# Called by activate. Returns the exact location information given
+# the parameters.  If the window will not fit on the screen with the
+# requested placement, will loop through all possible placements to
+# find the best alternative.
+# ----------------------------------------------------------------------
+itcl::body Rappture::Balloon::_place {where place pw ph screenw screenh} {
+    # pw and ph are requested balloon window size
+
+    # set placement preference order
+    switch $place {
+        left {set plist {left above below right}}
+        right {set plist {right above below left}}
+        above {set plist {above below right left}}
+        below {set plist {below above right left}}
+    }
+
+    set ph_orig $ph
+    set pw_orig $pw
+
+    foreach placement $plist {
+        set pw $pw_orig
+        set ph $ph_orig
+        if {[winfo exists $where]} {
+            # location of top-left corner of root window
+            set rx [winfo rootx $where]
+            set ry [winfo rooty $where]
+
+            # size of widget we want to popup over
+            set width  [winfo width $where]
+            set height [winfo height $where]
+
+            # x and y will be location for popup
+            set x [expr {$rx + $width/2}]
+            set y [expr {$ry + $height/2}]
+
+            switch -- $placement {
+                left { set x [expr {$rx + 5}] }
+                right { set x [expr {$rx + $width - 5}] }
+                above { set y [expr {$ry + 5}] }
+                below { set y [expr {$ry + $height - 5}] }
+            }
+        } elseif {[regexp {^@([0-9]+),([0-9]+)$} $where match x y]} {
+            # got x and y
+        } else {
+            error "bad location \"$where\": should be widget or @x,y"
+        }
+
+        # compute stem image size
+        set s $_stems($placement)
+        set sw [image width $_fills($placement)]
+        set sh [image height $_fills($placement)]
+        set offscreen 0
+
+        switch -- $placement {
+            left {
+                set sx [expr {$x-$sw+3}]
+                set sy [expr {$y-$sh/2}]
+                set px [expr {$sx-$pw+3}]
+                set py [expr {$y-$ph/2}]
+
+                # make sure that the panel doesn't go off-screen
+                if {$py < 0} {
+                    incr offscreen [expr -$py]
+                    set py 0
+                }
+                if {$py+$ph > $screenh} {
+                    incr offscreen [expr {$py + $ph - $screenh}]
+                    set py [expr {$screenh - $ph}]
+                }
+                if {$px < 0} {
+                    incr offscreen [expr -$px]
+                    set pw [expr {$pw + $px}]
+                    set px 0
+                }
+            }
+            right {
+                set sx $x
+                set sy [expr {$y-$sh/2}]
+                set px [expr {$x+$sw-3}]
+                set py [expr {$y-$ph/2}]
+
+                # make sure that the panel doesn't go off-screen
+                if {$py < 0} {
+                    incr offscreen [expr -$py]
+                    set py 0
+                }
+                if {$py+$ph > $screenh} {
+                    incr offscreen [expr {$py + $ph - $screenh}]
+                    set py [expr {$screenh-$ph}]
+                }
+                if {$px+$pw > $screenw} {
+                    incr offscreen [expr {$px + $pw - $screenw}]
+                    set pw [expr {$screenw-$px}]
+                }
+            }
+            above {
+                set sx [expr {$x-$sw/2}]
+                set sy [expr {$y-$sh+3}]
+                set px [expr {$x-$pw/2}]
+                set py [expr {$sy-$ph+3}]
+
+                # make sure that the panel doesn't go off-screen
+                if {$px < 0} {
+                    incr offscreen [expr -$px]
+                    set px 0
+                }
+                if {$px+$pw > $screenw} {
+                    incr offscreen [expr {$px + $pw - $screenw}]
+                    set px [expr {$screenw-$pw}]
+                }
+                if {$py < 0} {
+                    incr offscreen [expr -$py]
+                    set ph [expr {$ph+$py}]
+                    set py 0
+                }
+            }
+            below {
+                set sx [expr {$x-$sw/2}]
+                set sy $y
+                set px [expr {$x-$pw/2}]
+                set py [expr {$y+$sh-3}]
+
+                # make sure that the panel doesn't go off-screen
+                if {$px < 0} {
+                    incr offscreen [expr -$px]
+                    set px 0
+                }
+                if {$px+$pw > $screenw} {
+                    incr offscreen [expr {$px + $pw - $screenw}]
+                    set px [expr {$screenw-$pw}]
+                }
+                if {$py+$ph > $screenh} {
+                    incr offscreen [expr {$py + $py - $screenh}]
+                    set ph [expr {$screenh-$py}]
+                }
+            }
+        }
+        set res($placement) [list $placement $offscreen $pw $ph $px $py $sx $sy]
+        if {$offscreen == 0} {
+            return "$placement $pw $ph $px $py $sx $sy"
+        }
+    }
+
+    # In the unlikely event that we arrived here, it is because no
+    # placement allowed the entire balloon window to be displayed.
+    # Loop through the results and return the best-case placement.
+    set _min 10000
+    foreach pl $plist {
+        set offscreen [lindex $res($pl) 1]
+        if {$offscreen < $_min} {
+            set _min $offscreen
+            set _min_pl $pl
+        }
+    }
+    return "$_min_pl [lrange $res($_min_pl) 2 end]"
+}
+
 # ----------------------------------------------------------------------
 # USAGE: activate <where> <placement>
@@ -129 +291 @@
 # <where> location, which should be a widget name or @X,Y.  The
 # <placement> indicates whether the panel should be left, right,
-# above, or below the <where> coordinate.
+# above, or below the <where> coordinate. Plecement is considered
+# a suggestion and may be changed to fit the popup in the screen.
 # ----------------------------------------------------------------------
 itcl::body Rappture::Balloon::activate {where placement} {
@@ -135 +298 @@
         error "bad placement \"$placement\": should be [join [lsort [array names _stems]] {, }]"
     }
-    set s $_stems($placement)
-    set sw [image width $_fills($placement)]
-    set sh [image height $_fills($placement)]
+
+    # if the panel is already up, take it down
+    deactivate
+
     set p $itk_component(hull)
     set screenw [winfo screenwidth $p]
     set screenh [winfo screenheight $p]
-
-    if {[winfo exists $where]} {
-        set x [expr {[winfo rootx $where]+[winfo width $where]/2}]
-        set y [expr {[winfo rooty $where]+[winfo height $where]/2}]
-        switch -- $placement {
-            left { set x [expr {[winfo rootx $where]+5}] }
-            right { set x [expr {[winfo rootx $where]+[winfo width $where]-5}] }
-            above { set y [expr {[winfo rooty $where]+5}] }
-            below { set y [expr {[winfo rooty $where]+[winfo height $where]-5}] }
-        }
-    } elseif {[regexp {^@([0-9]+),([0-9]+)$} $where match x y]} {
-        # got x and y
-    } else {
-        error "bad location \"$where\": should be widget or @x,y"
-    }
-
-    # if the panel is already up, take it down
-    deactivate
 
     set pw [winfo reqwidth $p]
@@ -165 +311 @@
     if {$ph > $screenh} { set ph [expr {$screenh-10}] }
 
-    switch -- $placement {
-        left {
-            set sx [expr {$x-$sw+3}]
-            set sy [expr {$y-$sh/2}]
-            set px [expr {$sx-$pw+3}]
-            set py [expr {$y-$ph/2}]
-
-            # make sure that the panel doesn't go off-screen
-            if {$py < 0} { set py 0 }
-            if {$py+$ph > $screenh} { set py [expr {$screenh-$ph}] }
-            if {$px < 0} { set pw [expr {$pw+$px}]; set px 0 }
-        }
-        right {
-            set sx $x
-            set sy [expr {$y-$sh/2}]
-            set px [expr {$x+$sw-3}]
-            set py [expr {$y-$ph/2}]
-
-            # make sure that the panel doesn't go off-screen
-            if {$py < 0} { set py 0 }
-            if {$py+$ph > $screenh} { set py [expr {$screenh-$ph}] }
-            if {$px+$pw > $screenw} { set pw [expr {$screenw-$px}] }
-        }
-        above {
-            set sx [expr {$x-$sw/2}]
-            set sy [expr {$y-$sh+3}]
-            set px [expr {$x-$pw/2}]
-            set py [expr {$sy-$ph+3}]
-
-            # make sure that the panel doesn't go off-screen
-            if {$px < 0} { set px 0 }
-            if {$px+$pw > $screenw} { set px [expr {$screenw-$pw}] }
-            if {$py < 0} { set ph [expr {$ph+$py}]; set py 0 }
-        }
-        below {
-            set sx [expr {$x-$sw/2}]
-            set sy $y
-            set px [expr {$x-$pw/2}]
-            set py [expr {$y+$sh-3}]
-
-            # make sure that the panel doesn't go off-screen
-            if {$px < 0} { set px 0 }
-            if {$px+$pw > $screenw} { set px [expr {$screenw-$pw}] }
-            if {$py+$ph > $screenh} { set ph [expr {$screenh-$py}] }
-        }
-    }
-    if {[info exists _masks($placement)]} {
-        shape set $s -bound photo $_masks($placement)
-    }
+    foreach {place pw ph px py sx sy} [_place $where $placement $pw $ph $screenw $screenh] break
+
+    set s $_stems($place)
+    if {[info exists _masks($place)]} {
+        shape set $s -bound photo $_masks($place)
+    }
+
     if { $pw < 1 || $ph < 1 }  {
         # I really don't know why this is happenning.  I believe this occurs
@@ -308 +412 @@
             #
             #     --------  ---       LEFT STEM
-            #    |..##    |  ^  
+            #    |..##    |  ^
             #    |  ..##  |  |        . = light color
             #    |    ..##|  | s      @ = dark color

trunk/gui/scripts/histogram.tcl

@@ -1 @@
-# -*- mode: tcl; indent-tabs-mode: nil -*- 
- 
+# -*- mode: tcl; indent-tabs-mode: nil -*-
+
 # ----------------------------------------------------------------------
 #  COMPONENT: histogram - extracts data from an XML description of a field
@@ -37 +37 @@
     protected method Build {}
     private method Clear { {comp ""} }
-    private method ParseData { comp } 
+    private method ParseData { comp }
 
     private variable _xmlobj ""  ;# ref to lib obj with histogram data
     private variable _hist ""    ;# lib obj representing this histogram
-    private variable _widths     ;# array of vectors of bin widths 
-    private variable _yvalues    ;# array of vectors of bin heights along 
+    private variable _widths     ;# array of vectors of bin widths
+    private variable _yvalues    ;# array of vectors of bin heights along
                                  ;# y-axis.
-    private variable _xvalues    ;# array of vectors of bin locations along 
+    private variable _xvalues    ;# array of vectors of bin locations along
                                  ;# x-axis.
     private variable _xlabels    ;# array of labels
@@ -74 +74 @@
     # don't destroy the _xmlobj! we don't own it!
     itcl::delete object $_hist
-    Clear 
-}
-
-# ----------------------------------------------------------------------
-# USAGE: mesh 
+    Clear
+}
+
+# ----------------------------------------------------------------------
+# USAGE: mesh
 #
 # Returns the vector for the histogram bin locations along the
@@ -91 +91 @@
 
 # ----------------------------------------------------------------------
-# USAGE: heights 
+# USAGE: heights
 #
 # Returns the vector for the histogram bin heights along the y-axis.
@@ -103 +103 @@
 
 # ----------------------------------------------------------------------
-# USAGE: widths 
+# USAGE: widths
 #
 # Returns the vector for the specified histogram component <name>.
@@ -117 +117 @@
 
 # ----------------------------------------------------------------------
-# USAGE: xlabels 
+# USAGE: xlabels
 #
 # Returns the vector for the specified histogram component <name>.
@@ -188 +188 @@
     }
 
-    blt::vector create tmp 
+    blt::vector create tmp
     blt::vector create zero
     foreach comp [array names _comphist] {
@@ -257 +257 @@
             xdesc   xaxis.description
             xunits  xaxis.units
-            xorient xaxis.orientation 
+            xorient xaxis.orientation
             xscale  xaxis.scale
             xmin    xaxis.min
@@ -342 +342 @@
 #       Parse the components data representations.  The following
 #       elements may be used <xy>, <xhw>, <namevalue>, <xvector>,
-#       <yvector>.  Only one element is used for data.  
+#       <yvector>.  Only one element is used for data.
 #
 itcl::body Rappture::Histogram::ParseData { comp } {
@@ -354 +354 @@
     if { $xydata != "" } {
         set count 0
-        foreach line [split $xydata \n] {
-            if {[llength $line] == 2} {
-                foreach {name value} $line break
-                $_yvalues($comp) append $value
-                $_xvalues($comp) append $count
-                lappend _xlabels($comp) $name
-                incr count
-            }
-        }           
+        foreach {name value} [regsub -all "\[ \t\n]+" $xydata { }] {
+            $_yvalues($comp) append $value
+            $_xvalues($comp) append $count
+            lappend _xlabels($comp) $name
+            incr count
+        }
         set _comp2hist($comp) [list $_xvalues($comp) $_yvalues($comp)]
         return
@@ -369 +366 @@
     if { $xhwdata != "" } {
         set count 0
-        foreach line [split $xhwdata \n] {
-            set n [scan $line {%s %s %s} name h w]
-            if {$n >= 2} {
-                lappend _xlabels($comp) $name
-                $_xvalues($comp) append $count
-                $_yvalues($comp) append $h
-                if { $n == 3 } {
-                    $_widths($comp) append $w
-                }
-                incr count
-            }
-        }           
+        foreach {name h w} [regsub -all "\[ \t\n]+" $xhwdata { }] {
+            lappend _xlabels($comp) $name
+            $_xvalues($comp) append $count
+            $_yvalues($comp) append $h
+            $_widths($comp) append $w
+            incr count
+        }
         set _comp2hist($comp) [list $_xvalues($comp) $_yvalues($comp)]
         return
-
-        # FIXME:  There must be a width specified for each bin location.
-        #         If this isn't true, we default to uniform widths
-        #         (zero-length _widths vector == uniform).
-        if { [$_xvalues($comp) length] != [$_widths($comp) length] } {
-            $_widths($comp) set {}
-        }
-        set _comp2hist($comp) [list $_xvalues($comp) $_yvalues($comp)]
-        return
-    }
-    set xv [$_hist get $comp.xvector]
-    set yv [$_hist get $comp.yvector]
-    if { $xv != "" && $yv != "" } {
-        $_yvalues($comp) set $yv
-        $_xvalues($comp) seq 0 [$yv length]
-        set _xlabels($comp)
-    }
+    }
+
+    # If we reached here, must be <yvector>
+    $_yvalues($comp) set [$_hist get ${comp}.yvector]
+    $_xvalues($comp) length [$_yvalues($comp) length]
+    $_xvalues($comp) seq 1 [$_yvalues($comp) length]
+    set _xlabels($comp) [$_hist get ${comp}.xvector]
     set _comp2hist($comp) [list $_xvalues($comp) $_yvalues($comp)]
 }
@@ -422 +404 @@
     }
     if { [info exists _widths($comp)] } {
-        blt::vector destroy $_widths($comp) 
+        blt::vector destroy $_widths($comp)
     }
     if { [info exists _yvalues($comp)] } {
-        blt::vector destroy $_yvalues($comp) 
+        blt::vector destroy $_yvalues($comp)
     }
     if { [info exists _xvalues($comp)] } {
-        blt::vector destroy $_xvalues($comp) 
+        blt::vector destroy $_xvalues($comp)
     }
     array unset _xvalues $comp

trunk/lang/python/README

@@ -38 +38 @@
  Python scripts.
 
- Rappture applications load their data from a library object.  You can
- load a library as follows:
+ Rappture applications load their data from a an XML driver file.
+ In the tool.xml file, you should have something like
+
+ <command> @tool/path/to/executable @driver </command>
+
+The "@driver" pattern is replaced by the driver xml file generated by
+Rappture.  This driver file will contain the values to use for the
+parameters in your application.  See
+https://nanohub.org/infrastructure/rappture/wiki/rappture_xml_elements
+for more information.
+
+The first thing your application should do is load the driver file.
 
    import Rappture
-   lib = Rappture.library('example.xml')
-   print lib.xml()
- 
+   rx = Rappture.PyXml('example.xml')
+
+You can see the xml contents by doing
+   print rx.xml()
+
  The "import" statement loads the Rappture toolkit into your Python
  application.  The next line creates a library object representing
@@ -54 +66 @@
 
    import Rappture
-   lib = Rappture.library('example.xml')
+   lib = Rappture.PyXml('example.xml')
    tval = lib.get('group(ambient).number(temp).current')
+or alternatively
+   tval = lib['group(ambient).number(temp).current'].value
 
  The get() method follows a path through the XML.  In this example,
@@ -68 +82 @@
 
    tval += 10
-   lib.put('group(ambient).number(temp).current',str(tval))
+   lib.put('group(ambient).number(temp).current', tval)
+or
+   lib[group(ambient).number(temp).current'] = tval
 
  This changes the text within the <current>...</current> tag,
- replacing it with the new value.  Note that the value must be a
- string, so we use str(tval), rather than tval itself, when inserting
- a value.
+ replacing it with the new value, converted to a string if necessary.
 
  You can also append to an existing value.  For example,
@@ -79 +93 @@
    lib.put('group(ambient).number(temp).current', 'more text', append=1)
 
- This adds the string 'more text' after the value (tval) within the 
- <current>...</current> tag.
+ This adds the string 'more text' after the value (tval) within the
+ <current>...</current> tag.  Use of append in a loop is not
+ recommended because it can be very slow.  It is faster to collect
+ data in python and put it all at once.
 
- Suppose we wanted to add another number to the "ambient" group.
- We could do that by requesting "number#".  The # sign indicates
- that you'd like to create a new number element (number1, number2,
- etc.).  For example, we could add a number for a damping factor:
-
-   lib.put('group(ambient).number#(damping).current','0.25')
-
- This creates a new element <number id="damping"> within
- <group id="ambient">, positioned just after the existing
- <number id="temp">.

trunk/lang/python/Rappture/PyRpLibrary.cc

@@ -48 +48 @@
 
 
-static int 
+static int
 getArgCount(PyObject *args, PyObject *keywds, int *argc)
 {
@@ -129 +129 @@
 
 static int
-PyObjectToBoolean(PyObject *objPtr, const char *defValue, const char *argName, 
+PyObjectToBoolean(PyObject *objPtr, const char *defValue, const char *argName,
                   int *resultPtr)
 {
@@ -147 +147 @@
         value = PyObject_IsTrue(objPtr);
         if (value < 0) {
-             PyErr_Format(PyExc_ValueError, 
+             PyErr_Format(PyExc_ValueError,
                 "PyObjectToBoolean: bad boolean object");
             return RP_ERROR;
@@ -168 +168 @@
     } else if (PyString_Check(objPtr)) {
         const char *string;
-        
+
         string = PyString_AsString(objPtr);
         if (string == NULL) {
@@ -370 +370 @@
 
 PyDoc_STRVAR(ElementProcDoc,
-"element ([path=\'\'][, as=\'object\']) -> returns string or Rappture Library Object\n\
+"element ([path=\'\'][, type=\'object\']) -> returns string or Rappture Library Object\n\
 \n\
 Clients use this to query a particular element within the \n\
@@ -381 +381 @@
 By default, this method returns an object representing the \n\
 DOM node referenced by the path.  This is changed by setting \n\
-the \"as\" argument to \"id\" (for name of the tail element), \n\
+the \"type\" argument to \"id\" (for name of the tail element), \n\
 to \"type\" (for the type of the tail element), to \"component\" \n\
 (for the component name \"type(id)\"), or to \"object\" \n\
@@ -391 +391 @@
 {
     char* path = (char *)"";
-    char* as = (char *)"object";
+    char* type = (char *)"object";
     RpLibrary* retlib = NULL;
     PyObject* retVal = NULL;
@@ -398 +398 @@
     static char *kwlist[] = {
         (char *)"path",
-        (char *)"as",
+        (char *)"type",
         NULL
     };
@@ -422 +422 @@
 
     if (!PyArg_ParseTupleAndKeywords(args, keywds, "|ss",
-                kwlist, &path, &as)) {
+                kwlist, &path, &type)) {
         /* incorrect input values */
         // tested with ElementTests.testArguments_ArgsWrongType2()
-        PyErr_Format(PyExc_TypeError,"element ([path=\'\'][, as=\'object\'])");
+        PyErr_Format(PyExc_TypeError,"element ([path=\'\'][, type=\'object\'])");
         return retVal;
     }
@@ -432 +432 @@
 
     if (retlib != NULL) {
-        if ((as == NULL) || ((*as == 'o') && (strcmp("object",as) == 0)) ) {
+        if ((type == NULL) || ((*type == 'o') && (strcmp("object",type) == 0)) ) {
             // tested with ElementTests.testArguments_PathArg()
             retVal = RpLibraryObject_FromLibrary(retlib);
-        } else if ((*as == 'c') && (strcmp("component",as) == 0)) {
+        } else if ((*type == 'c') && (strcmp("component",type) == 0)) {
             // tested with ElementTests.testArguments_TwoArgs()
             retVal = PyString_FromString(retlib->nodeComp().c_str());
-        } else if ((*as == 'i') && (strcmp("id",as) == 0)) {
-            // tested with ElementTests.testArguments_AsId()
+        } else if ((*type == 'i') && (strcmp("id",type) == 0)) {
+            // tested with ElementTests.testArguments_typeId()
             retVal = PyString_FromString(retlib->nodeId().c_str());
-        } else if ((*as == 't') && (strcmp("type",as) == 0)) {
-            // tested with ElementTests.testArguments_AsKeywordArgs()
+        } else if ((*type == 't') && (strcmp("type",type) == 0)) {
+            // tested with ElementTests.testArguments_typeKeywordArgs()
             retVal = PyString_FromString(retlib->nodeType().c_str());
-        } else if ((*as == 'p') && (strcmp("path",as) == 0)) {
+        } else if ((*type == 'p') && (strcmp("path",type) == 0)) {
             // tested with ElementTests.testArguments_TwoKeywordArgs()
             retVal = PyString_FromString(retlib->nodePath().c_str());
         } else {
-            // tested with ElementTests.testArguments_UnrecognizedAs()
+            // tested with ElementTests.testArguments_Unrecognizedtype()
             PyErr_Format(PyExc_ValueError,
-                "element() \'as\' arg must be \'object\' or \'component\' or \'id\' or \'type\' or \'path\'");
+                "element() \'type\' arg must be \'object\' or \'component\' or \'id\' or \'type\' or \'path\'");
         }
     }
@@ -649 +649 @@
         NULL
     };
+
     appendFlag = compressFlag = FALSE;
     strObjPtr = appendObjPtr = valueObjPtr = compressObjPtr = NULL;
@@ -670 +671 @@
         return NULL;
     }
-    if (!PyArg_ParseTupleAndKeywords(args, keywds, "sO|sOsO", kwlist, &path, 
+    if (!PyArg_ParseTupleAndKeywords(args, keywds, "sO|sOsO", kwlist, &path,
         &valueObjPtr, &id, &appendObjPtr, &type, &compressObjPtr)) {
         return NULL;
@@ -690 +691 @@
     strObjPtr = PyObject_Str(valueObjPtr);
     if (RpLibraryObject_IsValid(valueObjPtr)) {
-        self->lib->put( std::string(path), 
+        self->lib->put( std::string(path),
                 RpLibraryObject_AsLibrary(valueObjPtr), "", appendFlag);
     } else if (strObjPtr != NULL) {
@@ -704 +705 @@
                                 std::string(string), "", appendFlag);
             } else {
-                self->lib->putData( std::string(path), string, length, 
+                self->lib->putData( std::string(path), string, length,
                         appendFlag);
             }
@@ -755 +756 @@
 
     static char *kwlist[] = {
-        (char *)"status", 
+        (char *)"status",
         NULL
     };

trunk/lang/python/Rappture/__init__.py

@@ -1 +1 @@
 # Rappture package
 from library import library
+from pyxml import PyXml
 from interface import interface
 from number import number
@@ -9 +10 @@
 import Utils
 import encoding
+
+# encoding/decoding flags
+RPENC_Z   = 1
+RPENC_B64 = 2
+RPENC_ZB64 = 3
+RPENC_RAW = 8

trunk/lang/python/Rappture/library.py

@@ -43 +43 @@
 
     # ------------------------------------------------------------------
-    def element(self, path="", as="object"):
+    def element(self, path="", type="object"):
         """
         Clients use this to query a particular element within the
@@ -54 +54 @@
         By default, this method returns an object representing the
         DOM node referenced by the path.  This is changed by setting
-        the "as" argument to "id" (for name of the tail element),
+        the "type" 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"
@@ -64 +64 @@
             return None
 
-        if as == 'object':
+        if type == 'object':
             return library(node)
-        elif as == 'component':
+        elif type == 'component':
             return self._node2comp(node)
-        elif as == 'id':
+        elif type == 'id':
             return self._node2name(node)
-        elif as == 'type':
+        elif type == 'type':
             return node.tagName
 
-        raise ValueError, "bad as value '%s': should be component, id, object, type" % as
-
-    # ------------------------------------------------------------------
-    def children(self, path="", as="object", type=None):
+        raise ValueError, "bad type value '%s': should be component, id, object, type" % type
+
+    # ------------------------------------------------------------------
+    def children(self, path="", type="object", rtype=None):
         """
         Clients use this to query the children of a particular element
         within the entire data structure.  This is just like the
         element() method, but it returns the children of the element
-        instead of the element itself.  If the optional type argument
+        instead of the element itself.  If the optional rtype argument
         is specified, then the return list is restricted to children
         of the specified type.
 
         By default, this method returns a list of objects representing
-        the children.  This is changed by setting the "as" argument
+        the children.  This is changed by setting the "type" 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 node.childNodes if not n.nodeName.startswith('#')]
 
-        if type:
-            nlist = [n for n in nlist if n.nodeName == type]
-
-        if as == 'object':
+        if rtype:
+            nlist = [n for n in nlist if n.nodeName == rtype]
+
+        if type == 'object':
             return [library(n) for n in nlist]
-        elif as == 'component':
+        elif type == 'component':
             return [self._node2comp(n) for n in nlist]
-        elif as == 'id':
+        elif type == 'id':
             return [self._node2name(n) for n in nlist]
-        elif as == 'type':
+        elif type == 'type':
             return [n.tagName for n in nlist]
 
-        raise ValueError, "bad as value '%s': should be component, id, object, type" % as
+        raise ValueError, "bad type value '%s': should be component, id, object, type" % type
 
     # ------------------------------------------------------------------
@@ -276 +276 @@
 
         If you include "#" instead of a specific number, a node
-        will be created automatically with a new number.  For example, 
+        will be created automatically with a new number.  For example,
         the path "foo.bar#" called the first time will create "foo.bar",
         the second time "foo.bar1", the third time "foo.bar2" and

trunk/lang/python/Rappture/pyxml.py

@@ -54 +54 @@
             val = ' '.join(map(str, val.ravel('F').tolist()))
         elif type(val) == list or type(val) == tuple:
-            val = ' '.join(map(str, (itertools.chain(*zip(*val)))))
+            val = ' '.join(map(repr, (itertools.chain(*zip(*val)))))
+            # we need the strings double quoted for tcl
+            val = val.replace("'", '"')
         self.lib.put(path, val, **kwargs)
 

trunk/lang/python/Rappture/unittest_library.py

@@ -151 +151 @@
 
     def testToPathId(self):
-        e = self.lib.element("input.string",as="object")
+        e = self.lib.element("input.string", type="object")
         self.lib.copy("estring(qqq)","",e)
         self.assertEqual(self.lib.xml(),'''<?xml version="1.0"?>
@@ -183 +183 @@
 
     def testToPathNoIdFromPathId(self):
-        e = self.lib.element("input.string",as="object")
+        e = self.lib.element("input.string",type="object")
         self.lib.copy("estring","",e)
         self.assertEqual(self.lib.xml(),'''<?xml version="1.0"?>
@@ -241 +241 @@
 
     def testArguments_TwoKeywordArgs(self):
-        ele = self.lib.element(path="input.string",as="path")
+        ele = self.lib.element(path="input.string",type="path")
         self.assertEqual(ele,"input.string(test)")
 
     def testArguments_AsKeywordArgs(self):
-        ele = self.lib.element("input.string",as="type")
+        ele = self.lib.element("input.string",type="type")
         self.assertEqual(ele,"string")
 
     def testArguments_AsId(self):
-        ele = self.lib.element(path="input.string",as="id")
+        ele = self.lib.element(path="input.string",type="id")
         self.assertEqual(ele,"test")
 
@@ -477 +477 @@
 
     def testPutObject(self):
-        e = self.lib.element("input.string",as="object")
+        e = self.lib.element("input.string",type="object")
         self.lib.put("output.estring(qqq)",e)
         self.assertEqual(self.lib.get("output.estring(qqq).current"),'<sdfsfs>sdfs')

trunk/lang/python/setup.py.in

@@ -41 +41 @@
                      'Rappture.signalHandler',
                      'Rappture.tools',
-                     'Rappture.result'],
+                     'Rappture.result',
+                     'Rappture.pyxml'],
         ext_modules=[ encode_module,
                       library_module,