Changeset 5646 in orxonox.OLD

Timestamp:

Nov 19, 2005, 10:01:46 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: new Macro for LoadParam

Location:

trunk/src

Files:

• lib/lang/base_object.cc (modified) (1 diff)
• util/loading/load_param.cc (modified) (2 diffs)
• util/loading/load_param.h (modified) (2 diffs)

trunk/src/lib/lang/base_object.cc

@@ -62 +62 @@
 {
   // name setup
-  LoadParamBase(root, "name", this, ExecutorObjective<BaseObject>(&BaseObject::setName))
+  LoadParamNEW(root, "name", this, BaseObject, setName)
+  //LoadParamBase(root, "name", this, ExecutorObjective<BaseObject>(&BaseObject::setName))
       .describe("the Name of the Object.");
 //  LoadParam<BaseObject>(root, "name", this, &BaseObject::setName)

trunk/src/util/loading/load_param.cc

@@ -110 +110 @@
 {
   this->loadString = grabParameter(root, paramName);
-
+  this->object = object;
   if (loadString != NULL && root != NULL)
   {
     this->executor = executor.clone();
-    this->executor->execute(object, loadString);
   }
   else
@@ -124 +123 @@
 {
   if (likely(this->executor != NULL))
+  {
+    if (this->loadString!= NULL && likely(this->object != NULL))
+    this->executor->execute(this->object, this->loadString);
+
     delete this->executor;
+  }
 
 }

trunk/src/util/loading/load_param.h

@@ -38 +38 @@
 class LoadParamDescription;
 class MultiType;
+
+
+/**
+ * Loads a Parameter from ROOT named PARAMETER_NAME
+ * onto OBJECT of CLASS, trough the FUNCTION
+ * @param ROOT the TiXmlElement to load the Parameter from
+ * @param PARAMETER_NAME the Name of the Parameter to load
+ * @param OBJECT The BaseObject to load the new setting to.
+ * @param CLASS What Class the BaseObejct is of (this is for identifying the Functuon)
+ * @param FUNCTION The function of Class to Load (if you want to call &CLASS::FUNCTION write FUNCTION here).
+ */
+#define LoadParamNEW(ROOT, PARAMETER_NAME, OBJECT, CLASS, FUNCTION) \
+         LoadParamBase(ROOT, PARAMETER_NAME, OBJECT, ExecutorObjective<CLASS>(&CLASS::FUNCTION))
+
 
 /**************************
@@ -57 +71 @@
   protected:
     Executor*                executor;
+    BaseObject*              object;
 
     LoadClassDescription*    classDesc;            //!< The LoadClassDescription of this LoadParameter