i/rtabmap_ros
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap_ros.git synced 2026-10-13 04:59:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

sync with rtabmap 0.12.3

Browse Source
This commit is contained in:
matlabbe
2017-03-12 21:47:22 -04:00
parent a264275404
commit 22c63924ca
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+1 -1
View File
@@ -18,7 +18,7 @@ find_package(rviz)
## System dependencies are found with CMake's conventions ## System dependencies are found with CMake's conventions
# find_package(Boost REQUIRED COMPONENTS system) # find_package(Boost REQUIRED COMPONENTS system)
find_package(RTABMap 0.12.2 REQUIRED) find_package(RTABMap 0.12.3 REQUIRED)
find_package(OpenCV REQUIRED) find_package(OpenCV REQUIRED)
include/rtabmap_ros/GuiWrapper.h
+1 -1
View File
@@ -60,7 +60,7 @@ public:
virtual ~GuiWrapper(); virtual ~GuiWrapper();
protected: protected:
virtual void handleEvent(UEvent * anEvent); virtual bool handleEvent(UEvent * anEvent);
private: private:
void infoMapCallback(const rtabmap_ros::InfoConstPtr & infoMsg, const rtabmap_ros::MapDataConstPtr & mapMsg); void infoMapCallback(const rtabmap_ros::InfoConstPtr & infoMsg, const rtabmap_ros::MapDataConstPtr & mapMsg);
src/CameraNode.cpp
+2 -1
View File
@@ -219,7 +219,7 @@ public:
} }
protected: protected:
virtual void handleEvent(UEvent * event) virtual bool handleEvent(UEvent * event)
{ {
if(event->getClassName().compare("CameraEvent") == 0) if(event->getClassName().compare("CameraEvent") == 0)
{ {
@@ -243,6 +243,7 @@ protected:
rosPublisher_.publish(rosMsg); rosPublisher_.publish(rosMsg);
} }
} }
return false;
} }
private: private:
src/GuiWrapper.cpp
+2 -1
View File
@@ -253,7 +253,7 @@ void GuiWrapper::processRequestedMap(const rtabmap_ros::MapData & map)
QMetaObject::invokeMethod(mainWindow_, "processRtabmapEvent3DMap", Q_ARG(rtabmap::RtabmapEvent3DMap, e)); QMetaObject::invokeMethod(mainWindow_, "processRtabmapEvent3DMap", Q_ARG(rtabmap::RtabmapEvent3DMap, e));
} }
void GuiWrapper::handleEvent(UEvent * anEvent) bool GuiWrapper::handleEvent(UEvent * anEvent)
{ {
if(anEvent->getClassName().compare("ParamEvent") == 0) if(anEvent->getClassName().compare("ParamEvent") == 0)
{ {
@@ -413,6 +413,7 @@ void GuiWrapper::handleEvent(UEvent * anEvent)
ROS_ERROR("Can't call \"reset_odom\" service, (will only work with rtabmap/visual_odometry node.)"); ROS_ERROR("Can't call \"reset_odom\" service, (will only work with rtabmap/visual_odometry node.)");
} }
} }
return false;
} }
void GuiWrapper::commonDepthCallback( void GuiWrapper::commonDepthCallback(