Added a init() method in PreferencesDialog

Fixed virtual method declarations in PreferencesDialogROS

git-svn-id: http://rtabmap.googlecode.com/svn/branches/0.3/rtabmap@88 f169173b-cf89-36c8-b27e-44dbe73f0c83
This commit is contained in:
matlabbe
2011-06-09 12:51:13 +00:00
parent 25c2a9f07e
commit 96681b8029
3 changed files with 14 additions and 5 deletions
@@ -74,6 +74,8 @@ public:
PreferencesDialog(QWidget * parent = 0); PreferencesDialog(QWidget * parent = 0);
virtual ~PreferencesDialog(); virtual ~PreferencesDialog();
void init();
void saveWindowGeometry(const QString & windowName, const QWidget * window); void saveWindowGeometry(const QString & windowName, const QWidget * window);
void loadWindowGeometry(const QString & windowName, QWidget * window); void loadWindowGeometry(const QString & windowName, QWidget * window);
void saveMainWindowState(const QMainWindow * mainWindow); void saveMainWindowState(const QMainWindow * mainWindow);
+1
View File
@@ -106,6 +106,7 @@ MainWindow::MainWindow(PreferencesDialog * prefDialog, QWidget * parent) :
{ {
_preferencesDialog = new PreferencesDialog(this); _preferencesDialog = new PreferencesDialog(this);
} }
_preferencesDialog->init();
// Restore window geometry // Restore window geometry
_preferencesDialog->loadMainWindowState(this); _preferencesDialog->loadMainWindowState(this);
+11 -5
View File
@@ -203,11 +203,6 @@ PreferencesDialog::PreferencesDialog(QWidget * parent) :
connect(_ui->treeView, SIGNAL(clicked(QModelIndex)), this, SLOT(clicked(QModelIndex))); connect(_ui->treeView, SIGNAL(clicked(QModelIndex)), this, SLOT(clicked(QModelIndex)));
_ui->treeView->expandToDepth(1); _ui->treeView->expandToDepth(1);
this->readSettings();
this->writeSettings();// This will create the ini file if not exist
this->loadWindowGeometry("PreferencesDialog", this);
_obsoletePanels = kPanelAll; _obsoletePanels = kPanelAll;
_initialized = true; _initialized = true;
} }
@@ -217,6 +212,17 @@ PreferencesDialog::~PreferencesDialog() {
delete _ui; delete _ui;
} }
void PreferencesDialog::init()
{
this->readSettings();
this->writeSettings();// This will create the ini file if not exist
this->loadWindowGeometry("PreferencesDialog", this);
_obsoletePanels = kPanelAll;
_initialized = true;
}
void PreferencesDialog::setupTreeView() void PreferencesDialog::setupTreeView()
{ {
QFile modelFile(":/resources/PreferencesModel.txt"); QFile modelFile(":/resources/PreferencesModel.txt");