merging r13009 onto trunk, shouldn't have been on tag

Author: kwc

CMakeLists.txt

@@ -14,4 +14,4 @@ include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
 # variables.
 #list(APPEND CPACK_SOURCE_IGNORE_FILES /core/experimental)
 
-rosbuild_make_distribution(0.2.3)
+rosbuild_make_distribution(0.2.4)

turtlesim/images/diamondback.png

@@ -83,7 +83,7 @@ class TurtleFrame : public wxFrame
   M_Turtle turtles_;
   uint32_t id_counter_;
 
-  wxImage turtle_images_[3];
+  wxImage turtle_images_[4];
 
   float meter_;
   float width_in_meters_;

turtlesim/include/turtlesim/turtle_frame.h

@@ -57,15 +57,16 @@ TurtleFrame::TurtleFrame(wxWindow* parent)
   nh_.setParam("background_g", DEFAULT_BG_G);
   nh_.setParam("background_b", DEFAULT_BG_B);
 
-  std::string turtles[3] = 
+  std::string turtles[4] = 
   {
     "box-turtle.png",
     "robot-turtle.png",
-    "sea-turtle.png"
+    "sea-turtle.png",
+    "diamondback.png"
   };
 
   std::string images_path = ros::package::getPath("turtlesim") + "/images/";
-  for (size_t i = 0; i < 3; ++i)
+  for (size_t i = 0; i < 4; ++i)
   {
     turtle_images_[i].LoadFile(wxString::FromAscii((images_path + turtles[i]).c_str()));
     turtle_images_[i].SetMask(true);
@@ -148,7 +149,7 @@ std::string TurtleFrame::spawnTurtle(const std::string& name, float x, float y,
     }
   }
 
-  TurtlePtr t(new Turtle(ros::NodeHandle(real_name), turtle_images_[rand() % 3], Vector2(x, y), angle));
+  TurtlePtr t(new Turtle(ros::NodeHandle(real_name), turtle_images_[rand() % 4], Vector2(x, y), angle));
   turtles_[real_name] = t;
 
   ROS_INFO("Spawning turtle [%s] at x=[%f], y=[%f], theta=[%f]", real_name.c_str(), x, y, angle);