Changeset 721 for code/branches/FICN

Timestamp:

Dec 29, 2007, 3:14:39 AM (17 years ago)

Author:

landauf

Message:

added Convert.h (greetings to bensch) and changed the corresponding lines in the ConfigValueContainer.

Location:

code/branches/FICN/src

Files:

• misc/Convert.h (added)
• misc/String2Number.h (modified) (1 diff)
• orxonox/core/ConfigValueContainer.cc (modified) (19 diffs)

code/branches/FICN/src/misc/String2Number.h

@@ -49 +49 @@
 };
 
-
-/**
-    @brief Converts a number of any type to a string.
-    @param variable The variable, containing the number.
-
-    @example
-    float f = 3.14;
-    std::string output = number2String(f);
-*/
-template <typename T>
-const std::string number2String(T variable)
-{
-    std::ostringstream oss;
-    if (oss << variable)
-        return std::string(oss.str());
-
-    return std::string("");
-}
-
-/**
-    @brief Converts a number of any type to a string and assigns a defaultvalue if the conversion fails.
-    @param variable The variable, containing the number.
-    @param fallbackString The assigned string if the conversion fails.
-
-    @example
-    float f = 3.14;
-    std::string output = number2String(f, "0.000000");
-*/
-template <typename T>
-const std::string number2String(T variable, const std::string& fallbackString)
-{
-    std::ostringstream oss;
-    if (oss << variable)
-        return std::string(oss.str());
-
-    return fallbackString;
-}
-
-/**
-    @brief Converts a string to a number of any type.
-    @param variable The variable wherein the value gets written
-    @return True if the conversion was successful
-
-    @example
-    float f;
-    bool success = string2Number(f, "3.14");
-*/
-template <typename T>
-bool string2Number(T& variable, const std::string& valueString)
-{
-    std::istringstream iss(valueString);
-    if (iss >> variable)
-        return true;
-
-    return false;
-}
-
-/**
-    @brief Converts a string to a number of any type.
-    @param variable The variable wherein the value gets written
-    @param fallbackValue The assigned value if the conversion fails
-    @return True if the conversion was successful
-
-    @example
-    float f;
-    bool success = string2Number(f, "3.14", 0.000000);
-*/
-template <typename T>
-bool string2Number(T& variable, const std::string& valueString, T fallbackValue)
-{
-    std::istringstream iss(valueString);
-    if (iss >> variable)
-        return true;
-
-    variable = fallbackValue;
-    return false;
-}
-
 #endif /* _String2Number_H__ */

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

@@ -29 +29 @@
 
 #include "misc/Tokenizer.h"
-#include "misc/String2Number.h"
+#include "misc/Convert.h"
 #include "ConfigValueContainer.h"
 
@@ -50 +50 @@
         this->type_ = VT_Int;
 
