diff --git a/CFDStruct/CFDOperatorsModel/CFDOperatorsModel.pro b/CFDStruct/CFDOperatorsModel/CFDOperatorsModel.pro index 4bb801f..afb428b 100644 --- a/CFDStruct/CFDOperatorsModel/CFDOperatorsModel.pro +++ b/CFDStruct/CFDOperatorsModel/CFDOperatorsModel.pro @@ -45,8 +45,6 @@ win32{ -lFITKFlowOFIOHDF5 \ -lOperatorsModel \ - - Debug:CONFIG += console Debug:DESTDIR = ../../output/bin_d Debug:MOC_DIR = ../../generate/CFDOperatorsModel/debug/moc diff --git a/CFDStruct/CFDStruct.pro b/CFDStruct/CFDStruct.pro index 3d3f82d..0a41f06 100644 --- a/CFDStruct/CFDStruct.pro +++ b/CFDStruct/CFDStruct.pro @@ -3,5 +3,5 @@ TEMPLATE = subdirs SUBDIRS += \ $$PWD/CFDStructGUI \ $$PWD/CUIProperty \ - $$PWD/CFDOperatorsModel \ \ - CFDStructDataManager + $$PWD/CFDOperatorsModel \ + $$PWD/CFDStructDataManager diff --git a/CFDStruct/CFDStructDataManager/CFDStructDataManager.pri b/CFDStruct/CFDStructDataManager/CFDStructDataManager.pri new file mode 100644 index 0000000..9548a90 --- /dev/null +++ b/CFDStruct/CFDStructDataManager/CFDStructDataManager.pri @@ -0,0 +1,8 @@ +SOURCES += \ + CFDStructDataManager.cpp \ + CFDStructTimeModeDataManager.cpp \ + +HEADERS += \ + CFDStructDataManager_global.h \ + CFDStructDataManager.h \ + CFDStructTimeModeDataManager.h diff --git a/CFDStruct/CFDStructDataManager/CFDStructDataManager.pro b/CFDStruct/CFDStructDataManager/CFDStructDataManager.pro index 3f3d459..469abc0 100644 --- a/CFDStruct/CFDStructDataManager/CFDStructDataManager.pro +++ b/CFDStruct/CFDStructDataManager/CFDStructDataManager.pro @@ -17,12 +17,7 @@ DEFINES += QT_DEPRECATED_WARNINGS # You can also select to disable deprecated APIs only up to a certain version of Qt. #DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 -SOURCES += \ - CFDStructDataManager.cpp - -HEADERS += \ - CFDStructDataManager_global.h \ - CFDStructDataManager.h +include(./CFDStructDataManager.pri) # Default rules for deployment. unix { diff --git a/CFDStruct/CFDStructDataManager/CFDStructTimeModeDataManager.cpp b/CFDStruct/CFDStructDataManager/CFDStructTimeModeDataManager.cpp new file mode 100644 index 0000000..6681aad --- /dev/null +++ b/CFDStruct/CFDStructDataManager/CFDStructTimeModeDataManager.cpp @@ -0,0 +1,7 @@ +#include "CFDStructTimeModeDataManager.h" + +CFDStructTimeModeDataManager &CFDStructTimeModeDataManager::GetInstance() +{ + static CFDStructTimeModeDataManager res; + return res; +} diff --git a/CFDStruct/CFDStructDataManager/CFDStructTimeModeDataManager.h b/CFDStruct/CFDStructDataManager/CFDStructTimeModeDataManager.h new file mode 100644 index 0000000..fb696ae --- /dev/null +++ b/CFDStruct/CFDStructDataManager/CFDStructTimeModeDataManager.h @@ -0,0 +1,15 @@ +#include "CFDStructDataManager_global.h" + +class CFDSTRUCTDATAMANAGER_EXPORT CFDStructTimeModeDataManager{ +public: + static int timeMode; + static int iterationSteps; + + static CFDStructTimeModeDataManager& GetInstance(); + + int& getTimeModeAddr(); + int& getIterationoStepsAddr(); +private: + CFDStructTimeModeDataManager(); + ~CFDStructTimeModeDataManager(); +};