sync with rtabmap 0.12.3

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
+1 -1
View File
@@ -18,7 +18,7 @@ find_package(rviz)
## System dependencies are found with CMake's conventions
# find_package(Boost REQUIRED COMPONENTS system)
find_package(RTABMap 0.12.2 REQUIRED)
find_package(RTABMap 0.12.3 REQUIRED)
find_package(OpenCV REQUIRED)
+1 -1
View File
@@ -60,7 +60,7 @@ public:
virtual ~GuiWrapper();
protected:
virtual void handleEvent(UEvent * anEvent);
virtual bool handleEvent(UEvent * anEvent);
private:
void infoMapCallback(const rtabmap_ros::InfoConstPtr & infoMsg, const rtabmap_ros::MapDataConstPtr & mapMsg);
+2 -1
View File
@@ -219,7 +219,7 @@ public:
}
protected:
virtual void handleEvent(UEvent * event)
virtual bool handleEvent(UEvent * event)
{
if(event->getClassName().compare("CameraEvent") == 0)
{
@@ -243,6 +243,7 @@ protected:
rosPublisher_.publish(rosMsg);
}
}
return false;
}
private:
+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));
}
void GuiWrapper::handleEvent(UEvent * anEvent)
bool GuiWrapper::handleEvent(UEvent * anEvent)
{
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.)");
}
}
return false;
}
void GuiWrapper::commonDepthCallback(