merged multicamera branch into devel branch

This commit is contained in:
Mathieu Labbe
2015-06-16 17:41:51 -04:00
61 changed files with 3383 additions and 2918 deletions
+2 -2
View File
@@ -52,7 +52,7 @@ namespace rtabmap
{
class Memory;
class ImageView;
class Signature;
class SensorData;
class CloudViewer;
class RTABMAPGUI_EXP DatabaseViewer : public QMainWindow
@@ -125,7 +125,7 @@ private:
QLabel * labelMapId,
QLabel * labelPose,
bool updateConstraintView);
void updateStereo(const Signature * data);
void updateStereo(const SensorData * data);
void updateWordsMatching();
void updateConstraintView(
const rtabmap::Link & link,