Changeset 7198 in orxonox.OLD for trunk/src/lib/util

Timestamp:

Mar 8, 2006, 2:30:19 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: new Default Values… they now too are in MultiType instead of (count, …) or (count, va_arg) style

Location:

trunk/src/lib/util

Files:

• executor/executor.cc (modified) (3 diffs)
• executor/executor.h (modified) (2 diffs)
• loading/load_param.cc (modified) (4 diffs)
• loading/load_param.h (modified) (1 diff)

trunk/src/lib/util/executor/executor.cc

@@ -55 +55 @@
   for (unsigned int i = 0; i < FUNCTOR_MAX_ARGUMENTS; i++)
   {
-    printf("%d ", i);
     if (this->defaultValue[i] == MT_NULL)
     {
@@ -61 +60 @@
       break;
     }
-
   }
-  printf("%d\n", this->paramCount);
-
   assert (paramCount <= FUNCTOR_MAX_ARGUMENTS);
 }
@@ -85 +81 @@
 }
 
-
-
 /**
- * sets default Values of the Commands
- * @param count how many default Values to set.
- * @param ... the default Values in order. They will be cast to the right type
+ * @brief set the default values of the executor
+ * @param value0 the first default value
+ * @param value1 the second default value
+ * @param value2 the third default value
+ * @param value3 the fourth default value
+ * @param value4 the fifth default value
  * @returns itself
- *
- * Be aware, that when you use this Function, you !!MUST!! match the input as
- * count, [EXACTLY THE SAME AS IF YOU WOULD CALL THE FUNCTION UP TO count ARGUMENTS]
  */
-Executor* Executor::defaultValues(unsigned int count, ...)
-{
-  va_list values;
-  va_start(values, count);
-
-  this->defaultValues(count, values);
-}
-
-Executor* Executor::defaultValues(unsigned int count, va_list values)
+Executor* Executor::defaultValues(const MultiType& value0,
+                                  const MultiType& value1,
+                                  const MultiType& value2,
+                                  const MultiType& value3,
+                                  const MultiType& value4)
 {
   if (this == NULL)
     return NULL;
-  if (count == 0)
-    return this;
-  if (count > this->paramCount)
-    count = this->paramCount;
 
+  const MultiType* value[5];
+  value[0] = &value0;
+  value[1] = &value1;
+  value[2] = &value2;
+  value[3] = &value3;
+  value[4] = &value4;
 
-  for (unsigned int i = 0; i < count; i++)
+  for (unsigned int i = 0; i < this->paramCount; i++)
   {
-    switch (this->defaultValue[i].getType())
+    if (*value[i] != MT_NULL)
     {
-      case MT_BOOL:
-        this->defaultValue[i].setInt(va_arg(values, int));
-        break;
-      case MT_CHAR:
-        this->defaultValue[i].setChar((char)va_arg(values, int));
-        break;
-      case MT_STRING:
-        this->defaultValue[i].setString(va_arg(values, char*));
-        break;
-      case MT_INT:
-        this->defaultValue[i].setInt(va_arg(values, int));
-        break;
-        /*      case MT_UINT:
-                this->defaultValue[i].setInt((int)va_arg(values, unsigned int));
-                break;*/
-      case MT_FLOAT:
-        this->defaultValue[i].setFloat(va_arg(values, double));
-        break;
-        /*      case MT_LONG:
-                this->defaultValue[i].setInt((int) va_arg(values, long));
-                break;*/
-      default:
-        break;
+      if (this->defaultValue[i].getType() == value[i]->getType())
+      {
+        this->defaultValue[i] = *value[i];
+      }
+      else
+      {
+        PRINTF(1)("Unable to set this Value, as it is not of type %s\n", MultiType::MultiTypeToString(this->defaultValue[i].getType()));
+      }
     }
   }

trunk/src/lib/util/executor/executor.h

@@ -45 +45 @@
     virtual Executor* clone () const = 0;
 
-    Executor* defaultValues(unsigned int count, va_list values);
-    Executor* defaultValues(unsigned int count, ...);
+    Executor* defaultValues(const MultiType& value0 = MT_NULL, const MultiType& value1 = MT_NULL,
+                            const MultiType& value2 = MT_NULL, const MultiType& value3 = MT_NULL,
+                            const MultiType& value4 = MT_NULL);
 
     /** executes a Command @param object the object to apply this to @param parameters the parameters the command takes */
@@ -59 +60 @@
 
   protected:
-    Executor(const MultiType& param0 = MT_NULL,
-             const MultiType& param1 = MT_NULL,
-             const MultiType& param2 = MT_NULL,
-             const MultiType& param3 = MT_NULL,
+    Executor(const MultiType& param0 = MT_NULL, const MultiType& param1 = MT_NULL,
+             const MultiType& param2 = MT_NULL, const MultiType& param3 = MT_NULL,
              const MultiType& param4 = MT_NULL);
 

trunk/src/lib/util/loading/load_param.cc

@@ -63 +63 @@
     if (likely(this->object != NULL) &&
         ( this->loadString != NULL ||
-         ((this->executor->getType() & Executor_NoLoadString) == Executor_NoLoadString)))
+          ((this->executor->getType() & Executor_NoLoadString) == Executor_NoLoadString)))
     {
       PRINTF(4)("Loading '%s' with Parameters '%s' onto: '%s'(%s)\n", this->paramName, this->loadString, this->object->getName(), this->object->getClassName());
@@ -73 +73 @@
 
 /**
- * set the default values of the executor
- * @param count how many default values to set.
- * @param ... the default values !! must be at least count parameters!!
- */
-CLoadParam& CLoadParam::defaultValues(unsigned int count, ...)
-{
-  va_list values;
-  va_start(values, count);
-
-  assert(executor != NULL);
-  this->executor->defaultValues(count, values);
+ * @brief set the default values of the executor
+ * @param value0 the first default value
+ * @param value1 the second default value
+ * @param value2 the third default value
+ * @param value3 the fourth default value
+ * @param value4 the fifth default value
+ */
+CLoadParam& CLoadParam::defaultValues(const MultiType& value0, const MultiType& value1,
+                                      const MultiType& value2, const MultiType& value3,
+                                      const MultiType& value4)
+{
+  assert(this->executor != NULL);
+  this->executor->defaultValues(value0, value1, value2, value3, value4);
 
   return *this;
@@ -97 +99 @@
 {
   if (LoadClassDescription::parametersDescription && this->paramDesc && !this->paramDesc->getDescription())
-    {
-      this->paramDesc->setDescription(descriptionText);
-    }
+  {
+    this->paramDesc->setDescription(descriptionText);
+  }
   return *this;
 }
@@ -239 +241 @@
   node = element->FirstChild();
   while( node != NULL)
-    {
-      if( node->ToText()) return node->Value();
-      node = node->NextSibling();
-    }
+  {
+    if( node->ToText()) return node->Value();
+    node = node->NextSibling();
+  }
   return NULL;
 }

trunk/src/lib/util/loading/load_param.h

@@ -91 +91 @@
 
     CLoadParam& describe(const char* descriptionText);
-    CLoadParam& defaultValues(unsigned int count, ...);
+    CLoadParam& defaultValues(const MultiType& value0 = MT_NULL, const MultiType& value1 = MT_NULL,
+                              const MultiType& value2 = MT_NULL, const MultiType& value3 = MT_NULL,
+                              const MultiType& value4 = MT_NULL);
     CLoadParam& attribute(const char* attributeName, const Executor& executor);