diff --git a/CFDStruct/CFDStructDataManager/CFDStructDataSolverBoundaryConditionManager.cpp b/CFDStruct/CFDStructDataManager/CFDStructDataSolverBoundaryConditionManager.cpp index 1314406..2107049 100644 --- a/CFDStruct/CFDStructDataManager/CFDStructDataSolverBoundaryConditionManager.cpp +++ b/CFDStruct/CFDStructDataManager/CFDStructDataSolverBoundaryConditionManager.cpp @@ -1608,16 +1608,37 @@ CUIConfig *CFDStructDataSolverBoundaryConditionManager::genCycleRotationUIConfig }, {}), new CUIConfig({ - {"type", "LineEdit"}, // 转轴方向 + {"type", "GroupBox"}, // 转轴方向 {"name", tr("Axis direction")}, - {"value_type", CUI_DATA_TYPE::CUI_DATA_TYPE_STRING}, - {"value_origin", QVA_GLOBAL(&m_RotationAxisDirection)}, + {"layout", "QHBoxLayout"}, + // {"value_type", CUI_DATA_TYPE::CUI_DATA_TYPE_STRING}, + // {"value_origin", QVA_GLOBAL(&m_RotationAxisDirection)}, }, - {}), + { + new CUIConfig({ + {"type", "LineEdit"}, + {"name", "X:"}, + {"value_type", CUI_DATA_TYPE::CUI_DATA_TYPE_DOUBLE}, + {"value_origin", m_per_rot_aixsX}, + }), + new CUIConfig({ + {"type", "LineEdit"}, + {"name", "Y:"}, + {"value_type", CUI_DATA_TYPE::CUI_DATA_TYPE_DOUBLE}, + {"value_origin", m_per_rot_aixsY}, + }), + new CUIConfig({ + {"type", "LineEdit"}, + {"name", "Z:"}, + {"value_type", CUI_DATA_TYPE::CUI_DATA_TYPE_DOUBLE}, + {"value_origin", m_per_rot_aixsZ}, + }), + + }), new CUIConfig({ {"type", "LineEdit"}, // 旋转角 {"name", tr("Rotation angle")}, - {"value_type", CUI_DATA_TYPE::CUI_DATA_TYPE_STRING}, + {"value_type", CUI_DATA_TYPE::CUI_DATA_TYPE_DOUBLE}, {"value_origin", QVA_GLOBAL(&m_RotationAngle)}, }, {}), diff --git a/CFDStruct/CFDStructDataManager/CFDStructDataSolverBoundaryConditionManager.h b/CFDStruct/CFDStructDataManager/CFDStructDataSolverBoundaryConditionManager.h index 366ef9f..823f4b6 100644 --- a/CFDStruct/CFDStructDataManager/CFDStructDataSolverBoundaryConditionManager.h +++ b/CFDStruct/CFDStructDataManager/CFDStructDataSolverBoundaryConditionManager.h @@ -122,10 +122,13 @@ class CFDSTRUCTDATAMANAGER_EXPORT CFDStructDataSolverBoundaryConditionManager : QString m_RotationCenter; // Rotation Center // 转轴方向 - QString m_RotationAxisDirection; // Rotation Axis Direction + // QString m_RotationAxisDirection; // Rotation Axis Direction + double m_per_rot_aixsX = 0; + double m_per_rot_aixsY = 0; + double m_per_rot_aixsZ = 0; // 旋转角 - QString m_RotationAngle; // Rotation Angle + double m_RotationAngle; // Rotation Angle // 壁面类型 int m_WallType = 0; // Wall Type