Changeset 726 for code/branches/FICN/src/orxonox

Timestamp:

Dec 30, 2007, 1:50:02 AM (17 years ago)

Author:

landauf

Message:

adopted benschs Convert class and used it in the ConfigValueContainer

Location:

code/branches/FICN/src/orxonox/core

Files:

• ConfigValueContainer.cc (modified) (18 diffs)
• ConfigValueContainer.h (modified) (1 diff)

code/branches/FICN/src/orxonox/core/ConfigValueContainer.cc

@@ -50 +50 @@
         this->type_ = VT_Int;
 
-        Convert::ToString(&this->defvalueString_, defvalue, "0");                   // Try to convert the default-value to a string
+        ConvertValue(&this->defvalueString_, defvalue, std::string("0"));           // Try to convert the default-value to a string
         this->searchConfigFileLine();                                               // Search the entry in the config-file
 
@@ -72 +72 @@
         this->type_ = VT_uInt;
 
-        Convert::ToString(&this->defvalueString_, defvalue, "0");                   // Try to convert the default-value to a string
+        ConvertValue(&this->defvalueString_, defvalue, std::string("0"));           // Try to convert the default-value to a string
         this->searchConfigFileLine();                                               // Search the entry in the config-file
 
@@ -94 +94 @@
         this->type_ = VT_Char;
 
-        Convert::ToString(&this->defvalueString_, (int)defvalue, "0");              // Try to convert the default-value to a string
+        ConvertValue(&this->defvalueString_, (int)defvalue, std::string("0"));      // Try to convert the default-value to a string
         this->searchConfigFileLine();                                               // Search the entry in the config-file
 
@@ -116 +116 @@
         this->type_ = VT_uChar;
 
-        Convert::ToString(&this->defvalueString_, (unsigned int)defvalue, "0");     // Try to convert the default-value to a string
+        ConvertValue(&this->defvalueString_, (unsigned int)defvalue, std::string("0"));     // Try to convert the default-value to a string
         this->searchConfigFileLine();                                               // Search the entry in the config-file
 
@@ -138 +138 @@
         this->type_ = VT_Float;
 
-        Convert::ToString(&this->defvalueString_, defvalue, "0.000000");            // Try to convert the default-value to a string
+        ConvertValue(&this->defvalueString_, defvalue, std::string("0.000000"));    // Try to convert the default-value to a string
         this->searchConfigFileLine();                                               // Search the entry in the config-file
 
@@ -160 +160 @@
         this->type_ = VT_Double;
 
-        Convert::ToString(&this->defvalueString_, defvalue, "0.000000");            // Try to convert the default-value to a string
+        ConvertValue(&this->defvalueString_, defvalue, std::string("0.000000"));    // Try to convert the default-value to a string
         this->searchConfigFileLine();                                               // Search the entry in the config-file
 
@@ -182 +182 @@
         this->type_ = VT_LongDouble;
 
-        Convert::ToString(&this->defvalueString_, defvalue, "0.000000");            // Try to convert the default-value to a string
+        ConvertValue(&this->defvalueString_, defvalue, std::string("0.000000"));    // Try to convert the default-value to a string
         this->searchConfigFileLine();                                               // Search the entry in the config-file
 
@@ -384 +384 @@
     bool ConfigValueContainer::parseSting(const std::string& input, int defvalue)
     {
-        return Convert::FromString(&this->value_.value_int_, input, defvalue);
+        return ConvertValue(&this->value_.value_int_, input, defvalue);
     }
 
@@ -395 +395 @@
     bool ConfigValueContainer::parseSting(const std::string& input, unsigned int defvalue)
     {
-        return Convert::FromString(&this->value_.value_uint_, input, defvalue);
+        return ConvertValue(&this->value_.value_uint_, input, defvalue);
     }
 
@@ -407 +407 @@
     {
         // I used value_int_ instead of value_char_ to avoid number <-> char confusion in the config-file
-        return Convert::FromString(&this->value_.value_int_, input, (int)defvalue);
+        return ConvertValue(&this->value_.value_int_, input, (int)defvalue);
     }
 
@@ -419 +419 @@
     {
         // I used value_uint_ instead of value_uchar_ to avoid number <-> char confusion in the config-file
-        return Convert::FromString(&this->value_.value_uint_, input, (unsigned int)defvalue);
+        return ConvertValue(&this->value_.value_uint_, input, (unsigned int)defvalue);
     }
 
@@ -430 +430 @@
     bool ConfigValueContainer::parseSting(const std::string& input, float defvalue)
     {
-        return Convert::FromString(&this->value_.value_float_, input, defvalue);
+        return ConvertValue(&this->value_.value_float_, input, defvalue);
     }
 
