Merge branch 'master' of https://github.com/introlab/rtabmap into devel

This commit is contained in:
matlabbe
2017-12-11 17:10:08 -05:00
6 changed files with 48 additions and 14 deletions

View File

@@ -263,7 +263,7 @@ private:
void saveFigures();
void loadFigures();
void exportPoses(int format);
QString captureScreen(bool cacheInRAM = false);
QString captureScreen(bool cacheInRAM = false, bool png = true);
protected:
Ui_mainWindow * ui() { return _ui; }
@@ -366,6 +366,7 @@ private:
QMap<int, QString> _exportPosesFileName;
bool _autoScreenCaptureOdomSync;
bool _autoScreenCaptureRAM;
bool _autoScreenCapturePNG;
QMap<QString, QByteArray> _autoScreenCaptureCachedImages;
QVector<int> _refIds;