i/rtabmap
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap.git synced 2026-09-09 21:10:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Removed ResetMemory action, disabled viewMesh action when there is no cloud received

Browse Source 
git-svn-id: http://rtabmap.googlecode.com/svn/trunk/rtabmap@1053 f169173b-cf89-36c8-b27e-44dbe73f0c83
This commit is contained in:
matlabbe
2013-12-13 15:41:21 +00:00
parent 4da46f5e1e
commit 3eeb911c33
5 changed files with 7 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
-4
View File
@@ -223,10 +223,6 @@ ADD_CUSTOM_TARGET(uninstall
####
# Setup RTABMapConfig.cmake
####
# Export the package for use from the build-tree
# (this registers the build-tree with a global CMake-registry)
export(PACKAGE RTABMap)
# Create the RTABMapConfig.cmake and RTABMapConfigVersion files
file(RELATIVE_PATH REL_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_CMAKE_DIR}" "${CMAKE_INSTALL_PREFIX}/${INSTALL_INCLUDE_DIR}")
file(RELATIVE_PATH REL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_CMAKE_DIR}" "${CMAKE_INSTALL_PREFIX}/${INSTALL_LIB_DIR}")
RTABMapConfig.cmake.in
-1
View File
@@ -7,7 +7,6 @@
get_filename_component(RTABMap_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
set(RTABMap_INCLUDE_DIRS "@CONF_INCLUDE_DIRS@")
# These are IMPORTED targets created by RTABMapTargets.cmake
find_library(CORE_LIB NAMES rtabmap_core NO_DEFAULT_PATH HINTS "@CONF_LIB_DIR@")
find_library(GUI_LIB NAMES rtabmap_gui NO_DEFAULT_PATH HINTS "@CONF_LIB_DIR@")
find_library(UTILITE_LIB NAMES rtabmap_utilite NO_DEFAULT_PATH HINTS "@CONF_LIB_DIR@")
guilib/include/rtabmap/gui/MainWindow.h
-1
View File
@@ -112,7 +112,6 @@ private slots:
void selectStream();
void selectDatabase();
void selectOpenni();
void resetTheMemory();
void dumpTheMemory();
void dumpThePrediction();
void downloadAllClouds();
guilib/src/MainWindow.cpp
+6 -15
View File
@@ -138,7 +138,6 @@ MainWindow::MainWindow(PreferencesDialog * prefDialog, QWidget * parent) :
_ui->menuImage->setEnabled(false);
_ui->doubleSpinBox_stats_timeLimit->setEnabled(false);
_ui->label_timeLimit->setEnabled(false);
_ui->actionReset_the_memory->setVisible(false);
#endif
this->setWindowTitle(title);
this->setWindowIconText(tr("RTAB-Map"));
@@ -233,7 +232,6 @@ MainWindow::MainWindow(PreferencesDialog * prefDialog, QWidget * parent) :
connect(_ui->actionStart, SIGNAL(triggered()), this, SLOT(startDetection()));
connect(_ui->actionPause, SIGNAL(triggered()), this, SLOT(pauseDetection()));
connect(_ui->actionStop, SIGNAL(triggered()), this, SLOT(stopDetection()));
connect(_ui->actionReset_the_memory, SIGNAL(triggered()), this, SLOT(resetTheMemory()));
connect(_ui->actionDump_the_memory, SIGNAL(triggered()), this, SLOT(dumpTheMemory()));
connect(_ui->actionDump_the_prediction_matrix, SIGNAL(triggered()), this, SLOT(dumpThePrediction()));
connect(_ui->actionClear_cache, SIGNAL(triggered()), this, SLOT(clearTheCache()));
@@ -263,6 +261,8 @@ MainWindow::MainWindow(PreferencesDialog * prefDialog, QWidget * parent) :
_ui->actionPause->setShortcut(Qt::Key_Space);
_ui->actionSave_point_cloud->setEnabled(false);
_ui->actionView_high_res_point_cloud->setEnabled(false);
_ui->actionSave_mesh_ply_vtk_stl->setEnabled(false);
_ui->actionView_point_cloud_as_mesh->setEnabled(false);
_ui->actionReset_Odometry->setEnabled(false);
#if defined(Q_WS_MAC) or defined(Q_WS_WIN)
@@ -989,6 +989,8 @@ void MainWindow::updateMapCloud(const std::map<int, Transform> & poses, const Tr
//enable save cloud action
_ui->actionSave_point_cloud->setEnabled(true);
_ui->actionView_high_res_point_cloud->setEnabled(true);
_ui->actionSave_mesh_ply_vtk_stl->setEnabled(true);
_ui->actionView_point_cloud_as_mesh->setEnabled(true);
}
}
@@ -2236,13 +2238,6 @@ void MainWindow::selectOpenni()
}
void MainWindow::resetTheMemory()
{
this->post(new RtabmapEventCmd(RtabmapEventCmd::kCmdResetMemory));
_lastId = 0;
_lastIds.clear();
}
void MainWindow::dumpTheMemory()
{
this->post(new RtabmapEventCmd(RtabmapEventCmd::kCmdDumpMemory));
@@ -2278,6 +2273,8 @@ void MainWindow::clearTheCache()
//disable save cloud action
_ui->actionSave_point_cloud->setEnabled(false);
_ui->actionView_high_res_point_cloud->setEnabled(false);
_ui->actionSave_mesh_ply_vtk_stl->setEnabled(false);
_ui->actionView_point_cloud_as_mesh->setEnabled(false);
_likelihoodCurve->clear();
_rawLikelihoodCurve->clear();
_posteriorCurve->clear();
@@ -3122,7 +3119,6 @@ void MainWindow::changeState(MainWindow::State newState)
_ui->actionPause_on_match->setEnabled(true);
_ui->actionPause_on_local_loop_detection->setEnabled(true);
_ui->actionPause_when_a_loop_hypothesis_is_rejected->setEnabled(true);
_ui->actionReset_the_memory->setEnabled(true);
_ui->actionDump_the_memory->setEnabled(true);
_ui->actionDump_the_prediction_matrix->setEnabled(true);
_ui->actionDelete_memory->setEnabled(true);
@@ -3151,7 +3147,6 @@ void MainWindow::changeState(MainWindow::State newState)
_ui->actionPause_on_match->setEnabled(true);
_ui->actionPause_on_local_loop_detection->setEnabled(true);
_ui->actionPause_when_a_loop_hypothesis_is_rejected->setEnabled(true);
_ui->actionReset_the_memory->setEnabled(false);
_ui->actionDump_the_memory->setEnabled(false);
_ui->actionDump_the_prediction_matrix->setEnabled(false);
_ui->actionDelete_memory->setEnabled(false);
@@ -3190,7 +3185,6 @@ void MainWindow::changeState(MainWindow::State newState)
_ui->actionPause->setToolTip(tr("Pause"));
_ui->actionPause->setChecked(false);
_ui->statusbar->showMessage(tr("Detecting..."));
_ui->actionReset_the_memory->setEnabled(false);
_ui->actionDump_the_memory->setEnabled(false);
_ui->actionDump_the_prediction_matrix->setEnabled(false);
_ui->actionDelete_memory->setEnabled(false);
@@ -3221,7 +3215,6 @@ void MainWindow::changeState(MainWindow::State newState)
_ui->actionPause->setToolTip(tr("Continue (shift-click for step-by-step)"));
_ui->actionPause->setChecked(true);
_ui->statusbar->showMessage(tr("Paused..."));
_ui->actionReset_the_memory->setEnabled(true);
_ui->actionDump_the_memory->setEnabled(true);
_ui->actionDump_the_prediction_matrix->setEnabled(true);
_ui->actionDelete_memory->setEnabled(true);
@@ -3258,7 +3251,6 @@ void MainWindow::changeState(MainWindow::State newState)
_ui->actionPause_on_local_loop_detection->setEnabled(true);
_ui->actionPause_when_a_loop_hypothesis_is_rejected->setEnabled(true);
_ui->actionReset_Odometry->setEnabled(true);
_ui->actionReset_the_memory->setVisible(false);
_ui->actionDump_the_memory->setVisible(false);
_ui->actionDump_the_prediction_matrix->setVisible(false);
_ui->actionDelete_memory->setEnabled(true);
@@ -3286,7 +3278,6 @@ void MainWindow::changeState(MainWindow::State newState)
_ui->actionPause_on_local_loop_detection->setEnabled(true);
_ui->actionPause_when_a_loop_hypothesis_is_rejected->setEnabled(true);
_ui->actionReset_Odometry->setEnabled(true);
_ui->actionReset_the_memory->setVisible(false);
_ui->actionDump_the_memory->setVisible(false);
_ui->actionDump_the_prediction_matrix->setVisible(false);
_ui->actionDelete_memory->setEnabled(true);
guilib/src/ui/mainWindow.ui
+1 -7
View File
@@ -102,7 +102,7 @@
<x>0</x>
<y>0</y>
<width>809</width>
<height>25</height>
<height>21</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">
@@ -121,7 +121,6 @@
<addaction name="actionOpen_working_directory"/>
<addaction name="actionPrint_loop_closure_IDs_to_console"/>
<addaction name="separator"/>
<addaction name="actionReset_the_memory"/>
<addaction name="actionDelete_memory"/>
<addaction name="actionClear_cache"/>
<addaction name="separator"/>
@@ -689,11 +688,6 @@
<string>Stop</string>
</property>
</action>
<action name="actionReset_the_memory">
<property name="text">
<string>Save/reload the memory</string>
</property>
</action>
<action name="actionApply_settings_to_the_detector">
<property name="text">
<string>Apply settings to detector</string>