From 144a7f1e94100130d28fe28f6bda5624561fb993 Mon Sep 17 00:00:00 2001 From: matlabbe Date: Wed, 28 Oct 2015 20:05:04 -0400 Subject: [PATCH] Added rtabmap.launch --- launch/rtabmap.launch | 166 ++++++++++++++++++++++++++++++++++++++++++ src/CoreWrapper.cpp | 2 +- src/GuiWrapper.cpp | 4 +- 3 files changed, 170 insertions(+), 2 deletions(-) create mode 100644 launch/rtabmap.launch diff --git a/launch/rtabmap.launch b/launch/rtabmap.launch new file mode 100644 index 00000000..3b224d57 --- /dev/null +++ b/launch/rtabmap.launch @@ -0,0 +1,166 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/CoreWrapper.cpp b/src/CoreWrapper.cpp index 37f29ce2..9d764a3e 100644 --- a/src/CoreWrapper.cpp +++ b/src/CoreWrapper.cpp @@ -124,7 +124,7 @@ CoreWrapper::CoreWrapper(bool deleteDbOnStart) : pnh.param("subscribe_stereo", subscribeStereo, subscribeStereo); if(subscribeDepth && subscribeStereo) { - UWARN("Parameters subscribe_depth and subscribe_stereo cannot be true at the same time. Parameter subscribe_depth is set to false."); + ROS_WARN("rtabmap: Parameters subscribe_depth and subscribe_stereo cannot be true at the same time. Parameter subscribe_depth is set to false."); subscribeDepth = false; } if(subscribeLaserScan) diff --git a/src/GuiWrapper.cpp b/src/GuiWrapper.cpp index 216b7c7d..040e9f03 100644 --- a/src/GuiWrapper.cpp +++ b/src/GuiWrapper.cpp @@ -1212,7 +1212,9 @@ void GuiWrapper::setupCallbacks( if(subscribeDepth && subscribeStereo) { - ROS_WARN("\"subscribe_depth\" already true, ignoring \"subscribe_stereo\"."); + ROS_WARN("rtabmapviz: Parameters subscribe_depth and subscribe_stereo cannot be true at the " + "same time. Parameter subscribe_depth is set to false."); + subscribeDepth = false; } if(!subscribeDepth && !subscribeStereo && subscribeLaserScan) {