Reorganize resources (#571)

modelica · Aug 23, 2024 · 8766e80 · 8766e80
1 parent 82afc3a
commit 8766e80
Show file tree

Hide file tree

Showing 84 changed files with 159 additions and 216 deletions.
diff --git a/fmusim-gui/AbstractModelVariablesModel.cpp b/fmusim-gui/AbstractModelVariablesModel.cpp
@@ -132,13 +132,13 @@ QVariant AbstractModelVariablesModel::columnData(const FMIModelVariable *variabl
             case FMIParameter:
             case FMIStructuralParameter:
             case FMICalculatedParameter:
-                return QIcon(":/variables/dark/float-parameter.svg");
+                return QIcon(":/variables/float-parameter.svg");
             case FMIInput:
-                return QIcon(":/variables/dark/float-input.svg");
+                return QIcon(":/variables/float-input.svg");
             case FMIOutput:
-                return QIcon(":/variables/dark/float-output.svg");
+                return QIcon(":/variables/float-output.svg");
             default:
-                return QIcon(":/variables/dark/float-variable.svg");
+                return QIcon(":/variables/float-variable.svg");
             }
         default:
             return QVariant();

diff --git a/fmusim-gui/BuildPlatformBinaryThread.cpp b/fmusim-gui/BuildPlatformBinaryThread.cpp
@@ -32,16 +32,16 @@ void BuildPlatformBinaryThread::run() {
 
     buildDirectory.setAutoRemove(removeBuilDirectory);
 
-    QFile::copy(":/resources/CMakeLists.txt", buildDirectory.filePath("CMakeLists.txt"));
+    QFile::copy(":/build/CMakeLists.txt", buildDirectory.filePath("CMakeLists.txt"));
 
     if (modelDescription->fmiMajorVersion == 2) {
-        QFile::copy(":/resources/fmi2Functions.h", buildDirectory.filePath("fmi2Functions.h"));
-        QFile::copy(":/resources/fmi2FunctionTypes.h", buildDirectory.filePath("fmi2FunctionTypes.h"));
-        QFile::copy(":/resources/fmi2TypesPlatform.h", buildDirectory.filePath("fmi2TypesPlatform.h"));
+        QFile::copy(":/build/fmi2Functions.h", buildDirectory.filePath("fmi2Functions.h"));
+        QFile::copy(":/build/fmi2FunctionTypes.h", buildDirectory.filePath("fmi2FunctionTypes.h"));
+        QFile::copy(":/build/fmi2TypesPlatform.h", buildDirectory.filePath("fmi2TypesPlatform.h"));
     } else {
-        QFile::copy(":/resources/fmi3Functions.h", buildDirectory.filePath("fmi3Functions.h"));
-        QFile::copy(":/resources/fmi3FunctionTypes.h", buildDirectory.filePath("fmi3FunctionTypes.h"));
-        QFile::copy(":/resources/fmi3PlatformTypes.h", buildDirectory.filePath("fmi3PlatformTypes.h"));
+        QFile::copy(":/build/fmi3Functions.h", buildDirectory.filePath("fmi3Functions.h"));
+        QFile::copy(":/build/fmi3FunctionTypes.h", buildDirectory.filePath("fmi3FunctionTypes.h"));
+        QFile::copy(":/build/fmi3PlatformTypes.h", buildDirectory.filePath("fmi3PlatformTypes.h"));
     }
 
     size_t nSourceFiles;

diff --git a/fmusim-gui/CMakeLists.txt b/fmusim-gui/CMakeLists.txt
@@ -46,7 +46,6 @@ if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
         ${PROJECT_SOURCES}
         ModelVariablesTableModel.h
         ModelVariablesTableModel.cpp
-        plot.html
         ../src/FMI1.c
         ../src/FMI2.c
         ../include/FMI1.h
@@ -88,20 +87,26 @@ if(${QT_VERSION_MAJOR} GREATER_EQUAL 6)
         ../fmusim/FMICVode.h
         ../fmusim/FMICVode.c
 
-        buttons.qrc
-        plot.qrc
-        icons/variables/variables.qrc
+        resources/buttons/buttons.qrc
+        resources/tools/tools.qrc
+
+        resources/plot/plot.html
+        resources/plot/plot.qrc
+
+        resources/variables/variables.qrc
+
         VariablesFilterModel.h VariablesFilterModel.cpp
         SimulationThread.h SimulationThread.cpp
-        resources.qrc
         BuildPlatformBinaryDialog.h BuildPlatformBinaryDialog.cpp BuildPlatformBinaryDialog.ui
         BuildPlatformBinaryThread.h BuildPlatformBinaryThread.cpp
 
         ModelVariablesTreeModel.h ModelVariablesTreeModel.cpp
         AbstractModelVariablesModel.h AbstractModelVariablesModel.cpp
         PlotUtil.h PlotUtil.cpp
 
-        resources/app-icon.rc
+        resources/icon/icon.qrc
+        resources/icon/icon.rc
+        resources/build/build.qrc
     )
 
 target_include_directories(fmusim-gui PRIVATE