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

GUI: Fixed loaded parameters not actually modified from opened database

Browse Source
This commit is contained in:
matlabbe
2016-07-20 17:07:35 -04:00
parent 1e47271c91
commit d7b1d617ea
3 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
guilib/include/rtabmap/gui/PreferencesDialog.h
+3 -1
View File
@@ -129,7 +129,7 @@ public:
QString loadCustomConfig(const QString & section, const QString & key); QString loadCustomConfig(const QString & section, const QString & key);
rtabmap::ParametersMap getAllParameters() const; rtabmap::ParametersMap getAllParameters() const;
void setParameter(const std::string & key, const std::string & value); void updateParameters(const ParametersMap & parameters);
//General panel //General panel
int getGeneralLoggerLevel() const; int getGeneralLoggerLevel() const;
@@ -317,6 +317,8 @@ protected:
virtual void writeCameraSettings(const QString & filePath = QString()) const; virtual void writeCameraSettings(const QString & filePath = QString()) const;
virtual void writeCoreSettings(const QString & filePath = QString()) const; virtual void writeCoreSettings(const QString & filePath = QString()) const;
void setParameter(const std::string & key, const std::string & value);
private: private:
void readSettings(const QString & filePath = QString()); void readSettings(const QString & filePath = QString());
void writeSettings(const QString & filePath = QString()); void writeSettings(const QString & filePath = QString());
guilib/src/MainWindow.cpp
+1 -4
View File
@@ -3797,10 +3797,7 @@ void MainWindow::openDatabase(const QString & path)
QMessageBox::Yes); QMessageBox::Yes);
if(r == QMessageBox::Yes) if(r == QMessageBox::Yes)
{ {
for(rtabmap::ParametersMap::const_iterator iter = differentParameters.begin(); iter!=differentParameters.end(); ++iter) _preferencesDialog->updateParameters(differentParameters);
{
_preferencesDialog->setParameter(iter->first.c_str(), iter->second.c_str());
}
} }
} }
} }
guilib/src/PreferencesDialog.cpp
+16 -1
View File
@@ -2649,6 +2649,21 @@ rtabmap::ParametersMap PreferencesDialog::getAllParameters() const
return parameters; return parameters;
} }
void PreferencesDialog::updateParameters(const ParametersMap & parameters)
{
if(parameters.size())
{
for(rtabmap::ParametersMap::const_iterator iter = parameters.begin(); iter!=parameters.end(); ++iter)
{
this->setParameter(iter->first, iter->second);
}
if(!this->isVisible())
{
this->writeSettings(getTmpIniFilePath());
}
}
}
void PreferencesDialog::selectSourceDriver(Src src) void PreferencesDialog::selectSourceDriver(Src src)
{ {
if(src >= kSrcRGBD && src<kSrcStereo) if(src >= kSrcRGBD && src<kSrcStereo)
@@ -3151,7 +3166,7 @@ void PreferencesDialog::addParameter(const QObject * object, double value)
{ {
if(object) if(object)
{ {
UDEBUG("modify param %s=%s", object->objectName().toStdString().c_str(), uBool2Str(value).c_str()); UDEBUG("modify param %s=%f", object->objectName().toStdString().c_str(), value);
uInsert(_modifiedParameters, rtabmap::ParametersPair(object->objectName().toStdString(), QString::number(value).toStdString())); uInsert(_modifiedParameters, rtabmap::ParametersPair(object->objectName().toStdString(), QString::number(value).toStdString()));
} }
else else