From c55c61c4e021dbeb440f597d4bc0feafef102470 Mon Sep 17 00:00:00 2001 From: mzh Date: Wed, 6 Nov 2024 15:19:30 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9rapidjson=E7=9A=84p?= =?UTF-8?q?ri=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CFDStruct/CFDStructDataManager/rapidjson.pri | 10 +++++++++- CFDStruct/CFDStructMain/CFDTreeWidget.cpp | 11 +---------- CFDStruct/CFDStructOperatorsModel/rapidjson.pri | 10 +++++++++- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/CFDStruct/CFDStructDataManager/rapidjson.pri b/CFDStruct/CFDStructDataManager/rapidjson.pri index 13652f1..3ada785 100644 --- a/CFDStruct/CFDStructDataManager/rapidjson.pri +++ b/CFDStruct/CFDStructDataManager/rapidjson.pri @@ -1 +1,9 @@ -INCLUDEPATH += ../../Tools/rapidjson-1.1.0/include/ \ +win32{ + INCLUDEPATH += ../../Tools/rapidjson-1.1.0/include/ \ +} + + +unix{ + INCLUDEPATH += ../../Tools/rapidjson-1.1.0/include/ \ + +} diff --git a/CFDStruct/CFDStructMain/CFDTreeWidget.cpp b/CFDStruct/CFDStructMain/CFDTreeWidget.cpp index 3457422..9988e42 100644 --- a/CFDStruct/CFDStructMain/CFDTreeWidget.cpp +++ b/CFDStruct/CFDStructMain/CFDTreeWidget.cpp @@ -235,16 +235,7 @@ namespace GUI SolutionAnalysisTreeEnum treeType = item->data(2, 0).value(); Interface::FITKGeoEnum::FITKGeometryComType geometryType = item->data(3, 0).value(); SolutionAnalysisModuleProperty sig = SolutionAnalysisModuleProperty::UNKNOW; -// QMap treeNodeToModuleProperty = { -// {SolutionAnalysisTreeEnum::SATree_ComputationalSetupTimeMode, SolutionAnalysisModuleProperty::Time_Mode} -// {SolutionAnalysisTreeEnum::SATree_ComputationalSetupComputationalDomainSolverBasicModel, SolutionAnalysisModuleProperty::Basic_Model} -// {SolutionAnalysisTreeEnum::SATree_ComputationalSetupComputationalDomainSolverViscosityModel, SolutionAnalysisModuleProperty::Time_Mode} -// {SolutionAnalysisTreeEnum::SATree_ComputationalSetupComputationalDomainSolverViscosityModel, SolutionAnalysisModuleProperty::Time_Mode} -// {SolutionAnalysisTreeEnum::SATree_ComputationalSetupComputationalDomainSolverNumericalMethods, SolutionAnalysisModuleProperty::Time_Mode} -// {SolutionAnalysisTreeEnum::SATree_ComputationalSetupComputationalDomainSolverMotionProperties, SolutionAnalysisModuleProperty::Time_Mode} -// {SolutionAnalysisTreeEnum::SATree_ComputationalSetupComputationalDomainSolverBoundaryConditionsPressureInlet, SolutionAnalysisModuleProperty::Time_Mode} -// {SolutionAnalysisTreeEnum::SATree_ComputationalSetupComputationalDomainSolverInitialization, SolutionAnalysisModuleProperty::Time_Mode} -// }; + switch (treeType) { case SolutionAnalysisTreeEnum::SATree_ComputationalSetupTimeMode: sig = SolutionAnalysisModuleProperty::Time_Mode; diff --git a/CFDStruct/CFDStructOperatorsModel/rapidjson.pri b/CFDStruct/CFDStructOperatorsModel/rapidjson.pri index 13652f1..3ada785 100644 --- a/CFDStruct/CFDStructOperatorsModel/rapidjson.pri +++ b/CFDStruct/CFDStructOperatorsModel/rapidjson.pri @@ -1 +1,9 @@ -INCLUDEPATH += ../../Tools/rapidjson-1.1.0/include/ \ +win32{ + INCLUDEPATH += ../../Tools/rapidjson-1.1.0/include/ \ +} + + +unix{ + INCLUDEPATH += ../../Tools/rapidjson-1.1.0/include/ \ + +}