diff --git a/CFDStruct/CFDStructDataManager/CFDStructDataSolverBasicModelManager.cpp b/CFDStruct/CFDStructDataManager/CFDStructDataSolverBasicModelManager.cpp index 7aae1f3..c3d7427 100644 --- a/CFDStruct/CFDStructDataManager/CFDStructDataSolverBasicModelManager.cpp +++ b/CFDStruct/CFDStructDataManager/CFDStructDataSolverBasicModelManager.cpp @@ -53,8 +53,8 @@ CUIConfig *CFDStructDataSolverBasicModelManager::genFluidPropertiesOffUIConfig() new CUIConfig({// 方形勾选:重叠网络 {"type", "CheckBox"}, {"name", tr("Overlay Network")}}), - new CUIConfig({// 圆形选择按钮:流体属性 - {"type", "RadioButton"}, + new CUIConfig({// 方形选择按钮:流体属性 + {"type", "CheckButton"}, {"name", tr("Fluid Properties")}})}); } diff --git a/CFDStruct/CFDStructDataManager/CFDStructDataSolverBoundaryConditionManager.cpp b/CFDStruct/CFDStructDataManager/CFDStructDataSolverBoundaryConditionManager.cpp index 7104667..fca928d 100644 --- a/CFDStruct/CFDStructDataManager/CFDStructDataSolverBoundaryConditionManager.cpp +++ b/CFDStruct/CFDStructDataManager/CFDStructDataSolverBoundaryConditionManager.cpp @@ -418,8 +418,10 @@ CUIConfig *CFDStructDataSolverBoundaryConditionManager::genWallAdiabaticWallUICo }), }), new CUIConfig({ - {"type", "ButtonBox"}, // 壁面类型 - {"name", tr(("Wall type"))}, + {"type", "RadioComponent"}, // 壁面类型 + {"name", tr("Wall type")}, + {"widget","GroupBox"}, + }, { new CUIConfig({ @@ -445,6 +447,7 @@ CUIConfig *CFDStructDataSolverBoundaryConditionManager::genWallIsothermalWallUIC new CUIConfig({ {"type", "LineEdit"}, // 边界名称 {"name", tr("Boundary name")}, + {"widget","GroupBox"}, }, {}), new CUIConfig({ @@ -483,8 +486,9 @@ CUIConfig *CFDStructDataSolverBoundaryConditionManager::genWallIsothermalWallUIC }), }), new CUIConfig({ - {"type", "ButtonBox"}, // 壁面类型 + {"type", "RadioComponent"}, // 壁面类型 {"name", tr(("Wall type"))}, + {"widget","GroupBox"}, }, { new CUIConfig({ @@ -552,8 +556,9 @@ CUIConfig *CFDStructDataSolverBoundaryConditionManager::genWallHotFlowWallUIConf }), }), new CUIConfig({ - {"type", "ButtonBox"}, // 壁面类型 - {"name", tr(("Wall type"))}, + {"type", "RadioComponent"}, // 壁面类型 + {"name", tr("Wall type")}, + {"widget","GroupBox"}, }, { new CUIConfig({ diff --git a/CFDStruct/CFDStructDataManager/CFDStructDataSolverKvislManager.cpp b/CFDStruct/CFDStructDataManager/CFDStructDataSolverKvislManager.cpp index c988fab..c3e4f08 100644 --- a/CFDStruct/CFDStructDataManager/CFDStructDataSolverKvislManager.cpp +++ b/CFDStruct/CFDStructDataManager/CFDStructDataSolverKvislManager.cpp @@ -41,8 +41,10 @@ CUIConfig *CFDStructDataSolverKvislManager::genLaminarUIConfig() { return new CUIConfig( {{"type", "Widget"}}, - {new CUIConfig({{"type", "BUttonBox"}, // 组:模型 - {"name", tr("Model")}}, + {new CUIConfig({{"type", "RadioComponent"}, // 组:模型 + {"name", tr("Model")}, + {"widget","GroupBox"}, + }, {new CUIConfig({{"type", "RadioButton"}, // 按钮:无粘 {"name", tr("Inviscid")}}), new CUIConfig({{"type", "RadioButton"}, // 按钮:层流 @@ -61,8 +63,10 @@ CUIConfig *CFDStructDataSolverKvislManager::genRANSSAUIConfig() return new CUIConfig( {{"type", "Widget"}}, { - new CUIConfig({{"type", "ButtonBox"}, // 组:模型 - {"name", tr("Model")}}, + new CUIConfig({{"type", "RadioComponent"}, // 组:模型 + {"name", tr("Model")}, + {"widget","GroupBox"}, + }, {new CUIConfig({{"type", "RadioButton"}, // 按钮:无粘 {"name", tr("Inviscid")}}), new CUIConfig({{"type", "RadioButton"}, // 按钮:层流 @@ -73,16 +77,20 @@ CUIConfig *CFDStructDataSolverKvislManager::genRANSSAUIConfig() {"name", tr("DES")}}), new CUIConfig({{"type", "RadioButton"}, // 按钮:约束大涡模型 {"name", tr("CLES")}})}), - new CUIConfig({{"type", "ButtonBox"}, // 组:RANS模型 - {"name", tr("RANS Model")}}, + new CUIConfig({{"type", "RadioComponent"}, // 组:RANS模型 + {"name", tr("RANS Model")}, + {"widget","GroupBox"}, + }, {new CUIConfig({{"type", "RadioButton"}, // 按钮:S-A(一方程) {"name", tr("S-A")}}), new CUIConfig({{"type", "RadioButton"}, // 按钮:Menters's κ-ω(两方程) {"name", tr("Menters's κ-ω")}}), new CUIConfig({{"type", "RadioButton"}, // 按钮:κ-ε(两方程) {"name", tr("κ-ε")}})}), - new CUIConfig({{"type", "ButtonBox"}, // 组:S-A类型 - {"name", tr("S-A Type")}}, + new CUIConfig({{"type", "RadioComponent"}, // 组:S-A类型 + {"name", tr("S-A Type")}, + {"widget","GroupBox"}, + }, {new CUIConfig({{"type", "RadioButton"}, // 按钮:standard {"name", tr("standard")}}), new CUIConfig({{"type", "RadioButton"}, // 按钮:Edwards @@ -97,8 +105,10 @@ CUIConfig *CFDStructDataSolverKvislManager::genRANSUIMentersConfig() return new CUIConfig( {{"type", "Widget"}}, { - new CUIConfig({{"type", "ButtonBox"}, // 组:模型 - {"name", tr("Model")}}, + new CUIConfig({{"type", "RadioComponent"}, // 组:模型 + {"name", tr("Model")}, + {"widget","GroupBox"}, + }, {new CUIConfig({{"type", "RadioButton"}, // 按钮:无粘 {"name", tr("Inviscid")}}), new CUIConfig({{"type", "RadioButton"}, // 按钮:层流 @@ -109,16 +119,19 @@ CUIConfig *CFDStructDataSolverKvislManager::genRANSUIMentersConfig() {"name", tr("DES")}}), new CUIConfig({{"type", "RadioButton"}, // 按钮:约束大涡模型 {"name", tr("CLES")}})}), - new CUIConfig({{"type", "ButtonBox"}, // 组:RANS模型 - {"name", tr("RANS Model")}}, + new CUIConfig({{"type", "RadioComponent"}, // 组:RANS模型 + {"name", tr("RANS Model")}, + {"widget","GroupBox"}, + }, {new CUIConfig({{"type", "RadioButton"}, // 按钮:S-A(一方程) {"name", tr("S-A")}}), new CUIConfig({{"type", "RadioButton"}, // 按钮:Menters's κ-ω(两方程) {"name", tr("Menters's κ-ω")}}), new CUIConfig({{"type", "RadioButton"}, // 按钮:κ-ε(两方程) {"name", tr("κ-ε")}})}), - new CUIConfig({{"type", "ButtonBox"}, // 组:κ-ω类型 - {"name", tr("κ-ω Type")}}, + new CUIConfig({{"type", "RadioComponent"}, // 组:κ-ω类型 + {"name", tr("κ-ω Type")}, + {"widget","GroupBox"},}, { new CUIConfig({{"type", "RadioButton"}, // 按钮:standard {"name", tr("standard")}}), @@ -132,8 +145,8 @@ CUIConfig *CFDStructDataSolverKvislManager::genRANSKEUIConfig() return new CUIConfig( {{"type", "Widget"}}, { - new CUIConfig({{"type", "ButtonBox"}, // 组:模型 - {"name", tr("Model")}}, + new CUIConfig({{"type", "RadioComponent"}, // 组:模型 + {"name", tr("Model")},{"widget","GroupBox"},}, {new CUIConfig({{"type", "RadioButton"}, // 按钮:无粘 {"name", tr("Inviscid")}}), new CUIConfig({{"type", "RadioButton"}, // 按钮:层流 @@ -144,16 +157,16 @@ CUIConfig *CFDStructDataSolverKvislManager::genRANSKEUIConfig() {"name", tr("DES")}}), new CUIConfig({{"type", "RadioButton"}, // 按钮:约束大涡模型 {"name", tr("CLES")}})}), - new CUIConfig({{"type", "ButtonBox"}, // 组:RANS模型 - {"name", tr("RANS Model")}}, + new CUIConfig({{"type", "RadioComponent"}, // 组:RANS模型 + {"name", tr("RANS Model")},{"widget","GroupBox"},}, {new CUIConfig({{"type", "RadioButton"}, // 按钮:S-A(一方程) {"name", tr("S-A")}}), new CUIConfig({{"type", "RadioButton"}, // 按钮:Menters's κ-ω(两方程) {"name", tr("Menters's κ-ω")}}), new CUIConfig({{"type", "RadioButton"}, // 按钮:κ-ε(两方程) {"name", tr("κ-ε")}})}), - new CUIConfig({{"type", "ButtonBox"}, // 组:κ-ε类型 - {"name", tr("κ-ε Type")}}, + new CUIConfig({{"type", "RadioComponent"}, // 组:κ-ε类型 + {"name", tr("κ-ε Type")},{"widget","GroupBox"},}, { new CUIConfig({{"type", "RadioButton"}, // 按钮:standard {"name", tr("standard")}}), @@ -168,8 +181,8 @@ CUIConfig *CFDStructDataSolverKvislManager::genDESSAUIConfig() return new CUIConfig( {{"type", "Widget"}}, { - new CUIConfig({{"type", "ButtonBox"}, // 组:模型 - {"name", tr("Model")}}, + new CUIConfig({{"type", "RadioComponent"}, // 组:模型 + {"name", tr("Model")},{"widget","GroupBox"},}, {new CUIConfig({{"type", "RadioButton"}, // 按钮:无粘 {"name", tr("Inviscid")}}), new CUIConfig({{"type", "RadioButton"}, // 按钮:层流 @@ -180,8 +193,8 @@ CUIConfig *CFDStructDataSolverKvislManager::genDESSAUIConfig() {"name", tr("DES")}}), new CUIConfig({{"type", "RadioButton"}, // 按钮:约束大涡模型 {"name", tr("CLES")}})}), - new CUIConfig({{"type", "ButtonBox"}, // 组:DES - {"name", tr("DES Model")}}, + new CUIConfig({{"type", "RadioComponent"}, // 组:DES + {"name", tr("DES Model")},{"widget","GroupBox"},}, { new CUIConfig({{"type", "RadioButton"}, // 按钮:DES {"name", tr("DES")}}), @@ -190,16 +203,16 @@ CUIConfig *CFDStructDataSolverKvislManager::genDESSAUIConfig() new CUIConfig({{"type", "RadioButton"}, // 按钮:IDDES(两方程) {"name", tr("IDDES")}}), }), - new CUIConfig({{"type", "ButtonBox"}, // 组:RANS模型 - {"name", tr("RANS Model")}}, + new CUIConfig({{"type", "RadioComponent"}, // 组:RANS模型 + {"name", tr("RANS Model")},{"widget","GroupBox"},}, { new CUIConfig({{"type", "RadioButton"}, // 按钮:S-A(一方程) {"name", tr("S-A")}}), new CUIConfig({{"type", "RadioButton"}, // 按钮:Menters's κ-ω(两方程) {"name", tr("Menters's κ-ω")}}), }), - new CUIConfig({{"type", "ButtonBox"}, // 组:S-A类型 - {"name", tr("S-A Type")}}, + new CUIConfig({{"type", "RadioComponent"}, // 组:S-A类型 + {"name", tr("S-A Type")},{"widget","GroupBox"}}, { new CUIConfig({{"type", "RadioButton"}, // 按钮:standard {"name", tr("standard")}}), @@ -213,8 +226,8 @@ CUIConfig *CFDStructDataSolverKvislManager::genDESMentersUIConfig() return new CUIConfig( {{"type", "Widget"}}, { - new CUIConfig({{"type", "ButtonBox"}, // 组:模型 - {"name", tr("Model")}}, + new CUIConfig({{"type", "RadioComponent"}, // 组:模型 + {"name", tr("Model")},{"widget","GroupBox"}}, {new CUIConfig({{"type", "RadioButton"}, // 按钮:无粘 {"name", tr("Inviscid")}}), new CUIConfig({{"type", "RadioButton"}, // 按钮:层流 @@ -225,8 +238,8 @@ CUIConfig *CFDStructDataSolverKvislManager::genDESMentersUIConfig() {"name", tr("DES")}}), new CUIConfig({{"type", "RadioButton"}, // 按钮:约束大涡模型 {"name", tr("CLES")}})}), - new CUIConfig({{"type", "ButtonBox"}, // 组:DES - {"name", tr("DES Model")}}, + new CUIConfig({{"type", "RadioComponent"}, // 组:DES + {"name", tr("DES Model")},{"widget","GroupBox"}}, { new CUIConfig({{"type", "RadioButton"}, // 按钮:DES {"name", tr("DES")}}), @@ -235,16 +248,16 @@ CUIConfig *CFDStructDataSolverKvislManager::genDESMentersUIConfig() new CUIConfig({{"type", "RadioButton"}, // 按钮:IDDES(两方程) {"name", tr("IDDES")}}), }), - new CUIConfig({{"type", "ButtonBox"}, // 组:RANS模型 - {"name", tr("RANS Model")}}, + new CUIConfig({{"type", "RadioComponent"}, // 组:RANS模型 + {"name", tr("RANS Model")},{"widget","GroupBox"}}, { new CUIConfig({{"type", "RadioButton"}, // 按钮:S-A(一方程) {"name", tr("S-A")}}), new CUIConfig({{"type", "RadioButton"}, // 按钮:Menters's κ-ω(两方程) {"name", tr("Menters's κ-ω")}}), }), - new CUIConfig({{"type", "ButtonBox"}, // 组:κ-ω类型 - {"name", tr("κ-ω Type")}}, + new CUIConfig({{"type", "RadioComponent"}, // 组:κ-ω类型 + {"name", tr("κ-ω Type")},{"widget","GroupBox"}}, { new CUIConfig({{"type", "RadioButton"}, // 按钮:SST {"name", tr("SST")}}), @@ -259,8 +272,9 @@ CUIConfig *CFDStructDataSolverKvislManager::genCLESUIConfig() {{"type", "Widget"}}, { new CUIConfig({ - {"type", "ButtonBox"}, // 组:模型 + {"type", "RadioComponent"}, // 组:模型 {"name", tr("Model")}, + {"widget","GroupBox"}, }, {new CUIConfig({ {"type", "RadioButton"}, // 按钮:无粘 @@ -282,8 +296,9 @@ CUIConfig *CFDStructDataSolverKvislManager::genCLESUIConfig() {"type", "RadioButton"}, // 按钮:约束大涡模型 {"name", tr("CLES")}, })}), - new CUIConfig({{"type", "ButtonBox"}, // 组:RANS模型 - {"name", tr("RANS Model")}}, + new CUIConfig({{"type", "RadioComponent"}, // 组:RANS模型 + {"name", tr("RANS Model")}, + {"widget","GroupBox"},}, { new CUIConfig({ {"type", "RadioButton"}, // 按钮:S-A(一方程) @@ -294,8 +309,9 @@ CUIConfig *CFDStructDataSolverKvislManager::genCLESUIConfig() {"name", tr("Menters's κ-ω")}, }), }), - new CUIConfig({{"type", "ButtonBox"}, // 组:S-A类型 - {"name", tr("S-A Type")}}, + new CUIConfig({{"type", "RadioComponent"}, // 组:S-A类型 + {"name", tr("S-A Type")}, + {"widget","GroupBox"},}, {new CUIConfig({ {"type", "RadioButton"}, // 按钮:standard {"name", tr("standard")}, @@ -315,8 +331,9 @@ CUIConfig *CFDStructDataSolverKvislManager::genCLESMentersUIConfig() {{"type", "Widget"}}, { new CUIConfig({ - {"type", "ButtonBox"}, // 组:模型 + {"type", "RadioComponent"}, // 组:模型 {"name", tr("Model")}, + {"widget","GroupBox"}, }, {new CUIConfig({ {"type", "RadioButton"}, // 按钮:无粘 @@ -338,8 +355,8 @@ CUIConfig *CFDStructDataSolverKvislManager::genCLESMentersUIConfig() {"type", "RadioButton"}, // 按钮:约束大涡模型 {"name", tr("CLES")}, })}), - new CUIConfig({{"type", "ButtonBox"}, // 组:RANS模型 - {"name", tr("RANS Model")}}, + new CUIConfig({{"type", "RadioComponent"}, // 组:RANS模型 + {"name", tr("RANS Model")},{"widget","GroupBox"},}, { new CUIConfig({ {"type", "RadioButton"}, // 按钮:S-A(一方程) @@ -350,8 +367,8 @@ CUIConfig *CFDStructDataSolverKvislManager::genCLESMentersUIConfig() {"name", tr("Menters's κ-ω")}, }), }), - new CUIConfig({{"type", "ButtonBox"}, // 组:κ-ω类型 - {"name", tr("κ-ω Type")}}, + new CUIConfig({{"type", "RadioComponent"}, // 组:κ-ω类型 + {"name", tr("κ-ω Type")},{"widget","GroupBox"},}, { new CUIConfig({ {"type", "RadioButton"}, // 按钮:SST