@@ -441 +441 @@
     bool ConfigValueContainer::parseSting(const std::string& input, double defvalue)
     {
-        return Convert::FromString(&this->value_.value_double_, input, defvalue);
+        return ConvertValue(&this->value_.value_double_, input, defvalue);
     }
 
@@ -452 +452 @@
     bool ConfigValueContainer::parseSting(const std::string& input, long double defvalue)
     {
-        return Convert::FromString(&this->value_.value_long_double_, input, defvalue);
+        return ConvertValue(&this->value_.value_long_double_, input, defvalue);
     }
 
@@ -477 +477 @@
         {
             // Its not a known word - is it a number?
-            return Convert::FromString(&this->value_.value_bool_, input, defvalue);
+            return ConvertValue(&this->value_.value_bool_, input, defvalue);
         }
 
@@ -549 +549 @@
         {
             std::vector<std::string> tokens = tokenize(input.substr(pos1, pos2 - pos1), ",");
-            if (!Convert::FromString(&this->value_vector2_.x, tokens[0], defvalue.x))
+            if (!ConvertValue(&this->value_vector2_.x, tokens[0]))
             {
                 this->value_vector2_ = defvalue;
                 return false;
             }
-            if (!Convert::FromString(&this->value_vector2_.y, tokens[1], defvalue.y))
+            if (!ConvertValue(&this->value_vector2_.y, tokens[1]))
             {
                 this->value_vector2_ = defvalue;
@@ -583 +583 @@
         {
             std::vector<std::string> tokens = tokenize(input.substr(pos1, pos2 - pos1), ",");
-            if (!Convert::FromString(&this->value_vector3_.x, tokens[0], defvalue.x))
+            if (!ConvertValue(&this->value_vector3_.x, tokens[0]))
             {
                 this->value_vector3_ = defvalue;
                 return false;
             }
-            if (!Convert::FromString(&this->value_vector3_.y, tokens[1], defvalue.y))
+            if (!ConvertValue(&this->value_vector3_.y, tokens[1]))
             {
                 this->value_vector3_ = defvalue;
                 return false;
             }
-            if (!Convert::FromString(&this->value_vector3_.z, tokens[2], defvalue.z))
+            if (!ConvertValue(&this->value_vector3_.z, tokens[2]))
             {
                 this->value_vector3_ = defvalue;
@@ -622 +622 @@
         {
             std::vector<std::string> tokens = tokenize(input.substr(pos1, pos2 - pos1), ",");
-            if (!Convert::FromString(&this->value_colourvalue_.r, tokens[0], defvalue.r))
+            if (!ConvertValue(&this->value_colourvalue_.r, tokens[0]))
             {
                 this->value_colourvalue_ = defvalue;
                 return false;
             }
-            if (!Convert::FromString(&this->value_colourvalue_.g, tokens[1], defvalue.g))
+            if (!ConvertValue(&this->value_colourvalue_.g, tokens[1]))
             {
                 this->value_colourvalue_ = defvalue;
                 return false;
             }
-            if (!Convert::FromString(&this->value_colourvalue_.b, tokens[2], defvalue.b))
+            if (!ConvertValue(&this->value_colourvalue_.b, tokens[2]))
             {
                 this->value_colourvalue_ = defvalue;
                 return false;
             }
-            if (!Convert::FromString(&this->value_colourvalue_.a, tokens[3], defvalue.a))
+            if (!ConvertValue(&this->value_colourvalue_.a, tokens[3]))
             {
                 this->value_colourvalue_ = defvalue;

code/branches/FICN/src/orxonox/core/ConfigValueContainer.h

@@ -124 +124 @@
             inline ConfigValueContainer& getValue(const char* value)                    { value = this->value_string_.c_str(); return *this; }
             /** @returns the value. @param value This is only needed to determine the right type. */
-            inline ConfigValueContainer& getValue(Vector2& value)                 { value = this->value_vector2_; return *this; }
+            inline ConfigValueContainer& getValue(Vector2& value)                       { value = this->value_vector2_; return *this; }
             /** @returns the value. @param value This is only needed to determine the right type. */
-            inline ConfigValueContainer& getValue(Vector3& value)                 { value = this->value_vector3_; return *this; }
+            inline ConfigValueContainer& getValue(Vector3& value)                       { value = this->value_vector3_; return *this; }
             /** @returns the value. @param value This is only needed to determine the right type. */
-            inline ConfigValueContainer& getValue(ColourValue& value)             { value = this->value_colourvalue_; return *this; }
+            inline ConfigValueContainer& getValue(ColourValue& value)                   { value = this->value_colourvalue_; return *this; }
 
             void description(const std::string& description);