Changeset 154 for trunk/src/matlab/rpLibElement.cc

Timestamp:

Jan 11, 2006, 3:55:15 PM (19 years ago)

Author:

dkearney

Message:

modified matlab bindings and tests.
includes all popular functions available in RpLibrary? and RpUnits
compile and run, but not all tests work as they should
some of these functions will be removed soon because the id field is
no longer a valid argument. path ids should be incorporated in paths from now on.

File:

• trunk/src/matlab/rpLibElement.cc (modified) (6 diffs)

trunk/src/matlab/rpLibElement.cc

@@ -3 +3 @@
  *  INTERFACE: Matlab Rappture Library Source
  *
- *    nodeHandle = rpLibElement(libHandle,path)
+ *    [nodeHandle,err] = rpLibElement(libHandle,path)
  *
  * ======================================================================
@@ -16 +16 @@
 #include "RpMatlabInterface.h"
 
+/**********************************************************************/
+// METHOD: [retVal,err] = rpLibElement(libHandle,path)
+/// Return a handle to the element at location 'path' in 'libHandle'
+/**
+ * This method searches the Rappture Library Object 'libHandle' for the
+ * node at the location described by the path 'path' and returns
+ * a handle to it.
+ *
+ * If path is an empty string, the root of the node is used. 'libHandle'
+ * is the handle representing the instance of the RpLibrary object.
+ * Error code, err=0 on success, anything else is failure.
+ */
+
+
 void mexFunction(int nlhs, mxArray *plhs[],
                  int nrhs, const mxArray *prhs[])
@@ -21 +35 @@
     int         libIndex = 0;
     int         retLibIndex = 0;
+    int         err = 1;
     RpLibrary*  lib = NULL;
     RpLibrary*  retLib = NULL;
@@ -28 +43 @@
     if (nrhs != 2)
         mexErrMsgTxt("Two input required.");
-    else if (nlhs > 1)
+    else if (nlhs > 2)
         mexErrMsgTxt("Too many output arguments.");
 
@@ -40 +55 @@
             retLib = rpElement(lib,path);
             retLibIndex = storeObject_Lib(retLib);
+            if (retLibIndex) {
+                err = 0;
+            }
         }
     }
@@ -45 +63 @@
     /* Set double scalar node handle to MATLAB mexFunction output*/
     plhs[0] = mxCreateDoubleScalar(retLibIndex);
+    plhs[1] = mxCreateDoubleScalar(err);
 
     return;