Synchronized "Edit database" parameters with tmp ini file used in Main app

This commit is contained in:
matlabbe
2016-01-12 17:07:38 -05:00
parent 6928f09c87
commit 90525b75a9
2 changed files with 2 additions and 3 deletions

View File

@@ -109,6 +109,7 @@ public:
virtual ~PreferencesDialog(); virtual ~PreferencesDialog();
virtual QString getIniFilePath() const; virtual QString getIniFilePath() const;
virtual QString getTmpIniFilePath() const;
void init(); void init();
void setCurrentPanelToSource(); void setCurrentPanelToSource();
@@ -296,8 +297,6 @@ 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;
virtual QString getTmpIniFilePath() const;
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());

View File

@@ -3009,7 +3009,7 @@ void MainWindow::editDatabase()
QString path = QFileDialog::getOpenFileName(this, tr("Edit database..."), _preferencesDialog->getWorkingDirectory(), tr("RTAB-Map database files (*.db)")); QString path = QFileDialog::getOpenFileName(this, tr("Edit database..."), _preferencesDialog->getWorkingDirectory(), tr("RTAB-Map database files (*.db)"));
if(!path.isEmpty()) if(!path.isEmpty())
{ {
DatabaseViewer * viewer = new DatabaseViewer(_preferencesDialog->getIniFilePath(), this); DatabaseViewer * viewer = new DatabaseViewer(_preferencesDialog->getTmpIniFilePath(), this);
viewer->setWindowModality(Qt::WindowModal); viewer->setWindowModality(Qt::WindowModal);
viewer->setAttribute(Qt::WA_DeleteOnClose, true); viewer->setAttribute(Qt::WA_DeleteOnClose, true);
viewer->showCloseButton(); viewer->showCloseButton();