diff --git a/CFDStruct/CFDOperatorsModel/CFDOperatorsBasicModelManager.h b/CFDStruct/CFDOperatorsModel/CFDOperatorsBasicModelManager.h index 07e3be1..a988600 100644 --- a/CFDStruct/CFDOperatorsModel/CFDOperatorsBasicModelManager.h +++ b/CFDStruct/CFDOperatorsModel/CFDOperatorsBasicModelManager.h @@ -8,7 +8,7 @@ namespace ModelOper { - class CFDOperatorsBasicModelManager :public OperManagerBase + class CFDOperatorsBasicModelManager : public OperManagerBase { Q_OBJECT; public: diff --git a/CFDStruct/CFDOperatorsModel/CFDOperatorsModel.pro b/CFDStruct/CFDOperatorsModel/CFDOperatorsModel.pro index 4bb801f..a328b7c 100644 --- a/CFDStruct/CFDOperatorsModel/CFDOperatorsModel.pro +++ b/CFDStruct/CFDOperatorsModel/CFDOperatorsModel.pro @@ -44,7 +44,7 @@ win32{ -lFITKInterfaceFlowOF \ -lFITKFlowOFIOHDF5 \ -lOperatorsModel \ - +# -lCFDStructDataManager \ Debug:CONFIG += console @@ -76,7 +76,7 @@ win32{ -lFITKInterfaceFlowOF \ -lFITKFlowOFIOHDF5 \ -lOperatorsModel \ - -lCFDStructDataManager \ +# -lCFDStructDataManager \ diff --git a/CFDStruct/CFDOperatorsModel/CFDOperatorsTimeModeManager.h b/CFDStruct/CFDOperatorsModel/CFDOperatorsTimeModeManager.h index 9a90866..8468463 100644 --- a/CFDStruct/CFDOperatorsModel/CFDOperatorsTimeModeManager.h +++ b/CFDStruct/CFDOperatorsModel/CFDOperatorsTimeModeManager.h @@ -3,12 +3,12 @@ //#include "OperManagerBase.h" #include "OperatorsModel/OperManagerBase.h" -#include "CFDStructDataManager/CFDStructDataManager.h" +//#include "CFDStructDataManager/CFDStructDataManager.h" namespace ModelOper { - class CFDOperatorsTimeModeManager :public OperManagerBase + class CFDOperatorsTimeModeManager : public OperManagerBase { Q_OBJECT; public: 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/CFDStructGUI/CFDStructGUI.pro b/CFDStruct/CFDStructGUI/CFDStructGUI.pro index e6c779b..c04a097 100644 --- a/CFDStruct/CFDStructGUI/CFDStructGUI.pro +++ b/CFDStruct/CFDStructGUI/CFDStructGUI.pro @@ -32,7 +32,11 @@ win32{ -lCUIProperty \ -lGUIWidget \ -lCFDOperatorsModel \ + -lFITKAppFramework \ + -lOperatorsModel \ -lFITKCore \ + -lOperatorsInterface \ + -lFITKInterfaceGeometry \ Debug:CONFIG += console @@ -47,7 +51,11 @@ win32{ -lCUIProperty \ -lGUIWidget \ -lCFDOperatorsModel \ + -lFITKAppFramework \ + -lOperatorsModel \ -lFITKCore \ + -lOperatorsInterface \ + -lFITKInterfaceGeometry \ Debug:LIBS += -L$$PWD/../../Tools/Win64/SARibbon/libd/ \ -lSARibbonBard \ diff --git a/FITK_Kernel/FITKPython/FITKPython.pro b/FITK_Kernel/FITKPython/FITKPython.pro index feee751..b85b04d 100644 --- a/FITK_Kernel/FITKPython/FITKPython.pro +++ b/FITK_Kernel/FITKPython/FITKPython.pro @@ -28,8 +28,6 @@ win32{ -L../../Tools/Win64/Python37/libs \ -L../../output/bin \ -lFITKCore \ - - Debug:CONFIG += console Debug:DESTDIR = ../../output/bin_d @@ -44,9 +42,6 @@ win32{ -L../../Tools/Win64/Python37/libs \ -L../../output/bin_d \ -lFITKCore \ - - - message("Windows FITKPython generated") }