-        this->defvalueString_ = number2String(defvalue, "0");                       // Try to convert the default-value to a string
+        Convert::ToString(this->defvalueString_, defvalue, "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;
 
-        this->defvalueString_ = number2String(defvalue, "0");                       // Try to convert the default-value to a string
+        Convert::ToString(this->defvalueString_, defvalue, "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;
 
-        this->defvalueString_ = number2String((int)defvalue, "0");                  // Try to convert the default-value to a string
+        Convert::ToString(this->defvalueString_, (int)defvalue, "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;
 
-        this->defvalueString_ = number2String((unsigned int)defvalue, "0");         // Try to convert the default-value to a string
+        Convert::ToString(this->defvalueString_, (unsigned int)defvalue, "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;
 
-        this->defvalueString_ = number2String(defvalue, "0.000000");                // Try to convert the default-value to a string
+        Convert::ToString(this->defvalueString_, defvalue, "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;
 
-        this->defvalueString_ = number2String(defvalue, "0.000000");                // Try to convert the default-value to a string
+        Convert::ToString(this->defvalueString_, defvalue, "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;
 
-        this->defvalueString_ = number2String(defvalue, "0.000000");                // Try to convert the default-value to a string
+        Convert::ToString(this->defvalueString_, defvalue, "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 string2Number(this->value_.value_int_, input, defvalue);
+        return Convert::FromString(this->value_.value_int_, input, defvalue);
     }
 
@@ -395 +395 @@
     bool ConfigValueContainer::parseSting(const std::string& input, unsigned int defvalue)
     {
-        return string2Number(this->value_.value_uint_, input, defvalue);
+        return Convert::FromString(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 string2Number(this->value_.value_int_, input, (int)defvalue);
+        return Convert::FromString(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 string2Number(this->value_.value_uint_, input, (unsigned int)defvalue);
+        return Convert::FromString(this->value_.value_uint_, input, (unsigned int)defvalue);
     }
 
@@ -430 +430 @@
     bool ConfigValueContainer::parseSting(const std::string& input, float defvalue)
     {
-        return string2Number(this->value_.value_float_, input, defvalue);
+        return Convert::FromString(this->value_.value_float_, input, defvalue);
     }
 
@@ -441 +441 @@
     bool ConfigValueContainer::parseSting(const std::string& input, double defvalue)
     {
-        return string2Number(this->value_.value_double_, input, defvalue);
+        return Convert::FromString(this->value_.value_double_, input, defvalue);
     }
 
@@ -452 +452 @@
     bool ConfigValueContainer::parseSting(const std::string& input, long double defvalue)
     {
-        return string2Number(this->value_.value_long_double_, input, defvalue);
+        return Convert::FromString(this->value_.value_long_double_, input, defvalue);
     }
 
@@ -477 +477 @@
         {
             // Its not a known word - is it a number?
-            return string2Number(this->value_.value_bool_, input, defvalue);
+            return Convert::FromString(this->value_.value_bool_, input, defvalue);
         }
 
@@ -549 +549 @@
         {
             std::vector<std::string> tokens = tokenize(input.substr(pos1, pos2 - pos1), ",");
-            if (!string2Number(this->value_vector2_.x, tokens[0], defvalue.x))
+            if (!Convert::FromString(this->value_vector2_.x, tokens[0], defvalue.x))
             {
                 this->value_vector2_ = defvalue;
                 return false;
             }
-            if (!string2Number(this->value_vector2_.y, tokens[1], defvalue.y))
+            if (!Convert::FromString(this->value_vector2_.y, tokens[1], defvalue.y))
             {
                 this->value_vector2_ = defvalue;
@@ -583 +583 @@
         {
             std::vector<std::string> tokens = tokenize(input.substr(pos1, pos2 - pos1), ",");
-            if (!string2Number(this->value_vector3_.x, tokens[0], defvalue.x))
+            if (!Convert::FromString(this->value_vector3_.x, tokens[0], defvalue.x))
             {
                 this->value_vector3_ = defvalue;
                 return false;
             }
-            if (!string2Number(this->value_vector3_.y, tokens[1], defvalue.y))
+            if (!Convert::FromString(this->value_vector3_.y, tokens[1], defvalue.y))
             {
                 this->value_vector3_ = defvalue;
                 return false;
             }
-            if (!string2Number(this->value_vector3_.z, tokens[2], defvalue.z))
+            if (!Convert::FromString(this->value_vector3_.z, tokens[2], defvalue.z))
             {
                 this->value_vector3_ = defvalue;
@@ -622 +622 @@
         {
             std::vector<std::string> tokens = tokenize(input.substr(pos1, pos2 - pos1), ",");
-            if (!string2Number(this->value_colourvalue_.r, tokens[0], defvalue.r))
+            if (!Convert::FromString(this->value_colourvalue_.r, tokens[0], defvalue.r))
             {
                 this->value_colourvalue_ = defvalue;
                 return false;
             }
-            if (!string2Number(this->value_colourvalue_.g, tokens[1], defvalue.g))
+            if (!Convert::FromString(this->value_colourvalue_.g, tokens[1], defvalue.g))
             {
                 this->value_colourvalue_ = defvalue;
                 return false;
             }
-            if (!string2Number(this->value_colourvalue_.b, tokens[2], defvalue.b))
+            if (!Convert::FromString(this->value_colourvalue_.b, tokens[2], defvalue.b))
             {
                 this->value_colourvalue_ = defvalue;
                 return false;
             }
-            if (!string2Number(this->value_colourvalue_.a, tokens[3], defvalue.a))
+            if (!Convert::FromString(this->value_colourvalue_.a, tokens[3], defvalue.a))
             {
                 this->value_colourvalue_ = defvalue;