Changeset 957 for code/branches/core2/src/orxonox/core/Executor.cc

Timestamp:

Mar 30, 2008, 5:38:03 AM (16 years ago)

Author:

landauf

Message:

• added set and tset functions to the ConfigValueContainer to (temporary) set a config-value to a new value
• ConfigValueContainer uses now the functions of MultiTypeMath to convert and assign values
• added some errorhandling to the CommandExecutor in case there are not enough parameters when executing the command
• added updateConfigValues function to Identifier
• added addTime and removeTime functions to the Timer
• some changes in Executor to allow adding description and default-values when using the ConsoleCommand macro

File:

• code/branches/core2/src/orxonox/core/Executor.cc (modified) (12 diffs)

code/branches/core2/src/orxonox/core/Executor.cc

@@ -64 +64 @@
     }
 
-    void Executor::setDescription(const std::string& description)
+    Executor& Executor::setDescription(const std::string& description)
     {
         if (!this->bAddedDescription_)
@@ -72 +72 @@
             this->bAddedDescription_ = true;
         }
+        return (*this);
     }
 
@@ -79 +80 @@
     }
 
-    void Executor::setDescriptionParam(int param, const std::string& description)
+    Executor& Executor::setDescriptionParam(int param, const std::string& description)
     {
         if (param >= 0 && param < MAX_FUNCTOR_ARGUMENTS)
@@ -87 +88 @@
                 std::string paramnumber;
                 if (!Convert::ToString(&paramnumber, param))
-                    return;
+                    return (*this);
 
                 this->descriptionParam_[param] = std::string("ExecutorDescription::" + this->name_ + "::param" + paramnumber);
@@ -94 +95 @@
             }
         }
+        return (*this);
     }
 
@@ -104 +106 @@
     }
 
-    void Executor::setDescriptionReturnvalue(const std::string& description)
+    Executor& Executor::setDescriptionReturnvalue(const std::string& description)
     {
         if (!this->bAddedDescriptionReturnvalue_)
@@ -112 +114 @@
             this->bAddedDescriptionReturnvalue_ = true;
         }
+        return (*this);
     }
 
@@ -119 +122 @@
     }
 
-    void Executor::setDefaultValues(const MultiTypeMath& param1)
-    {
-        this->defaultValue_[0] = param1;
-        this->bAddedDefaultValue_[0] = true;
-    }
-
-    void Executor::setDefaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2)
-    {
-        this->defaultValue_[0] = param1;
-        this->bAddedDefaultValue_[0] = true;
-        this->defaultValue_[1] = param2;
-        this->bAddedDefaultValue_[1] = true;
-    }
-
-    void Executor::setDefaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3)
+    Executor& Executor::setDefaultValues(const MultiTypeMath& param1)
+    {
+        this->defaultValue_[0] = param1;
+        this->bAddedDefaultValue_[0] = true;
+
+        return (*this);
+    }
+
+    Executor& Executor::setDefaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2)
+    {
+        this->defaultValue_[0] = param1;
+        this->bAddedDefaultValue_[0] = true;
+        this->defaultValue_[1] = param2;
+        this->bAddedDefaultValue_[1] = true;
+
+        return (*this);
+    }
+
+    Executor& Executor::setDefaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3)
     {
         this->defaultValue_[0] = param1;
@@ -141 +148 @@
         this->defaultValue_[2] = param3;
         this->bAddedDefaultValue_[2] = true;
-    }
-
-    void Executor::setDefaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3, const MultiTypeMath& param4)
+
+        return (*this);
+    }
+
+    Executor& Executor::setDefaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3, const MultiTypeMath& param4)
     {
         this->defaultValue_[0] = param1;
@@ -153 +162 @@
         this->defaultValue_[3] = param4;
         this->bAddedDefaultValue_[3] = true;
-    }
-
-    void Executor::setDefaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3, const MultiTypeMath& param4, const MultiTypeMath& param5)
+
+        return (*this);
+    }
+
+    Executor& Executor::setDefaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3, const MultiTypeMath& param4, const MultiTypeMath& param5)
     {
         this->defaultValue_[0] = param1;
@@ -167 +178 @@
         this->defaultValue_[4] = param5;
         this->bAddedDefaultValue_[4] = true;
-    }
-
-    void Executor::setDefaultValue(unsigned int index, const MultiTypeMath& param)
+
+        return (*this);
+    }
+
+    Executor& Executor::setDefaultValue(unsigned int index, const MultiTypeMath& param)
     {
         if (index >= 0 && index < MAX_FUNCTOR_ARGUMENTS)
@@ -176 +189 @@
             this->bAddedDefaultValue_[index] = true;
         }
+        return (*this);
     }