Changeset 165 for trunk/src/matlab

Timestamp:

Jan 31, 2006, 2:49:49 PM (19 years ago)

Author:

dkearney

Message:

1) removing matlab and octave tests for put*id functions
2) adding old fortran examples
3) minor changes to matlab and octave to fix rpUnitsGetBasis
4) rpUnitsMakeMetric does not work in matlab
5) changes to fortran bindings to return proper error codes.
6) added debugging to matlab compiling options and changed outdir location in Makefile

Location:

trunk/src/matlab

Files:

• rpLibGetDouble.cc (modified) (2 diffs)
• rpUnitsGetBasis.cc (modified) (1 diff)
• rpUnitsMakeMetric.cc (modified) (1 diff)

trunk/src/matlab/rpLibGetDouble.cc

@@ -3 +3 @@
  *  INTERFACE: Matlab Rappture Library Source
  *
- *    [nodeHandle,err] = rpLibGetDouble(libHandle,path)
+ *    [retVal,err] = rpLibGetDouble(libHandle,path)
  *
  * ======================================================================
@@ -17 +17 @@
 
 /**********************************************************************/
-// METHOD: [retStr,err] = rpLibGetDouble(libHandle,path)
+// METHOD: [retVal,err] = rpLibGetDouble(libHandle,path)
 /// Query the value of a node.
 /**

trunk/src/matlab/rpUnitsGetBasis.cc

@@ -52 +52 @@
             myBasis = myUnit->getBasis();
             if (myBasis) {
+                // there was a basis, store it an return
                 retHandle = storeObject_UnitsStr(myBasis->getUnitsName());
                 if (retHandle) {
                     err = 0;
                 }
+            }
+            else {
+                // there was no basis for this unit
+                // return negative handle and set err = 0
+                retHandle = -1;
+                err = 0;
             }
         }

trunk/src/matlab/rpUnitsMakeMetric.cc

@@ -49 +49 @@
              retVal = RpUnits::makeMetric(basis);
         }
+        else {
+            std::string errMsg = "Error while retrieving basis handle.\n";
+            errMsg += "Possibly invalid handle?\n";
+            mexErrMsgTxt(errMsg.c_str());
+        }
     }