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

MainWindow: working directory of GUI widgets can be updated when running

Browse Source
This commit is contained in:
matlabbe
2016-04-13 11:58:54 -04:00
parent 9339b86633
commit 809f5dd4df
2 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
guilib/src/MainWindow.cpp
+7 -9
View File
@@ -2975,6 +2975,13 @@ void MainWindow::applyPrefSettings(const rtabmap::ParametersMap & parameters, bo
rtabmap::ParametersMap parametersModified = parameters; rtabmap::ParametersMap parametersModified = parameters;
if(uContains(parameters, Parameters::kRtabmapWorkingDirectory()))
{
_ui->statsToolBox->setWorkingDirectory(_preferencesDialog->getWorkingDirectory());
_ui->graphicsView_graphView->setWorkingDirectory(_preferencesDialog->getWorkingDirectory());
_ui->widget_cloudViewer->setWorkingDirectory(_preferencesDialog->getWorkingDirectory());
}
if(_state != kIdle && parametersModified.size()) if(_state != kIdle && parametersModified.size())
{ {
if(parametersModified.erase(Parameters::kRtabmapWorkingDirectory()) && if(parametersModified.erase(Parameters::kRtabmapWorkingDirectory()) &&
@@ -2992,14 +2999,6 @@ void MainWindow::applyPrefSettings(const rtabmap::ParametersMap & parameters, bo
} }
} }
if(_state != kMonitoring && _state != kMonitoringPaused &&
uContains(parameters, Parameters::kRtabmapWorkingDirectory()))
{
_ui->statsToolBox->setWorkingDirectory(_preferencesDialog->getWorkingDirectory());
_ui->graphicsView_graphView->setWorkingDirectory(_preferencesDialog->getWorkingDirectory());
_ui->widget_cloudViewer->setWorkingDirectory(_preferencesDialog->getWorkingDirectory());
}
// update loop closure viewer parameters (Use Map parameters) // update loop closure viewer parameters (Use Map parameters)
_ui->widget_loopClosureViewer->setDecimation(_preferencesDialog->getCloudDecimation(0)); _ui->widget_loopClosureViewer->setDecimation(_preferencesDialog->getCloudDecimation(0));
_ui->widget_loopClosureViewer->setMaxDepth(_preferencesDialog->getCloudMaxDepth(0)); _ui->widget_loopClosureViewer->setMaxDepth(_preferencesDialog->getCloudMaxDepth(0));
@@ -5429,7 +5428,6 @@ void MainWindow::changeState(MainWindow::State newState)
_ui->actionDump_the_prediction_matrix->setVisible(!monitoring); _ui->actionDump_the_prediction_matrix->setVisible(!monitoring);
_ui->actionGenerate_map->setVisible(!monitoring); _ui->actionGenerate_map->setVisible(!monitoring);
_ui->actionUpdate_cache_from_database->setVisible(monitoring); _ui->actionUpdate_cache_from_database->setVisible(monitoring);
_ui->actionOpen_working_directory->setVisible(!monitoring);
_ui->actionData_recorder->setVisible(!monitoring); _ui->actionData_recorder->setVisible(!monitoring);
_ui->menuSelect_source->menuAction()->setVisible(!monitoring); _ui->menuSelect_source->menuAction()->setVisible(!monitoring);
_ui->doubleSpinBox_stats_imgRate->setVisible(!monitoring); _ui->doubleSpinBox_stats_imgRate->setVisible(!monitoring);
guilib/src/PreferencesDialog.cpp
-8
View File
@@ -2269,10 +2269,6 @@ void PreferencesDialog::showEvent ( QShowEvent * event )
if(_monitoringState) if(_monitoringState)
{ {
// In monitoring state, you cannot change remote paths // In monitoring state, you cannot change remote paths
_ui->lineEdit_workingDirectory->setEnabled(false);
_ui->toolButton_workingDirectory->setEnabled(false);
_ui->label_workingDirectory->setEnabled(false);
_ui->lineEdit_dictionaryPath->setEnabled(false); _ui->lineEdit_dictionaryPath->setEnabled(false);
_ui->toolButton_dictionaryPath->setEnabled(false); _ui->toolButton_dictionaryPath->setEnabled(false);
_ui->label_dictionaryPath->setEnabled(false); _ui->label_dictionaryPath->setEnabled(false);
@@ -2287,10 +2283,6 @@ void PreferencesDialog::showEvent ( QShowEvent * event )
} }
else else
{ {
_ui->lineEdit_workingDirectory->setEnabled(true);
_ui->toolButton_workingDirectory->setEnabled(true);
_ui->label_workingDirectory->setEnabled(true);
_ui->lineEdit_dictionaryPath->setEnabled(true); _ui->lineEdit_dictionaryPath->setEnabled(true);
_ui->toolButton_dictionaryPath->setEnabled(true); _ui->toolButton_dictionaryPath->setEnabled(true);
_ui->label_dictionaryPath->setEnabled(true); _ui->label_dictionaryPath->setEnabled(true);