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

Timestamp:

Jan 31, 2006, 9:15:36 AM (19 years ago)

Author:

dkearney

Message:

changed matlab api to call c++ functions instead of rappture's c api
removed following functions because they are outdated and should not be included at matlab/octave's release
src/octave/rpLibPutDoubleId.cc
src/octave/rpLibPutStringId.cc
src/matlab/rpLibPutDoubleId.cc
src/matlab/rpLibPutStringId.cc
cleaned up makefile to reflect the removal of above functions.
matlab bindings need to be retested. they receive a runtime error about undefined symbols

File:

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

trunk/src/matlab/rpLibElement.cc

@@ -29 +29 @@
  */
 
-
 void mexFunction(int nlhs, mxArray *plhs[],
                  int nrhs, const mxArray *prhs[])
@@ -38 +37 @@
     RpLibrary*  lib = NULL;
     RpLibrary*  retLib = NULL;
-    char*       path = NULL;
+    std::string path = "";
 
     /* Check for proper number of arguments. */
-    if (nrhs != 2)
+    if (nrhs != 2) {
         mexErrMsgTxt("Two input required.");
-    else if (nlhs > 2)
-        mexErrMsgTxt("Too many output arguments.");
+    }
 
     libIndex = getIntInput(prhs[0]);
     path = getStringInput(prhs[1]);
 
-    /* Call the C subroutine. */
-    if ( (libIndex > 0) && (path) ) {
+    /* Call the C++ subroutine. */
+    if ( (libIndex > 0) && (!path.empty()) ) {
         lib = getObject_Lib(libIndex);
         if (lib) {
-            retLib = rpElement(lib,path);
+            retLib = lib->element(path);
             retLibIndex = storeObject_Lib(retLib);
             if (retLibIndex) {