Changeset 5651 in orxonox.OLD for trunk/src/util

Timestamp:

Nov 20, 2005, 5:14:27 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: new (LoadParam && ExecutorSpecials)-Functionality that enables the Loading of XML-elements.
The new Executor really works out, and makes the understanding of loadParam way easier (given you won't read Executor

Location:

trunk/src/util/loading

Files:

• load_param.cc (modified) (3 diffs)
• load_param.h (modified) (2 diffs)

trunk/src/util/loading/load_param.cc

@@ -111 +111 @@
   this->loadString = grabParameter(root, paramName);
   this->object = object;
-  if (loadString != NULL && root != NULL)
+  if (root != NULL)
   {
     this->executor = executor.clone();
@@ -119 +119 @@
     this->executor = NULL;
   }
+
 }
+
+
 LoadParamBase::~LoadParamBase()
 {
   if (likely(this->executor != NULL))
   {
-    if (this->loadString!= NULL && likely(this->object != NULL))
-    this->executor->execute(this->object, this->loadString);
+   if (likely(this->object != NULL))
+     this->executor->execute(this->object, this->loadString);
 
     delete this->executor;
@@ -175 +178 @@
   const TiXmlNode* node;
 
-  if (root == NULL)
+  if (root == NULL || parameterName == NULL)
     return NULL;
   assert( parameterName != NULL);

trunk/src/util/loading/load_param.h

@@ -30 +30 @@
 #include "tinyxml.h"
 #include "executor/executor.h"
+#include "executor/executor_specials.h"
 
 #include "helper_functions.h"
@@ -51 +52 @@
 #define LoadParamNEW(ROOT, PARAMETER_NAME, OBJECT, CLASS, FUNCTION) \
          LoadParamBase(ROOT, PARAMETER_NAME, OBJECT, ExecutorObjective<CLASS>(&CLASS::FUNCTION))
+
+#define LoadParamXML(ROOT, PARAMETER_NAME, OBJECT, CLASS, FUNCTION) \
+         LoadParamBase(ROOT, PARAMETER_NAME, OBJECT, ExecutorXML<CLASS>(&CLASS::FUNCTION, ROOT, PARAMETER_NAME))