Changeset 220 for osgVisual/trunk

Timestamp:

Feb 2, 2011, 10:14:57 AM (14 years ago)

Author:

Torben Dannhauer

Message:

Added util functions to convert string to bool, int or double.
Modified all files to use this functions.

Location:

osgVisual/trunk

Files:

• bin/osgVisualConfig.xml (modified) (1 diff)
• include/util/visual_util.h (modified) (2 diffs)
• src/util/visual_util.cpp (modified) (1 diff)

osgVisual/trunk/bin/osgVisualConfig.xml

@@ -83 +83 @@
         <precipitation rate_mmPerHour_rain="5.0" rate_mmPerHour_drySnow="7.0" rate_mmPerHour_wetSnow="10.0" rate_mmPerHour_sleet="0.0"></precipitation>
       </cloudlayer>
-      <cloudlayer slot="2" type="CUMULUS_MEDIOCRIS" enabled="yes" fadetime="15">
+      <cloudlayer slot="2" type="CUMULUS_MEDIOCRIS" enabled="no" fadetime="15">
         <geometry baselength="50000" basewidth="50000" thickness="1600" baseHeight="1000" density="0.07"></geometry>
       </cloudlayer>

osgVisual/trunk/include/util/visual_util.h

@@ -276 +276 @@
          * @return : double representation of the string.
          */ 
-        static int strToDouble(std::string s);
+        static double strToDouble(std::string s);
 
         /**
@@ -284 +284 @@
          * @return : Integer representation of the string.
          */ 
-        static double strToInt(std::string s);
+        static int strToInt(std::string s);
 
         /**

osgVisual/trunk/src/util/visual_util.cpp

@@ -536 +536 @@
 }
 
-int util::strToDouble(std::string s)
+double util::strToDouble(std::string s)
 {
         double tmp;
         std::stringstream sstr(s);
-        sstr >> tmp;
-        return tmp;
-}
-
-double util::strToInt(std::string s)
+    if (!(sstr >> tmp))
+        {
+                OSG_ALWAYS << __FUNCTION__ << "Warning:Unable to convert "<< s <<" to double, using 0.0 as default!" << std::endl;
+                return 0.0;
+        }
+        else
+                return tmp;
+}
+
+int util::strToInt(std::string s)
 {
         int tmp;
         std::stringstream sstr(s);
-        sstr >> tmp;
-        return tmp;
+        if (!(sstr >> tmp))
+        {
+                OSG_ALWAYS << __FUNCTION__ << "Warning:Unable to convert "<< s <<" to int, using 0 as default!" << std::endl;
+                return 0;
+        }
+        else
+                return tmp;
 }