Changeset 667 for code/branches/FICN/src/orxonox/objects

Timestamp:

Dec 22, 2007, 2:13:18 AM (16 years ago)

Author:

landauf

Message:

• expanded the String2Number.h file
• changed the SetConfigValue macro
• changed the S2N and N2S conversion in the ConfigValueContainer
• added unsigned int, char, unsigned char, float (additionally to double) and const char* (additionally to std::string) to the ConfigValueContainer

Location:

code/branches/FICN/src/orxonox/objects

Files:

• test3.cc (modified) (3 diffs)
• test3.h (modified) (1 diff)

code/branches/FICN/src/orxonox/objects/test3.cc

@@ -16 +16 @@
     void Test3::setConfigValues()
     {
-        SetConfigValue(value_int_, -100);
-        SetConfigValue(value_double_, 10.555678);
-        SetConfigValue(value_bool_, true);
-        SetConfigValue(value_string_, "Dies ist ein Test");
+        SetConfigValue(value_int_, 1);
+        SetConfigValue(value_uint_, 1);
+        SetConfigValue(value_char_, 1);
+        SetConfigValue(value_uchar_, 1);
+        SetConfigValue(value_float_, 1);
+        SetConfigValue(value_double_, 1);
+        SetConfigValue(value_bool_, 1);
+        SetConfigValue(value_string_, "This is a test");
+        SetConfigValue(value_constchar_, "This is another test");
         SetConfigValue(value_vector2_, Vector2(101, 202));
         SetConfigValue(value_vector3_, Vector3(13, 26, 39));
@@ -29 +34 @@
     }
 
-        #include <fstream>
     void Test3::configOutput()
     {
         std::cout << this->value_int_ << std::endl;
+        std::cout << this->value_uint_ << std::endl;
+        std::cout << (int)this->value_char_ << std::endl;
+        std::cout << (int)this->value_uchar_ << std::endl;
+        std::cout << this->value_float_ << std::endl;
         std::cout << this->value_double_ << std::endl;
         std::cout << this->value_bool_ << std::endl;
         std::cout << this->value_string_ << std::endl;
+        std::cout << this->value_constchar_ << std::endl;
         std::cout << this->value_vector2_ << std::endl;
         std::cout << this->value_vector3_ << std::endl;
@@ -41 +50 @@
     }
 
-        #define testandcout(code) \
-          std::cout << #code << " " << code << "\n"
+    #define testandcout(code) \
+      std::cout << #code << " " << code << "\n"
 
     void Test3::usefullClassesIsATest(Test1* test1)

code/branches/FICN/src/orxonox/objects/test3.h

@@ -24 +24 @@
         private:
             int                 value_int_;
+            unsigned int        value_uint_;
+            char                value_char_;
+            unsigned char       value_uchar_;
+            float               value_float_;
             double              value_double_;
             bool                value_bool_;
             std::string         value_string_;
+            const char*         value_constchar_;
             Vector2             value_vector2_;
             Vector3             value_vector3_;