Changeset 5654 in orxonox.OLD for trunk/src/util/loading/load_param.h

Timestamp:

Nov 20, 2005, 9:12:50 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: cycle-loading of LoadParam works…

File:

• trunk/src/util/loading/load_param.h (modified) (4 diffs)

trunk/src/util/loading/load_param.h

@@ -46 +46 @@
  */
 #define LoadParamNEW(ROOT, PARAMETER_NAME, OBJECT, CLASS, FUNCTION) \
-         LoadParamBase(ROOT, PARAMETER_NAME, OBJECT, ExecutorObjective<CLASS>(&CLASS::FUNCTION))
+         LoadParamBase(ROOT, PARAMETER_NAME, OBJECT, ExecutorObjective<CLASS>(&CLASS::FUNCTION), false)
+
+#define LoadParam_CYCLE(ROOT, PARAMETER_NAME, OBJECT, CLASS, FUNCTION) \
+         LoadParamBase(ROOT, PARAMETER_NAME, OBJECT, ExecutorObjective<CLASS>(&CLASS::FUNCTION), true)
 
 #define LoadParamXML(ROOT, PARAMETER_NAME, OBJECT, CLASS, FUNCTION) \
-         LoadParamBase(ROOT, PARAMETER_NAME, OBJECT, ExecutorXML<CLASS>(&CLASS::FUNCTION, ROOT, PARAMETER_NAME))
+         LoadParamBase(ROOT, PARAMETER_NAME, OBJECT, ExecutorXML<CLASS>(&CLASS::FUNCTION, ROOT, PARAMETER_NAME), false)
+
+#define LoadParamXML_CYCLE(ROOT, PARAMETER_NAME, OBJECT, CLASS, FUNCTION) \
+         LoadParamBase(ROOT, PARAMETER_NAME, OBJECT, ExecutorXML<CLASS>(&CLASS::FUNCTION, ROOT, PARAMETER_NAME), true)
+
+
+/**
+ * this Starts a Cycle in the Loading Process
+ * be aware, that in the cycle the first parameter of load_param should because
+ * 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
+ */
+#define LOAD_PARAM_START_CYCLE(ROOT, ELEMENT) \
+  const TiXmlElement* ELEMENT; \
+  ELEMENT= ROOT->FirstChildElement(); \
+  while( ELEMENT != NULL) \
+{
+/**
+   * closes a LoadParam Loop
+   * @see LOAD_PARAM_START_CYCLE
+   * @param ELEMENT the Element to step through.
+ */
+#define LOAD_PARAM_END_CYCLE(ELEMENT) \
+  ELEMENT = ELEMENT->NextSiblingElement(); \
+}
+
+
 
 
@@ -59 +91 @@
 {
   public:
-    LoadParamBase(const TiXmlElement* root, const char* paramName, BaseObject* object, const Executor& exeutor);
+    LoadParamBase(const TiXmlElement* root, const char* paramName, BaseObject* object, const Executor& executor, bool inLoadCycle = false);
     ~LoadParamBase();
 
@@ -69 +101 @@
 
   protected:
-    bool                     withLoadString;       //!< If we need the loadString to execute this.
+    bool                     inLoadCycle;
     Executor*                executor;
     BaseObject*              object;
@@ -82 +114 @@
 };
 
-
-//! macro that makes it even more easy to load a Parameter
-/**
- * @param className the name of the class to load
- * @param parameterName the name of the parameter to load as written in the XML-file
- * @param function the function to call
- */
-#define LOAD_PARAM(className, parameterName, paramFunction) \
-        LoadParam<className>(root, #parameterName, this, &className::paramFunction)
-
-/**
- * this Starts a Cycle in the Loading Process
- * be aware, that in the cycle the first parameter of load_param should because
- * 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
- */
-#define LOAD_PARAM_START_CYCLE(ROOT, ELEMENT) \
-  const TiXmlElement* ELEMENT; \
-  ELEMENT= ROOT->FirstChildElement(); \
-  while( ELEMENT != NULL) \
-  {
-/**
- * closes a LoadParam Loop
- * @see LOAD_PARAM_START_CYCLE
- * @param ELEMENT the Element to step through.
- */
-#define LOAD_PARAM_END_CYCLE(ELEMENT) \
-  ELEMENT = ELEMENT->NextSiblingElement(); \
-  }