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

PreferencesDialog: _parameters and _modifiedParameters are now private

Browse Source
This commit is contained in:
matlabbe
2016-01-12 15:41:55 -05:00
parent 9a0a1fbcbe
commit b505b4519a
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
guilib/include/rtabmap/gui/PreferencesDialog.h
+4 -4
View File
@@ -288,12 +288,10 @@ protected:
virtual QString getParamMessage(); virtual QString getParamMessage();
virtual void readSettings(const QString & filePath = QString());
virtual void readGuiSettings(const QString & filePath = QString()); virtual void readGuiSettings(const QString & filePath = QString());
virtual void readCameraSettings(const QString & filePath = QString()); virtual void readCameraSettings(const QString & filePath = QString());
virtual bool readCoreSettings(const QString & filePath = QString()); virtual bool readCoreSettings(const QString & filePath = QString());
virtual void writeSettings(const QString & filePath = QString());
virtual void writeGuiSettings(const QString & filePath = QString()) const; virtual void writeGuiSettings(const QString & filePath = QString()) const;
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;
@@ -301,6 +299,8 @@ protected:
virtual QString getTmpIniFilePath() const; virtual QString getTmpIniFilePath() const;
private: private:
void readSettings(const QString & filePath = QString());
void writeSettings(const QString & filePath = QString());
bool validateForm(); bool validateForm();
void setupSignals(); void setupSignals();
void setupKpRoiPanel(); void setupKpRoiPanel();
@@ -317,11 +317,11 @@ private:
void readSettingsBegin(); void readSettingsBegin();
protected: protected:
rtabmap::ParametersMap _parameters;
rtabmap::ParametersMap _modifiedParameters;
PANEL_FLAGS _obsoletePanels; PANEL_FLAGS _obsoletePanels;
private: private:
rtabmap::ParametersMap _modifiedParameters;
rtabmap::ParametersMap _parameters;
Ui_preferencesDialog * _ui; Ui_preferencesDialog * _ui;
QStandardItemModel * _indexModel; QStandardItemModel * _indexModel;
bool _initialized; bool _initialized;
guilib/src/PreferencesDialog.cpp
+1 -2
View File
@@ -1344,7 +1344,6 @@ void PreferencesDialog::readSettings(const QString & filePath)
readCameraSettings(filePath); readCameraSettings(filePath);
if(!readCoreSettings(filePath)) if(!readCoreSettings(filePath))
{ {
_parameters.clear();
_modifiedParameters.clear(); _modifiedParameters.clear();
_obsoletePanels = kPanelDummy; _obsoletePanels = kPanelDummy;
@@ -2395,7 +2394,7 @@ QString PreferencesDialog::loadCustomConfig(const QString & section, const QStri
const rtabmap::ParametersMap & PreferencesDialog::getAllParameters() const const rtabmap::ParametersMap & PreferencesDialog::getAllParameters() const
{ {
UASSERT_MSG(_parameters.size() == Parameters::getDefaultParameters().size(), UASSERT_MSG(_parameters.size() == Parameters::getDefaultParameters().size(),
uFormat("%d vs %d", (int)_parameters.size(), (int)Parameters::getDefaultParameters().size()).c_str()); uFormat("%d vs %d (Is PreferencesDialog::init() called?)", (int)_parameters.size(), (int)Parameters::getDefaultParameters().size()).c_str());
return _parameters; return _parameters;
} }