diff --git a/QtMeshViewer/Form Files/MainWindow.ui b/QtMeshViewer/Form Files/MainWindow.ui index aa3bcaa..3fa1a4b 100644 --- a/QtMeshViewer/Form Files/MainWindow.ui +++ b/QtMeshViewer/Form Files/MainWindow.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 400 + 800 + 600 @@ -68,42 +68,20 @@ 0 - - - false - - - true - - - QAbstractItemView::DragOnly - - - QAbstractItemView::SelectItems - - - QAbstractItemView::ScrollPerPixel - - - true - - - false - - - - 1 - - - + + + + + + + + - - - + diff --git a/QtMeshViewer/Header/SettingsManager.h b/QtMeshViewer/Header/SettingsManager.h index 06ac7a7..66af75a 100644 --- a/QtMeshViewer/Header/SettingsManager.h +++ b/QtMeshViewer/Header/SettingsManager.h @@ -29,6 +29,7 @@ private: 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; @@ -47,6 +48,7 @@ public: bool isBfCulling() const; bool isLight() const; + QString getListOfDirs(); int getLightType() const; QVector3D getLightColor() const; float getAttenuation() const; @@ -69,4 +71,4 @@ public: void setHeadlight(bool value); void setAutoColor(int value); -}; \ No newline at end of file +}; diff --git a/QtMeshViewer/Source/SettingsManager.cpp b/QtMeshViewer/Source/SettingsManager.cpp index 496cb36..00b95c1 100644 --- a/QtMeshViewer/Source/SettingsManager.cpp +++ b/QtMeshViewer/Source/SettingsManager.cpp @@ -35,8 +35,19 @@ void SettingsManager::readFromFile() QList lines = stream.split('\n'); for (auto& it : lines) - { - if (it.startsWith("")) + { + if (it.startsWith("")) + { + QList values = it.right(it.size() - it.indexOf('>') - 1).split(';'); + for (int i = 0; i < values.size(); i++) + { + if (i == values.size() - 1) + listOfDirs.append(values[i]); + else + listOfDirs.append(values[i] + ";"); + } + } + else if (it.startsWith("")) { QList values = it.right(it.size() - it.indexOf('>') - 1).split(';'); @@ -107,12 +118,18 @@ void SettingsManager::writeToFile() file.write(QString("%1\n").arg(m_lightType).toUtf8()); file.write(QString("%1\n").arg(m_attenuation).toUtf8()); file.write(QString("%1\n").arg(m_ambient).toUtf8()); + file.write(QString("%1\n").arg(listOfDirs).toUtf8()); file.close(); } // getter /////////////////////////////////////////////////////////////// +QString SettingsManager::getListOfDirs() +{ + return listOfDirs; +} + QVector3D SettingsManager::getBgColorOn() const { return m_bgColorOn;