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

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.h (modified) (2 diffs)

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

@@ -165 +165 @@
             bool parse(const std::string& params, const std::string& delimiter = " ") const;
 
-            void setDescription(const std::string& description);
+            Executor& setDescription(const std::string& description);
             const std::string& getDescription() const;
 
-            void setDescriptionParam(int param, const std::string& description);
+            Executor& setDescriptionParam(int param, const std::string& description);
             const std::string& getDescriptionParam(int param) const;
 
-            void setDescriptionReturnvalue(const std::string& description);
+            Executor& setDescriptionReturnvalue(const std::string& description);
             const std::string& getDescriptionReturnvalue(int param) const;
 
@@ -197 +197 @@
                 { return this->accessLevel_; }
 
-            void setDefaultValues(const MultiTypeMath& param1);
-            void setDefaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2);
-            void setDefaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3);
-            void setDefaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3, const MultiTypeMath& param4);
-            void setDefaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3, const MultiTypeMath& param4, const MultiTypeMath& param5);
-            void setDefaultValue(unsigned int index, const MultiTypeMath& param);
+            Executor& setDefaultValues(const MultiTypeMath& param1);
+            Executor& setDefaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2);
+            Executor& setDefaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3);
+            Executor& setDefaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3, const MultiTypeMath& param4);
+            Executor& setDefaultValues(const MultiTypeMath& param1, const MultiTypeMath& param2, const MultiTypeMath& param3, const MultiTypeMath& param4, const MultiTypeMath& param5);
+            Executor& setDefaultValue(unsigned int index, const MultiTypeMath& param);
+
+            inline MultiTypeMath getDefaultValue(unsigned int index) const
+            {
+                if (index >= 0 && index < MAX_FUNCTOR_ARGUMENTS)
+                    return this->defaultValue_[index];
+
+                return MT_null;
+            }
 
             bool allDefaultValuesSet() const;