[Personalrobots-commit] SF.net SVN: personalrobots:[17918] pkg/trunk

[<tf...@us...>]

Revision: 17918
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=17918&view=rev
Author:   tfoote
Date:     2009-06-29 23:52:46 +0000 (Mon, 29 Jun 2009)

Log Message:
-----------
moving MapMetaData and OccGrid into nav_msgs #1303

Modified Paths:
--------------
    pkg/trunk/nav/map_server/src/main.cpp
    pkg/trunk/stacks/common_msgs/robot_srvs/manifest.xml
    pkg/trunk/stacks/common_msgs/robot_srvs/srv/StaticMap.srv
    pkg/trunk/stacks/visualization/rviz/src/rviz/displays/map_display.h
    pkg/trunk/stacks/visualization/rviz/src/rviz/displays/poly_line_2d_display.h

Added Paths:
-----------
    pkg/trunk/stacks/common_msgs/nav_msgs/msg/MapMetaData.msg
    pkg/trunk/stacks/common_msgs/nav_msgs/msg/OccGrid.msg

Removed Paths:
-------------
    pkg/trunk/stacks/common_msgs/robot_msgs/msg/MapMetaData.msg
    pkg/trunk/stacks/common_msgs/robot_msgs/msg/OccGrid.msg

Modified: pkg/trunk/nav/map_server/src/main.cpp
===================================================================
--- pkg/trunk/nav/map_server/src/main.cpp	2009-06-29 23:31:41 UTC (rev 17917)
+++ pkg/trunk/nav/map_server/src/main.cpp	2009-06-29 23:52:46 UTC (rev 17918)
@@ -108,7 +108,7 @@
 #include "ros/ros.h"
 #include "ros/console.h"
 #include "map_server/image_loader.h"
-#include "robot_msgs/MapMetaData.h"
+#include "nav_msgs/MapMetaData.h"
 
 class MapServer
 {
@@ -134,7 +134,7 @@
       meta_data_message_ = map_resp_.map.info;
 
       service = n.advertiseService("static_map", &MapServer::mapCallback, this);
-      pub = n.advertise<robot_msgs::MapMetaData>("map_metadata", 1,
+      pub = n.advertise<nav_msgs::MapMetaData>("map_metadata", 1,
                                                  boost::bind(&MapServer::metadataSubscriptionCallback, *this, _1));
     }
 
@@ -164,7 +164,7 @@
       pub.publish( meta_data_message_ );
     }
 
-    robot_msgs::MapMetaData meta_data_message_;
+    nav_msgs::MapMetaData meta_data_message_;
 };
 
 int main(int argc, char **argv)

Copied: pkg/trunk/stacks/common_msgs/nav_msgs/msg/MapMetaData.msg (from rev 17898, pkg/trunk/stacks/common_msgs/robot_msgs/msg/MapMetaData.msg)
===================================================================
--- pkg/trunk/stacks/common_msgs/nav_msgs/msg/MapMetaData.msg	                        (rev 0)
+++ pkg/trunk/stacks/common_msgs/nav_msgs/msg/MapMetaData.msg	2009-06-29 23:52:46 UTC (rev 17918)
@@ -0,0 +1,11 @@
+# The time at which the map was loaded
+time map_load_time
+# The map resolution [m/cell]
+float32 resolution
+# Map width [cells]
+uint32 width
+# Map height [cells]
+uint32 height
+# The origin of the map [m, m, rad].  This is the real-world pose of the
+# cell (0,0) in the map.
+robot_msgs/Pose origin
\ No newline at end of file


Property changes on: pkg/trunk/stacks/common_msgs/nav_msgs/msg/MapMetaData.msg
___________________________________________________________________
Added: svn:mergeinfo
   + /pkg/branches/gazebo-branch-merge/common/robot_msgs/msg/MapMetaData.msg:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334

Copied: pkg/trunk/stacks/common_msgs/nav_msgs/msg/OccGrid.msg (from rev 17898, pkg/trunk/stacks/common_msgs/robot_msgs/msg/OccGrid.msg)
===================================================================
--- pkg/trunk/stacks/common_msgs/nav_msgs/msg/OccGrid.msg	                        (rev 0)
+++ pkg/trunk/stacks/common_msgs/nav_msgs/msg/OccGrid.msg	2009-06-29 23:52:46 UTC (rev 17918)
@@ -0,0 +1,10 @@
+# A 2-D grid map, in which each cell represents the probability of
+# occupancy.  Occupancy values are integers in the range [0,100], or -1 
+# for unknown.
+
+#MetaData for the map
+MapMetaData info
+
+# The map data, in row-major order, starting with (0,0).  Occupancy
+# probabilities are in the range [0,100].  Unknown is -1.
+byte[] data


Property changes on: pkg/trunk/stacks/common_msgs/nav_msgs/msg/OccGrid.msg
___________________________________________________________________
Added: svn:mergeinfo
   + /pkg/branches/gazebo-branch-merge/common/robot_msgs/msg/OccGrid.msg:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334

