Changeset 9643 for ps

Timestamp:

06/21/11 04:56:49 (14 years ago)

Author:

ben

Message:

Adds getInt to AtlasObject
Uses this instead of wxAtoi for consistency, and adds brief comment about why wxAtof should be avoided

Location:

ps/trunk/source/tools/atlas

Files:

• AtlasObject/AtlasObject.h (modified) (1 diff)
• AtlasObject/AtlasObjectImpl.cpp (modified) (1 diff)
• AtlasUI/ScenarioEditor/Sections/Player/Player.cpp (modified) (3 diffs)

ps/trunk/source/tools/atlas/AtlasObject/AtlasObject.h

@@ -140 +140 @@
     double getDouble() const;
 
+    // Return the integer value of this object
+    int getInt() const;
+
     // Check whether the object contains anything (even if those things are empty)
     bool defined() const { return (bool)p; }

ps/trunk/source/tools/atlas/AtlasObject/AtlasObjectImpl.cpp

@@ -141 +141 @@
 }
 
+int AtObj::getInt() const
+{
+    int val = 0;
+    if (p)
+    {
+        std::wstringstream s;
+        s << p->value;
+        s >> val;
+    }
+    return val;
+}
+
 void AtObj::add(const char* key, AtObj& data)
 {

ps/trunk/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp

@@ -553 +553 @@
         if (clrObj.defined())
         {
-            colour = wxColor(wxAtoi(*clrObj["r"]), wxAtoi(*clrObj["g"]), wxAtoi(*clrObj["b"]));
+            colour = wxColor((*clrObj["r"]).getInt(), (*clrObj["g"]).getInt(), (*clrObj["b"]).getInt());
         }
         else
         {
             clrObj = *playerDefs["Colour"];
-            colour = wxColor(wxAtoi(*clrObj["r"]), wxAtoi(*clrObj["g"]), wxAtoi(*clrObj["b"]));
+            colour = wxColor((*clrObj["r"]).getInt(), (*clrObj["g"]).getInt(), (*clrObj["b"]).getInt());
         }
         controls.colour->SetBackgroundColour(colour);
@@ -617 +617 @@
         // team
         if (player["Team"].defined())
-            controls.team->SetSelection(wxAtoi(*player["Team"]));
+            controls.team->SetSelection((*player["Team"]).getInt());
         else
             controls.team->SetSelection(0);
@@ -625 +625 @@
         {
             sCameraInfo info;
+            // Don't use wxAtof because it depends on locales which
+            //  may cause problems with decimal points
+            //  see: http://www.wxwidgets.org/docs/faqgtk.htm#locale
             AtObj camPos = *player["StartingCamera"]["Position"];
             info.pX = (float)(*camPos["x"]).getDouble();