Updated panels order in Preferences dialog. MainWindow: Removed working directory warning in monitoring mode.

This commit is contained in:
matlabbe
2016-01-12 14:54:20 -05:00
parent a7387d51de
commit f10c415e48
3 changed files with 886 additions and 833 deletions

View File

@@ -2566,14 +2566,7 @@ void MainWindow::applyPrefSettings(const rtabmap::ParametersMap & parameters, bo
{
if(parametersModified.erase(Parameters::kRtabmapWorkingDirectory()))
{
if(_state == kMonitoring || _state == kMonitoringPaused)
{
QMessageBox::information(this, tr("Working memory changed"), tr("The remote working directory can't be changed while the interface is in monitoring mode."));
}
else
{
QMessageBox::information(this, tr("Working memory changed"), tr("The working directory can't be changed while the detector is running. This will be applied when the detector will stop."));
}
QMessageBox::information(this, tr("Working memory changed"), tr("The working directory can't be changed while the detector is running. This will be applied when the detector will stop."));
}
if(postParamEvent)
{

View File

@@ -2953,11 +2953,11 @@ void PreferencesDialog::addParameter(const QObject * object, bool value)
{
// add all RGBD parameters!
this->addParameters(_ui->groupBox_slam_update);
this->addParameters(_ui->groupBox_graphOptimization);
this->addParameters(_ui->groupBox_localDetection_time);
this->addParameters(_ui->groupBox_localDetection_space);
this->addParameters(_ui->groupBox_graphOptimization2);
this->addParameters(_ui->groupBox_proximityDetection2);
this->addParameters(_ui->groupBox_visualTransform2);
this->addParameters(_ui->groupBox_icp2);
this->addParameters(_ui->groupBox_pathPlanning2);
}
if(groupBox)

File diff suppressed because it is too large Load Diff