diff --git a/QtMeshViewer/Header/SettingsManager.h b/QtMeshViewer/Header/SettingsManager.h index e972b2d..89cc430 100644 --- a/QtMeshViewer/Header/SettingsManager.h +++ b/QtMeshViewer/Header/SettingsManager.h @@ -23,19 +23,18 @@ public: // attributes private: QFile file; + QString listOfDirs; QVector3D m_bgColorOn = { 5, 5, 5 }; QVector3D m_bgColorOff = { 128, 204, 255 }; + QVector3D m_lightColor = { 255,255,255 }; bool m_bfCulling = false; bool m_light = false; - - QString listOfDirs; - int m_lightType = 1; // 1 = direct, 2 = point - QVector3D m_lightColor = { 255,255,255 }; - float m_attenuation = 0.0f; - float m_ambient = 0.005f; bool m_headlight = false; bool m_autoColor = true; + float m_attenuation = 0.0f; + float m_ambient = 0.005f; + int m_lightType = 1; // 1 = direct, 2 = point // functions private: diff --git a/QtMeshViewer/Header/SettingsWindow.h b/QtMeshViewer/Header/SettingsWindow.h index 02f4f43..80b9492 100644 --- a/QtMeshViewer/Header/SettingsWindow.h +++ b/QtMeshViewer/Header/SettingsWindow.h @@ -17,6 +17,7 @@ private: Ui::SettingsWindow* ui; void setupConnections(); + void updateDirList(); private: QString dirList; diff --git a/QtMeshViewer/Source/SettingsWindow.cpp b/QtMeshViewer/Source/SettingsWindow.cpp index 1e8af7f..4c11a97 100644 --- a/QtMeshViewer/Source/SettingsWindow.cpp +++ b/QtMeshViewer/Source/SettingsWindow.cpp @@ -3,7 +3,6 @@ #include #include - ///////////////////////////////////////////////////////////////////////// // constructor/destructor @@ -203,9 +202,22 @@ void SettingsWindow::on_addItem_clicked() QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks); ui->dirListWidget->insertItem(0,dirName); + updateDirList(); } void SettingsWindow::on_removeItem_clicked() { qDeleteAll(ui->dirListWidget->selectedItems()); + updateDirList(); +} + +void SettingsWindow::updateDirList() +{ + int size = ui->dirListWidget->count(); + QString dirs; + + for (int i = 0; i < size; i++) + dirs += ui->dirListWidget->item(i)->text() + ";"; + + SettingsManager::getInstance()->setListOfDirs(dirs); }