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

Timestamp:

Jan 11, 2006 3:55:15 PM (18 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/rpUnitsGetBasis.cc (modified) (5 diffs)

trunk/src/matlab/rpUnitsGetBasis.cc

@@ -3 +3 @@
  *  INTERFACE: Matlab Rappture Library Source
  *
- *    [unitsHandle] = rpUnitsGetBasis(unitsHandle)
+ *    [unitsHandle,err] = rpUnitsGetBasis(unitsHandle)
  *
  * ======================================================================
@@ -16 +16 @@
 #include "RpMatlabInterface.h"
 
+/**********************************************************************/
+// METHOD: [basisHandle,err] = rpUnitsGetBasis(unitHandle)
+/// Return a handle to the basis of the provided instance of a Rappture Unit.
+/**
+ * Retrieve the basis of the Rappture Units object with the handle`
+ * 'unitHandle'. Return the handle of the basis if it exists. If there`
+ * is no basis, then return a negative integer.
+ * Error code, err=0 on success, anything else is failure.
+ */
+
 void mexFunction(int nlhs, mxArray *plhs[],
                  int nrhs, const mxArray *prhs[])
@@ -24 +34 @@
     int retHandle = 0;
     int unitsHandle = 0;
+    int err = 1;
 
     /* Check for proper number of arguments. */
     if (nrhs != 1)
         mexErrMsgTxt("Two input required.");
-    else if (nlhs > 1)
+    else if (nlhs > 2)
         mexErrMsgTxt("Too many output arguments.");
 
-    unitsHandle = getIntInput(prhs[1]);
+    unitsHandle = getIntInput(prhs[0]);
 
     /* Call the C subroutine. */
@@ -42 +53 @@
             if (myBasis) {
                 retHandle = storeObject_UnitsStr(myBasis->getUnitsName());
+                if (retHandle) {
+                    err = 0;
+                }
             }
         }
@@ -48 +62 @@
     /* Set C-style string output_buf to MATLAB mexFunction output*/
     plhs[0] = mxCreateDoubleScalar(retHandle);
+    plhs[1] = mxCreateDoubleScalar(err);
     return;
 }