Deleted: pkg/trunk/stacks/common_msgs/robot_msgs/msg/MapMetaData.msg
===================================================================
--- pkg/trunk/stacks/common_msgs/robot_msgs/msg/MapMetaData.msg	2009-06-29 23:31:41 UTC (rev 17917)
+++ pkg/trunk/stacks/common_msgs/robot_msgs/msg/MapMetaData.msg	2009-06-29 23:52:46 UTC (rev 17918)
@@ -1,11 +0,0 @@
-# The time at which the map was loaded
-time map_load_time
-# The map resolution [m/cell]
-float32 resolution
-# Map width [cells]
-uint32 width
-# Map height [cells]
-uint32 height
-# The origin of the map [m, m, rad].  This is the real-world pose of the
-# cell (0,0) in the map.
-robot_msgs/Pose origin
\ No newline at end of file

Deleted: pkg/trunk/stacks/common_msgs/robot_msgs/msg/OccGrid.msg
===================================================================
--- pkg/trunk/stacks/common_msgs/robot_msgs/msg/OccGrid.msg	2009-06-29 23:31:41 UTC (rev 17917)
+++ pkg/trunk/stacks/common_msgs/robot_msgs/msg/OccGrid.msg	2009-06-29 23:52:46 UTC (rev 17918)
@@ -1,10 +0,0 @@
-# A 2-D grid map, in which each cell represents the probability of
-# occupancy.  Occupancy values are integers in the range [0,100], or -1 
-# for unknown.
-
-#MetaData for the map
-MapMetaData info
-
-# The map data, in row-major order, starting with (0,0).  Occupancy
-# probabilities are in the range [0,100].  Unknown is -1.
-byte[] data

Modified: pkg/trunk/stacks/common_msgs/robot_srvs/manifest.xml
===================================================================
--- pkg/trunk/stacks/common_msgs/robot_srvs/manifest.xml	2009-06-29 23:31:41 UTC (rev 17917)
+++ pkg/trunk/stacks/common_msgs/robot_srvs/manifest.xml	2009-06-29 23:52:46 UTC (rev 17918)
@@ -11,6 +11,7 @@
   <logo>http://www.willowgarage.com/files/willowgarage/robot10.jpg</logo>
   <depend package="std_msgs"/>
   <depend package="robot_msgs"/>
+  <depend package="nav_msgs"/><!-- will not be needed when StaticMap is moved to nav_srvs -->
   <export>
     <cpp cflags="-I${prefix}/srv/cpp"/>
   </export>

Modified: pkg/trunk/stacks/common_msgs/robot_srvs/srv/StaticMap.srv
===================================================================
--- pkg/trunk/stacks/common_msgs/robot_srvs/srv/StaticMap.srv	2009-06-29 23:31:41 UTC (rev 17917)
+++ pkg/trunk/stacks/common_msgs/robot_srvs/srv/StaticMap.srv	2009-06-29 23:52:46 UTC (rev 17918)
@@ -1,2 +1,2 @@
 ---
-robot_msgs/OccGrid map
+nav_msgs/OccGrid map

Modified: pkg/trunk/stacks/visualization/rviz/src/rviz/displays/map_display.h
===================================================================
--- pkg/trunk/stacks/visualization/rviz/src/rviz/displays/map_display.h	2009-06-29 23:31:41 UTC (rev 17917)
+++ pkg/trunk/stacks/visualization/rviz/src/rviz/displays/map_display.h	2009-06-29 23:52:46 UTC (rev 17918)
@@ -37,7 +37,7 @@
 #include <OGRE/OgreMaterial.h>
 #include <OGRE/OgreVector3.h>
 
-#include <robot_msgs/MapMetaData.h>
+#include <nav_msgs/MapMetaData.h>
 #include <ros/time.h>
 #include "ros/node.h" //\todo Convert to node handle API
 
@@ -127,7 +127,7 @@
   float map_request_timer_;
 
   bool new_metadata_;
-  robot_msgs::MapMetaData metadata_message_;
+  nav_msgs::MapMetaData metadata_message_;
   ros::Time last_loaded_map_time_;
 
   boost::thread request_thread_;

Modified: pkg/trunk/stacks/visualization/rviz/src/rviz/displays/poly_line_2d_display.h
===================================================================
--- pkg/trunk/stacks/visualization/rviz/src/rviz/displays/poly_line_2d_display.h	2009-06-29 23:31:41 UTC (rev 17917)
+++ pkg/trunk/stacks/visualization/rviz/src/rviz/displays/poly_line_2d_display.h	2009-06-29 23:52:46 UTC (rev 17918)
@@ -36,7 +36,7 @@
 #include "properties/forwards.h"
 
 #include <visualization_msgs/Polyline.h>
-#include <robot_msgs/MapMetaData.h>
+#include <nav_msgs/MapMetaData.h>
 
 #include <boost/shared_ptr.hpp>
 
@@ -147,7 +147,7 @@
   tf::MessageNotifier<visualization_msgs::Polyline>* notifier_;
 
   bool new_metadata_;
-  robot_msgs::MapMetaData metadata_message_;
+  nav_msgs::MapMetaData metadata_message_;
 
   ColorPropertyWPtr color_property_;
   ROSTopicStringPropertyWPtr topic_property_;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.