diff --git a/CFDStruct/CFDStructDataManager/CFDStructDataSolverBoundaryConditionManager.cpp b/CFDStruct/CFDStructDataManager/CFDStructDataSolverBoundaryConditionManager.cpp index ffbf269..ceec5d6 100644 --- a/CFDStruct/CFDStructDataManager/CFDStructDataSolverBoundaryConditionManager.cpp +++ b/CFDStruct/CFDStructDataManager/CFDStructDataSolverBoundaryConditionManager.cpp @@ -434,13 +434,37 @@ CUIConfig *CFDStructDataSolverBoundaryConditionManager::genPressureInletModeSupe {"name", tr("Surface Normal")}, }), }), - new CUIConfig({ - {"type", "LineEdit"}, // 方向矢量 - {"name", tr("Direction Vector(r,theta,z)")}, - {"value_type", CUI_DATA_TYPE::CUI_DATA_TYPE_STRING}, - {"value_origin", QVA_GLOBAL(&m_DirectionVector)}, + // new CUIConfig({ + // {"type", "LineEdit"}, // 方向矢量 + // {"name", tr("Direction Vector(r,theta,z)")}, + // {"value_type", CUI_DATA_TYPE::CUI_DATA_TYPE_STRING}, + // {"value_origin", QVA_GLOBAL(&m_DirectionVector)}, + // }, + // {}), + new CUIConfig({ + {"type", "GroupBox"}, // 方向矢量 + {"name", tr("Direction Vector")}, }, - {}), + { + new CUIConfig({ + {"type", "LineEdit"}, + {"name", "X:"}, + {"value_type", CUI_DATA_TYPE::CUI_DATA_TYPE_DOUBLE}, + {"value_origin", QVA_GLOBAL(&m_DirectionVectorX)}, + }), + new CUIConfig({ + {"type", "LineEdit"}, + {"name", "Y:"}, + {"value_type", CUI_DATA_TYPE::CUI_DATA_TYPE_DOUBLE}, + {"value_origin", QVA_GLOBAL(&m_DirectionVectorY)}, + }), + new CUIConfig({ + {"type", "LineEdit"}, + {"name", "Z:"}, + {"value_type", CUI_DATA_TYPE::CUI_DATA_TYPE_DOUBLE}, + {"value_origin", QVA_GLOBAL(&m_DirectionVectorZ)}, + }), + }), }), groupbox, @@ -630,13 +654,37 @@ CUIConfig *CFDStructDataSolverBoundaryConditionManager::genPressureInletModeSupe {"name", tr("Surface Normal")}, }), }), - new CUIConfig({ - {"type", "LineEdit"}, // 方向矢量 - {"name", tr("Direction Vector(x,y,z)")}, - {"value_type", CUI_DATA_TYPE::CUI_DATA_TYPE_STRING}, - {"value_origin", QVA_GLOBAL(&m_DirectionVector)}, + // new CUIConfig({ + // {"type", "LineEdit"}, // 方向矢量 + // {"name", tr("Direction Vector(x,y,z)")}, + // {"value_type", CUI_DATA_TYPE::CUI_DATA_TYPE_STRING}, + // {"value_origin", QVA_GLOBAL(&m_DirectionVector)}, + // }, + // {}), + new CUIConfig({ + {"type", "GroupBox"}, // 方向矢量 + {"name", tr("Direction Vector")}, }, - {}), + { + new CUIConfig({ + {"type", "LineEdit"}, + {"name", "X:"}, + {"value_type", CUI_DATA_TYPE::CUI_DATA_TYPE_DOUBLE}, + {"value_origin", QVA_GLOBAL(&m_DirectionVectorX)}, + }), + new CUIConfig({ + {"type", "LineEdit"}, + {"name", "Y:"}, + {"value_type", CUI_DATA_TYPE::CUI_DATA_TYPE_DOUBLE}, + {"value_origin", QVA_GLOBAL(&m_DirectionVectorY)}, + }), + new CUIConfig({ + {"type", "LineEdit"}, + {"name", "Z:"}, + {"value_type", CUI_DATA_TYPE::CUI_DATA_TYPE_DOUBLE}, + {"value_origin", QVA_GLOBAL(&m_DirectionVectorZ)}, + }), + }), }), groupbox, @@ -1010,13 +1058,37 @@ CUIConfig *CFDStructDataSolverBoundaryConditionManager::genPressureInletModeSubs {"name", tr("Surface Normal")}, }), }), + // new CUIConfig({ + // {"type", "LineEdit"}, // 方向矢量 + // {"name", tr("Direction Vector(r,theta,z)")}, + // {"value_type", CUI_DATA_TYPE::CUI_DATA_TYPE_STRING}, + // {"value_origin", QVA_GLOBAL(&m_DirectionVector)}, + // }, + // {}), new CUIConfig({ - {"type", "LineEdit"}, // 方向矢量 - {"name", tr("Direction Vector(r,theta,z)")}, - {"value_type", CUI_DATA_TYPE::CUI_DATA_TYPE_STRING}, - {"value_origin", QVA_GLOBAL(&m_DirectionVector)}, + {"type", "GroupBox"}, + {"name", tr("Direction Vector")}, }, - {}), + { + new CUIConfig({ + {"type", "LineEdit"}, + {"name", "X:"}, + {"value_type", CUI_DATA_TYPE::CUI_DATA_TYPE_DOUBLE}, + {"value_origin", QVA_GLOBAL(&m_DirectionVectorX)}, + }), + new CUIConfig({ + {"type", "LineEdit"}, + {"name", "Y:"}, + {"value_type", CUI_DATA_TYPE::CUI_DATA_TYPE_DOUBLE}, + {"value_origin", QVA_GLOBAL(&m_DirectionVectorY)}, + }), + new CUIConfig({ + {"type", "LineEdit"}, + {"name", "Z:"}, + {"value_type", CUI_DATA_TYPE::CUI_DATA_TYPE_DOUBLE}, + {"value_origin", QVA_GLOBAL(&m_DirectionVectorZ)}, + }), + }), }), groupbox, @@ -1201,13 +1273,37 @@ CUIConfig *CFDStructDataSolverBoundaryConditionManager::genPressureInletModeSubs {"name", tr("Surface Normal")}, }), }), - new CUIConfig({ - {"type", "LineEdit"}, // 方向矢量 - {"name", tr("Direction Vector(x,y,z)")}, - {"value_type", CUI_DATA_TYPE::CUI_DATA_TYPE_STRING}, - {"value_origin", QVA_GLOBAL(&m_DirectionVector)}, + // new CUIConfig({ + // {"type", "LineEdit"}, // 方向矢量 + // {"name", tr("Direction Vector(x,y,z)")}, + // {"value_type", CUI_DATA_TYPE::CUI_DATA_TYPE_STRING}, + // {"value_origin", QVA_GLOBAL(&m_DirectionVector)}, + // }, + // {}), + new CUIConfig({ + {"type", "GroupBox"}, // 方向矢量 + {"name", tr("Direction Vector")}, }, - {}), + { + new CUIConfig({ + {"type", "LineEdit"}, + {"name", "X:"}, + {"value_type", CUI_DATA_TYPE::CUI_DATA_TYPE_DOUBLE}, + {"value_origin", QVA_GLOBAL(&m_DirectionVectorX)}, + }), + new CUIConfig({ + {"type", "LineEdit"}, + {"name", "Y:"}, + {"value_type", CUI_DATA_TYPE::CUI_DATA_TYPE_DOUBLE}, + {"value_origin", QVA_GLOBAL(&m_DirectionVectorY)}, + }), + new CUIConfig({ + {"type", "LineEdit"}, + {"name", "Z:"}, + {"value_type", CUI_DATA_TYPE::CUI_DATA_TYPE_DOUBLE}, + {"value_origin", QVA_GLOBAL(&m_DirectionVectorZ)}, + }), + }), }), groupbox, @@ -1816,12 +1912,29 @@ CUIConfig *CFDStructDataSolverBoundaryConditionManager::genCycleTranslationUICon }), }), new CUIConfig({ - {"type", "LineEdit"}, // 平移距离 + {"type", "GroupBox"}, // 平移距离 {"name", tr("TranslationDistance")}, - {"value_type", CUI_DATA_TYPE::CUI_DATA_TYPE_STRING}, - {"value_origin", QVA_GLOBAL(&m_TranslationDistance)}, }, - {}), + { + new CUIConfig({ + {"type", "LineEdit"}, + {"name", "X:"}, + {"value_type", CUI_DATA_TYPE::CUI_DATA_TYPE_DOUBLE}, + {"value_origin", QVA_GLOBAL(&m_TranslationDistanceX)}, + }), + new CUIConfig({ + {"type", "LineEdit"}, + {"name", "Y:"}, + {"value_type", CUI_DATA_TYPE::CUI_DATA_TYPE_DOUBLE}, + {"value_origin", QVA_GLOBAL(&m_TranslationDistanceY)}, + }), + new CUIConfig({ + {"type", "LineEdit"}, + {"name", "Z:"}, + {"value_type", CUI_DATA_TYPE::CUI_DATA_TYPE_DOUBLE}, + {"value_origin", QVA_GLOBAL(&m_TranslationDistanceZ)}, + }), + }), }); return nullptr; } diff --git a/CFDStruct/CFDStructDataManager/CFDStructDataSolverBoundaryConditionManager.h b/CFDStruct/CFDStructDataManager/CFDStructDataSolverBoundaryConditionManager.h index a43f47b..a691cdb 100644 --- a/CFDStruct/CFDStructDataManager/CFDStructDataSolverBoundaryConditionManager.h +++ b/CFDStruct/CFDStructDataManager/CFDStructDataSolverBoundaryConditionManager.h @@ -121,7 +121,10 @@ class CFDSTRUCTDATAMANAGER_EXPORT CFDStructDataSolverBoundaryConditionManager : int m_PeriodicType = 0; // Periodic Type // 平移距离 - QString m_TranslationDistance; // Translation Distance + // QString m_TranslationDistance; // Translation Distance + double m_TranslationDistanceX = 0; + double m_TranslationDistanceY = 0; + double m_TranslationDistanceZ = 0; // 旋转中心 QString m_RotationCenter; // Rotation Center @@ -163,7 +166,10 @@ class CFDSTRUCTDATAMANAGER_EXPORT CFDStructDataSolverBoundaryConditionManager : int m_VelocityDirectionType = 0; // 方向矢量 - QString m_DirectionVector = ""; + // QString m_DirectionVector = ""; + double m_DirectionVectorX = 0; + double m_DirectionVectorY = 0; + double m_DirectionVectorZ = 0; // 边界类型，选中总压入口时，出现的子选项，可选声速、亚声速 int m_BoundaryType_sub = 0;