From b505b4519af9a71d6bb62a2f27d24ae45e163f7a Mon Sep 17 00:00:00 2001
From: matlabbe <matlabbe@gmail.com>
Date: Tue, 12 Jan 2016 15:41:55 -0500
Subject: [PATCH] PreferencesDialog: _parameters and _modifiedParameters are
 now private

---
 guilib/include/rtabmap/gui/PreferencesDialog.h | 8 ++++----
 guilib/src/PreferencesDialog.cpp               | 3 +--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/guilib/include/rtabmap/gui/PreferencesDialog.h b/guilib/include/rtabmap/gui/PreferencesDialog.h
index 5c254a3b..6c7bc5a6 100644
--- a/guilib/include/rtabmap/gui/PreferencesDialog.h
+++ b/guilib/include/rtabmap/gui/PreferencesDialog.h
@@ -288,12 +288,10 @@ protected:
 
 	virtual QString getParamMessage();
 
-	virtual void readSettings(const QString & filePath = QString());
 	virtual void readGuiSettings(const QString & filePath = QString());
 	virtual void readCameraSettings(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 writeCameraSettings(const QString & filePath = QString()) const;
 	virtual void writeCoreSettings(const QString & filePath = QString()) const;
@@ -301,6 +299,8 @@ protected:
 	virtual QString getTmpIniFilePath() const;
 
 private:
+	void readSettings(const QString & filePath = QString());
+	void writeSettings(const QString & filePath = QString());
 	bool validateForm();
 	void setupSignals();
 	void setupKpRoiPanel();
@@ -317,11 +317,11 @@ private:
 	void readSettingsBegin();
 
 protected:
-	rtabmap::ParametersMap _parameters;
-	rtabmap::ParametersMap _modifiedParameters;
 	PANEL_FLAGS _obsoletePanels;
 
 private:
+	rtabmap::ParametersMap _modifiedParameters;
+	rtabmap::ParametersMap _parameters;
 	Ui_preferencesDialog * _ui;
 	QStandardItemModel * _indexModel;
 	bool _initialized;
diff --git a/guilib/src/PreferencesDialog.cpp b/guilib/src/PreferencesDialog.cpp
index 25fae2f3..63eed844 100644
--- a/guilib/src/PreferencesDialog.cpp
+++ b/guilib/src/PreferencesDialog.cpp
@@ -1344,7 +1344,6 @@ void PreferencesDialog::readSettings(const QString & filePath)
 	readCameraSettings(filePath);
 	if(!readCoreSettings(filePath))
 	{
-		_parameters.clear();
 		_modifiedParameters.clear();
 		_obsoletePanels = kPanelDummy;
 
@@ -2395,7 +2394,7 @@ QString PreferencesDialog::loadCustomConfig(const QString & section, const QStri
 const rtabmap::ParametersMap & PreferencesDialog::getAllParameters() const
 {
 	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;
 }