updated rtabmap ros-pkg name to rtabmap_ros

src/rviz/InfoDisplay.cpp

@@ -26,7 +26,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include "InfoDisplay.h"
-#include "rtabmap/MsgConversion.h"
+#include "rtabmap_ros/MsgConversion.h"
 
 namespace rtabmap
 {
@@ -57,7 +57,7 @@ void InfoDisplay::onInitialize()
 	spinner_.start();
 }
 
-void InfoDisplay::processMessage( const rtabmap::InfoConstPtr& msg )
+void InfoDisplay::processMessage( const rtabmap_ros::InfoConstPtr& msg )
 {
 	{
 		boost::mutex::scoped_lock lock(info_mutex_);

src/rviz/InfoDisplay.h

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef INFO_DISPLAY_H
 #define INFO_DISPLAY_H
 
-#include <rtabmap/Info.h>
+#include <rtabmap_ros/Info.h>
 
 #include <rviz/message_filter_display.h>
 #include <rtabmap/core/Transform.h>
@@ -36,7 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 namespace rtabmap
 {
 
-class InfoDisplay: public rviz::MessageFilterDisplay<rtabmap::Info>
+class InfoDisplay: public rviz::MessageFilterDisplay<rtabmap_ros::Info>
 {
 Q_OBJECT
 public:
@@ -51,7 +51,7 @@ protected:
 	virtual void onInitialize();
 
 	/** @brief Process a single message.  Overridden from MessageFilterDisplay. */
-	virtual void processMessage( const rtabmap::InfoConstPtr& cloud );
+	virtual void processMessage( const rtabmap_ros::InfoConstPtr& cloud );
 
 private:
 	ros::AsyncSpinner spinner_;

src/rviz/MapCloudDisplay.cpp

@@ -51,8 +51,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "MapCloudDisplay.h"
 #include <rtabmap/core/Transform.h>
 #include <rtabmap/core/util3d.h>
-#include <rtabmap/MsgConversion.h>
-#include <rtabmap/GetMap.h>
+#include <rtabmap_ros/MsgConversion.h>
+#include <rtabmap_ros/GetMap.h>
 
 
 namespace rtabmap
@@ -232,14 +232,14 @@ void MapCloudDisplay::onInitialize()
 	spinner_.start();
 }
 
-void MapCloudDisplay::processMessage( const rtabmap::MapDataConstPtr& msg )
+void MapCloudDisplay::processMessage( const rtabmap_ros::MapDataConstPtr& msg )
 {
 	processMapData(*msg);
 
 	this->emitTimeSignal(msg->header.stamp);
 }
 
-void MapCloudDisplay::processMapData(const rtabmap::MapData& map)
+void MapCloudDisplay::processMapData(const rtabmap_ros::MapData& map)
 {
 	// Add new clouds...
 	for(unsigned int i=0; i<map.nodes.size() && i<map.nodes.size(); ++i)
@@ -468,7 +468,7 @@ void MapCloudDisplay::downloadMap()
 {
 	if(download_map_->getBool())
 	{
-		rtabmap::GetMap getMapSrv;
+		rtabmap_ros::GetMap getMapSrv;
 		getMapSrv.request.global = true;
 		getMapSrv.request.optimized = true;
 		getMapSrv.request.graphOnly = false;
@@ -526,7 +526,7 @@ void MapCloudDisplay::downloadGraph()
 {
 	if(download_graph_->getBool())
 	{
-		rtabmap::GetMap getMapSrv;
+		rtabmap_ros::GetMap getMapSrv;
 		getMapSrv.request.global = true;
 		getMapSrv.request.optimized = true;
 		getMapSrv.request.graphOnly = true;

src/rviz/MapCloudDisplay.h

@@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <queue>
 #include <vector>
 
-#include <rtabmap/MapData.h>
+#include <rtabmap_ros/MapData.h>
 #include <rtabmap/core/Transform.h>
 
 #include <pluginlib/class_loader.h>
@@ -67,7 +67,7 @@ class PointCloudCommon;
  * If you set the channel's name to "rgb", it will interpret the channel as an integer rgb value, with r, g and b
  * all being 8 bits.
  */
-class MapCloudDisplay: public rviz::MessageFilterDisplay<rtabmap::MapData>
+class MapCloudDisplay: public rviz::MessageFilterDisplay<rtabmap_ros::MapData>
 {
 Q_OBJECT
 public:
@@ -133,10 +133,10 @@ protected:
 	virtual void onInitialize();
 
 	/** @brief Process a single message.  Overridden from MessageFilterDisplay. */
-	virtual void processMessage( const rtabmap::MapDataConstPtr& cloud );
+	virtual void processMessage( const rtabmap_ros::MapDataConstPtr& cloud );
 
 private:
-	void processMapData(const rtabmap::MapData& map);
+	void processMapData(const rtabmap_ros::MapData& map);
 
 	/**
 	* \brief Transforms the cloud into the correct frame, and sets up our renderable cloud

src/rviz/MapGraphDisplay.cpp

@@ -82,7 +82,7 @@ void MapGraphDisplay::destroyObjects()
 	manual_objects_.clear();
 }
 
-void MapGraphDisplay::processMessage( const rtabmap::MapData::ConstPtr& msg )
+void MapGraphDisplay::processMessage( const rtabmap_ros::MapData::ConstPtr& msg )
 {
 	if(!(msg->maps.size() == msg->poseIDs.size() && msg->poses.size() == msg->poseIDs.size()))
 	{

src/rviz/MapGraphDisplay.h

@@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef RVIZ_PATH_DISPLAY_H
 #define RVIZ_PATH_DISPLAY_H
 
-#include <rtabmap/MapData.h>
+#include <rtabmap_ros/MapData.h>
 
 #include <rviz/message_filter_display.h>
 
@@ -53,7 +53,7 @@ namespace rtabmap
  * \class MapGraphDisplay
  * \brief Displays the graph in rtabmap::MapData message
  */
-class MapGraphDisplay: public MessageFilterDisplay<rtabmap::MapData>
+class MapGraphDisplay: public MessageFilterDisplay<rtabmap_ros::MapData>
 {
 Q_OBJECT
 public:
@@ -68,7 +68,7 @@ protected:
   virtual void onInitialize();
 
   /** @brief Overridden from MessageFilterDisplay. */
-  void processMessage( const rtabmap::MapData::ConstPtr& msg );
+  void processMessage( const rtabmap_ros::MapData::ConstPtr& msg );
 
 private:
   void destroyObjects();