merged attention branch to trunk

git-svn-id: http://rtabmap.googlecode.com/svn/trunk/ros-pkg@657 f169173b-cf89-36c8-b27e-44dbe73f0c83
This commit is contained in:
matlabbe
2012-12-11 18:05:05 +00:00
parent 7eb9253e32
commit d8d9118a00
81 changed files with 126 additions and 4352 deletions
+3 -6
View File
@@ -9,8 +9,7 @@
#define GUIWRAPPER_H_
#include <ros/ros.h>
#include "rtabmap/RtabmapInfo.h"
#include "rtabmap/RtabmapInfoEx.h"
#include "rtabmap/InfoEx.h"
#include "utilite/UEventsHandler.h"
#include <geometry_msgs/TwistStamped.h>
@@ -33,12 +32,10 @@ protected:
virtual void handleEvent(UEvent * anEvent);
private:
void infoReceivedCallback(const rtabmap::RtabmapInfoConstPtr & infoMsg);
void velocityReceivedCallback(const geometry_msgs::TwistStampedConstPtr & msg);
void infoExReceivedCallback(const rtabmap::InfoExConstPtr & infoMsg);
private:
ros::Subscriber infoTopic_;
ros::Subscriber velocity_sub_;
ros::Subscriber infoExTopic_;
QApplication * app_;
rtabmap::MainWindow * mainWindow_;