Changeset 5645 in orxonox.OLD

Timestamp:

Nov 19, 2005, 9:48:38 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: first Element gets loaded through the new LoadParam procedure.

Location:

trunk/src

Files:

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

trunk/src/lib/lang/base_object.cc

@@ -62 +62 @@
 {
   // name setup
-  LoadParam<BaseObject>(root, "name", this, &BaseObject::setName)
-      .describe("the name of the Object at hand");
+  LoadParamBase(root, "name", this, ExecutorObjective<BaseObject>(&BaseObject::setName))
+      .describe("the Name of the Object.");
+//  LoadParam<BaseObject>(root, "name", this, &BaseObject::setName)
+      //.describe("the name of the Object at hand");
 }
 
@@ -86 +88 @@
   if (this->objectName)
     delete[] this->objectName;
-  if (objectName)
+  if (objectName != NULL)
   {
     this->objectName = new char[strlen(objectName)+1];

trunk/src/util/loading/load_param.cc

@@ -35 +35 @@
 {
   this->setClassID(CL_LOAD_PARAM, "LoadParam");
+  this->executor = NULL;
 
   this->loadString = NULL;
@@ -106 +107 @@
 }
 
+LoadParamBase::LoadParamBase(const TiXmlElement* root, const char* paramName, BaseObject* object, const Executor& executor)
+{
+  this->loadString = grabParameter(root, paramName);
+
+  if (loadString != NULL && root != NULL)
+  {
+    this->executor = executor.clone();
+    this->executor->execute(object, loadString);
+  }
+  else
+  {
+    this->executor = NULL;
+  }
+}
+LoadParamBase::~LoadParamBase()
+{
+  if (likely(this->executor != NULL))
+    delete this->executor;
+
+}
+
+
+
 /**
  * @param descriptionText The text to set as a description for this Parameter

trunk/src/util/loading/load_param.h

@@ -29 +29 @@
 #include "substring.h"
 #include "tinyxml.h"
+#include "executor/executor.h"
 
 #include "helper_functions.h"
@@ -44 +45 @@
 class LoadParamBase : public BaseObject
 {
- public:
-  LoadParamBase* describe(const char* descriptionText);
-  LoadParamBase* defaultValues(unsigned int count, ...);
-
- protected:
-  LoadParamBase(const TiXmlElement* root, BaseObject* object, const char* paramName, int paramCount, bool multi, const void* pointerToParam, ...);
-
- protected:
-  LoadClassDescription*    classDesc;            //!< The LoadClassDescription of this LoadParameter
-  LoadParamDescription*    paramDesc;            //!< The LoadParameterDescription of this LoadParameter
-  const char*              loadString;           //!< The string loaded by this LoadParam
-  const void*              pointerToParam;       //!< A Pointer to a Parameter.
-
-  MultiType*               defaultValue;
+  public:
+    LoadParamBase(const TiXmlElement* root, const char* paramName, BaseObject* object, const Executor& exeutor);
+    ~LoadParamBase();
+
+    LoadParamBase* describe(const char* descriptionText);
+    LoadParamBase* defaultValues(unsigned int count, ...);
+
+  protected:
+    LoadParamBase(const TiXmlElement* root, BaseObject* object, const char* paramName, int paramCount, bool multi, const void* pointerToParam, ...);
+
+  protected:
+    Executor*                executor;
+
+    LoadClassDescription*    classDesc;            //!< The LoadClassDescription of this LoadParameter
+    LoadParamDescription*    paramDesc;            //!< The LoadParameterDescription of this LoadParameter
+    const char*              loadString;           //!< The string loaded by this LoadParam
+    const void*              pointerToParam;       //!< A Pointer to a Parameter.
+
+    MultiType*               defaultValue;
 };
 
@@ -75 +81 @@
  * called element, and that you must say true at the Fith parameter, or it will fail
  * also you will have to close the Cycle again with LOAD_PARAM_END_CYCLE
+ *
  * @param ROOT The root XLM-element to search element under.
  * @param ELEMENT the element to search