rtabmap: parameters passed by arguments override those in the database loaded from command line. Dictionary: set words saved to avoid saving them in database (causing db error when remapping from an old db created by fixed dictionary). G2O: ba supporting words with negative ids.

This commit is contained in:
matlabbe
2018-07-27 16:01:17 -04:00
parent b63590bf1d
commit 4d5b42ab79
7 changed files with 80 additions and 20 deletions

View File

@@ -4511,7 +4511,7 @@ void MainWindow::openDatabase()
}
}
void MainWindow::openDatabase(const QString & path)
void MainWindow::openDatabase(const QString & path, const ParametersMap & overridedParameters)
{
if(_state != MainWindow::kIdle)
{
@@ -4547,6 +4547,8 @@ void MainWindow::openDatabase(const QString & path)
parameters.insert(*iter);
}
uInsert(parameters, overridedParameters);
ParametersMap currentParameters = _preferencesDialog->getAllParameters();
ParametersMap differentParameters;
for(ParametersMap::iterator iter=parameters.begin(); iter!=parameters.end(); ++iter)