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

version 0.10.4: sync build with rtabmap_ros

Browse Source
This commit is contained in:
matlabbe
2015-08-03 17:55:38 -04:00
parent ce33ffe80a
commit e506873203
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+1 -1
View File
@@ -20,7 +20,7 @@ SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake_modules")
####################### #######################
SET(RTABMAP_MAJOR_VERSION 0) SET(RTABMAP_MAJOR_VERSION 0)
SET(RTABMAP_MINOR_VERSION 10) SET(RTABMAP_MINOR_VERSION 10)
SET(RTABMAP_PATCH_VERSION 3) SET(RTABMAP_PATCH_VERSION 4)
SET(RTABMAP_VERSION SET(RTABMAP_VERSION
${RTABMAP_MAJOR_VERSION}.${RTABMAP_MINOR_VERSION}.${RTABMAP_PATCH_VERSION}) ${RTABMAP_MAJOR_VERSION}.${RTABMAP_MINOR_VERSION}.${RTABMAP_PATCH_VERSION})
corelib/include/rtabmap/core/RtabmapEvent.h
+1
View File
@@ -70,6 +70,7 @@ public:
kCmdPublish3DMap, // params: [bool] global, [bool] optimized, [bool] graphOnly kCmdPublish3DMap, // params: [bool] global, [bool] optimized, [bool] graphOnly
kCmdTriggerNewMap, kCmdTriggerNewMap,
kCmdPause, kCmdPause,
kCmdResume,
kCmdGoal, // params: [string] label or [int] location ID kCmdGoal, // params: [string] label or [int] location ID
kCmdCancelGoal, kCmdCancelGoal,
kCmdLabel // params: [string] label or [int] location ID kCmdLabel // params: [string] label or [int] location ID
guilib/src/MainWindow.cpp
+2 -2
View File
@@ -5439,7 +5439,7 @@ void MainWindow::changeState(MainWindow::State newState)
_state = newState; _state = newState;
_elapsedTime->start(); _elapsedTime->start();
_oneSecondTimer->start(); _oneSecondTimer->start();
this->post(new RtabmapEventCmd(RtabmapEventCmd::kCmdPause, "", 0)); this->post(new RtabmapEventCmd(RtabmapEventCmd::kCmdResume));
break; break;
case kMonitoringPaused: case kMonitoringPaused:
_ui->actionPause->setToolTip(tr("Continue")); _ui->actionPause->setToolTip(tr("Continue"));
@@ -5457,7 +5457,7 @@ void MainWindow::changeState(MainWindow::State newState)
_ui->statusbar->showMessage(tr("Monitoring paused...")); _ui->statusbar->showMessage(tr("Monitoring paused..."));
_state = newState; _state = newState;
_oneSecondTimer->stop(); _oneSecondTimer->stop();
this->post(new RtabmapEventCmd(RtabmapEventCmd::kCmdPause, "", 1)); this->post(new RtabmapEventCmd(RtabmapEventCmd::kCmdPause));
break; break;
default: default:
break; break;