Changeset 925 for code/branches/core2/src/util/Convert.h

Timestamp:

Mar 26, 2008, 1:36:35 AM (16 years ago)

Author:

landauf

Message:

• the MultiTypes can now handle pointers and xml-elements
• added a const keyword in the ticpp.h file (TinyXML++)

File:

• code/branches/core2/src/util/Convert.h (modified) (6 diffs)

code/branches/core2/src/util/Convert.h

@@ -41 +41 @@
 #include "MultiTypeMath.h"
 
-
 // DEFAULT CLASS
 template <typename FromType, typename ToType>
@@ -151 +150 @@
     bool operator()(ToType* output, const MultiTypePrimitive& input) const
     {
-      if (input.getType() == MT_int)
+      if (input.getType() == MT_void)
+        return ConvertValue(output, input.getVoid());
+      else if (input.getType() == MT_int)
         return ConvertValue(output, input.getInt());
       else if (input.getType() == MT_uint)
@@ -185 +186 @@
     bool operator()(std::string* output, const MultiTypePrimitive& input) const
     {
-      if (input.getType() == MT_int)
+      if (input.getType() == MT_void)
+        return ConvertValue(output, input.getVoid());
+      else if (input.getType() == MT_int)
         return ConvertValue(output, input.getInt());
       else if (input.getType() == MT_uint)
@@ -225 +228 @@
       else if (input.getType() == MT_string)
         return ConvertValue(output, input.getString());
+      else if (input.getType() == MT_xmlelement)
+        return ConvertValue(output, input.getXMLElement());
       else
         return ConvertValue(output, (MultiTypePrimitive)input);
@@ -239 +244 @@
       else if (input.getType() == MT_string)
         return ConvertValue(output, input.getString());
+      else if (input.getType() == MT_xmlelement)
+        return ConvertValue(output, input.getXMLElement());
       else
         return ConvertValue(output, (MultiTypePrimitive)input);
@@ -534 +541 @@
 };
 
+
+////////////////
+// XMLElement //
+////////////////
+
+// orxonox::Element to std::string
+template <>
+class Converter<orxonox::Element, std::string>
+{
+  public:
+    bool operator()(std::string* output, const orxonox::Element& input) const
+    {
+      std::ostringstream ostream;
+      if (ostream << input)
+      {
+        (*output) = ostream.str();
+        return true;
+      }
+
+      return false;
+    }
+};
+
+// std::string to orxonox::Element
+template <>
+class Converter<std::string, orxonox::Element>
+{
+  public:
+    bool operator()(orxonox::Element* output, const std::string& input) const
+    {
+      std::istringstream istream(input);
+      if (istream >> (*output))
+        return true;
+
+      return false;
+    }
+};
+
+
 #endif /* _Convert_H__ */