Changeset 135 for trunk/src/core

Timestamp:

Nov 10, 2005, 7:45:00 PM (19 years ago)

Author:

dkearney

Message:

1) fixed children function in c++'s library module so users can now
search for children by type.
2) adjusted bindings dictionary module for storing lib's to allow caller
to set the key of the value being stored.
3) removed old targets for rappture_interface.o and rappture_fortran.o
from makefile
4) renamed matlab and octave binding functions names to match the module
they came from.
5) adjusted matlab/octave example in examples/app_fermi/matlab
6) added matlab and octave search paths environment variables to
gui/apps/rappture

Location:

trunk/src/core

Files:

• RpBindingsDict.cc (modified) (3 diffs)
• RpLibrary.cc (modified) (5 diffs)
• RpNumber.cc (modified) (1 diff)

trunk/src/core/RpBindingsDict.cc

@@ -25 +25 @@
  * function's caller.
  *
- * Returns the key of the object in the dictionary
+ * Returns the key of the object in the dictionary 
+ * On Error, returns 0 (which also means nothing can be stored at 0)
  */
 
 int
-storeObject_Lib(RpLibrary* objectName) {
-
-    int retVal = -1;
-    int dictKey = ObjDict_Lib.size() + 1;
+storeObject_Lib(RpLibrary* objectName, int key) {
+
+    int retVal = 0;
+    int dictKey = key;
     int newEntry = 0;
 
@@ -39 +40 @@
         // no error checking to make sure it was successful in entering
         // the new entry.
+
+        if (dictKey == 0) {
+            dictKey = ObjDict_Lib.size() + 1;
+        }
         ObjDict_Lib.set(dictKey,objectName, &newEntry); 
-    }
-
-    retVal = dictKey;
+        retVal = dictKey;
+    }
+
     return retVal;
 }
@@ -61 +66 @@
 getObject_Lib(int objKey) {
 
-    RpLibrary* retVal = *(ObjDict_Lib.find(objKey).getValue());
+
+    RpLibrary* retVal = NULL;
+
+    retVal = *(ObjDict_Lib.find(objKey).getValue());
 
     if (retVal == *(ObjDict_Lib.getNullEntry().getValue())) {

trunk/src/core/RpLibrary.cc

@@ -478 +478 @@
 // METHOD: children()
 /// Return the next child of the node located at 'path'
+//
+// The lookup is reset when you send a NULL rpChilNode.
+// 
 /**
  */
@@ -503 +506 @@
         // in the last call to this function.
         // if so, then we dont need to reset the parentNode
-        if ( path.compare(old_path) == 0 ) {
+        //
+        // this check is probably more dependent on rpChildNode
+        // because we want to see if the person want to continue
+        // an old search or start from the beginning of the child list
+        //
+        if ( (path.compare(old_path) == 0) && (rpChildNode != NULL) ) {
             parentNode = NULL;
         }
@@ -526 +534 @@
     if (parentNode) {
         myChildCount = scew_element_count(parentNode);
-        std::cout << "myChildCount = " << myChildCount << std::endl;
     }
 
@@ -537 +544 @@
         if (!type.empty()) {
             childName = scew_element_name(childNode);
+            // we are searching for a specific child name
+            // keep looking till we find a name that matches the type.
+            while (type != childName) {
+                childNode = scew_element_next(parentNode,childNode);
+                childName = scew_element_name(childNode);
+            }
             if (type == childName) {
+                // found a child with a name that matches type
                 // clean up old memory
-                if (retLib) {
-                    delete retLib;
-                }
+                delete retLib;
                 retLib = new RpLibrary( childNode );
+            }
+            else {
+                // no children with names that match 'type' were found
+                delete retLib;
+                retLib = NULL;
             }
         }
         else {
             // clean up old memory
-            if (retLib) {
-                delete retLib;
-            }
+            delete retLib;
             retLib = new RpLibrary( childNode );
         }
@@ -557 +572 @@
         // its probable there are no more child elements left to report
         // clean up old memory
-        if (retLib) {
-            delete retLib;
-        }
+        delete retLib;
         retLib = NULL;
     }

trunk/src/core/RpNumber.cc

@@ -229 +229 @@
 }
 
+/**********************************************************************/
+// METHOD: put()
+/// Store the information of this Rappture Object into the xml
+/**
+ */
+//
+//RpNumber&
+//RpNumber::put() const {
+//
+//    
+//    return *this; 
+//}
+
 
 // -------------------------------------------------------------------- //