From b5e34525c701b17e21ac8219bb7883d7af91bdf9 Mon Sep 17 00:00:00 2001 From: mzh Date: Fri, 1 Nov 2024 14:39:32 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=B8=BAcheckbox=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86connect=202=E3=80=81=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E4=BA=86=E5=9F=BA=E6=9C=AC=E6=A8=A1=E5=9E=8Bui?= =?UTF-8?q?=E7=9A=84=E7=95=8C=E9=9D=A2=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CFDStructDataSolverBasicModelManager.cpp | 36 +++++++++++++++--- .../CFDStructDataSolverBasicModelManager.h | 4 +- .../CFDStructMain/CFDStructMainWindow.cpp | 2 +- CFDStruct/CUIProperty/CUICheckBox.cpp | 12 ++++++ CFDStruct/CUIProperty/CUIConfig.cpp | 2 + Resources/Resources.qrc | 2 + Resources/img/test1.png | Bin 0 -> 3903 bytes 7 files changed, 49 insertions(+), 9 deletions(-) create mode 100644 Resources/img/test1.png diff --git a/CFDStruct/CFDStructDataManager/CFDStructDataSolverBasicModelManager.cpp b/CFDStruct/CFDStructDataManager/CFDStructDataSolverBasicModelManager.cpp index c3d7427..8e4c689 100644 --- a/CFDStruct/CFDStructDataManager/CFDStructDataSolverBasicModelManager.cpp +++ b/CFDStruct/CFDStructDataManager/CFDStructDataSolverBasicModelManager.cpp @@ -1,5 +1,7 @@ #include "CFDStructDataSolverBasicModelManager.h" #include "CUIProperty/CUIConfig.h" +#include "CFDStructMain/CFDStructDefine.h" +#include "CFDStructSigsCenter.h" CFDStructDataSolverBasicModelManager::CFDStructDataSolverBasicModelManager(QObject *parent) : CFDStructDataManagerBase(parent) { @@ -13,10 +15,19 @@ CFDStructDataSolverBasicModelManager::~CFDStructDataSolverBasicModelManager() delete m_uiConfig; m_uiConfig = nullptr; } + connect(m_cuiSigsCenter, &CUISigsCenter::sig_cuiPropertyChanged, this, [=](int semaphore){ + emit CFDStructSigsCenter::getInstance()->sig_solverTimeModeDataChanged(); + }); } CUIConfig *CFDStructDataSolverBasicModelManager::getParamUIConfig() { + qDebug()<<"m_FluidProperties: "<genFluidPropertiesOffUIConfig(); + if(m_FluidProperties == 1) + return this->genFluidPropertiesOnUIConfig(); + return this->genFluidPropertiesOnUIConfig(); } @@ -40,7 +51,11 @@ CUIConfig *CFDStructDataSolverBasicModelManager::genFluidPropertiesOffUIConfig() })}), new CUIConfig({// 下拉框：流动模型 {"type", "ComboBox"}, - {"name", tr("Flow Model")}}, + {"name", tr("Flow Model")}, + {"value_type",CUI_DATA_TYPE::CUI_DATA_TYPE_INT}, + {"value_origin",QVA_GLOBAL(&m_FlowModel)}, + {"semaphore",1}, + }, {new CUIConfig({// 选项：外流 {"type", "Item"}, {"name", tr("Internal Flow")}}), @@ -54,8 +69,12 @@ CUIConfig *CFDStructDataSolverBasicModelManager::genFluidPropertiesOffUIConfig() {"type", "CheckBox"}, {"name", tr("Overlay Network")}}), new CUIConfig({// 方形选择按钮:流体属性 - {"type", "CheckButton"}, - {"name", tr("Fluid Properties")}})}); + {"type", "CheckBox"}, + {"name", tr("Fluid Properties")}, + {"value_type",CUI_DATA_TYPE::CUI_DATA_TYPE_INT}, + {"value_origin",QVA_GLOBAL(&m_FluidProperties)}, + {"semaphore",1}, + })}); } CUIConfig *CFDStructDataSolverBasicModelManager::genFluidPropertiesOnUIConfig() @@ -85,10 +104,15 @@ CUIConfig *CFDStructDataSolverBasicModelManager::genFluidPropertiesOnUIConfig() {"name", tr("Multistage Turbomachinery")}})}), new CUIConfig({// 方形勾选:重叠网络 {"type", "CheckBox"}, - {"name", tr("ichimr")}}), + {"name", tr("Overlay Network")}, + }), new CUIConfig({// 圆形选择按钮:流体属性 - {"type", "RadioButton"}, - {"name", tr("Fluid Properties")}}), + {"type", "CheckBox"}, + {"name", tr("Fluid Properties")}, + {"value_type",CUI_DATA_TYPE::CUI_DATA_TYPE_INT}, + {"value_origin",QVA_GLOBAL(&m_FluidProperties)}, + {"semaphore",1}, + }), new CUIConfig({// 组,流体属性下的内容 {"type", "GroupBox"}, {"name", tr("Fluid Properties")}}, diff --git a/CFDStruct/CFDStructDataManager/CFDStructDataSolverBasicModelManager.h b/CFDStruct/CFDStructDataManager/CFDStructDataSolverBasicModelManager.h index 2e6fadf..9fc8ca9 100644 --- a/CFDStruct/CFDStructDataManager/CFDStructDataSolverBasicModelManager.h +++ b/CFDStruct/CFDStructDataManager/CFDStructDataSolverBasicModelManager.h @@ -31,10 +31,10 @@ private: int m_FlowModel = 0; //重叠网格:不勾选0;勾选1 - bool m_OverlayNetwork = 0; + int m_OverlayNetwork = 0; //流体属性:关闭0;开启1 - bool m_FluidProperties = 0; + int m_FluidProperties = 0; //气体成分 QString m_GasComposition = ""; diff --git a/CFDStruct/CFDStructMain/CFDStructMainWindow.cpp b/CFDStruct/CFDStructMain/CFDStructMainWindow.cpp index bc545bf..9dd10b8 100644 --- a/CFDStruct/CFDStructMain/CFDStructMainWindow.cpp +++ b/CFDStruct/CFDStructMain/CFDStructMainWindow.cpp @@ -197,7 +197,7 @@ void CFDStructMainWindow::addSARibbonCategoryCalculation() //"������"����"����͵���" pannelAddAction(pannel, action, SARibbonPannelItem::Large); //����ͼ��"����" - action = createAction(tr("Import"), "actionImport", ":/icons/createsphere.png", tr("Import")); + action = createAction(tr("Import"), "actionImport", ":/img/test1.png", tr("Import")); //"����"����"����͵���" pannelAddAction(pannel, action, SARibbonPannelItem::Large); //��������"���������" diff --git a/CFDStruct/CUIProperty/CUICheckBox.cpp b/CFDStruct/CUIProperty/CUICheckBox.cpp index 8eb4791..5be1df8 100644 --- a/CFDStruct/CUIProperty/CUICheckBox.cpp +++ b/CFDStruct/CUIProperty/CUICheckBox.cpp @@ -12,4 +12,16 @@ CUICheckBox::CUICheckBox(CUIConfig* conf, QVector &subCUI, QWidget *parent void CUICheckBox::iniUI(QVector &subCUI) { this->setText(conf->getPropertyValue("name")); + + QVariant vOrigin = conf->getPropertyOriginValue("value_origin"); + int *ptr = qvariant_cast(vOrigin); + if(ptr!=nullptr){ + if(*ptr == 1) + this->setCheckState(Qt::Checked); + } + + connect(this, QOverload::of(&QCheckBox::clicked),[ = ](bool sign){ + qDebug()<<"CheckBox is clicked"<<' '<conf->setValue((int)sign); + }); } diff --git a/CFDStruct/CUIProperty/CUIConfig.cpp b/CFDStruct/CUIProperty/CUIConfig.cpp index 66da7d1..7b1867a 100644 --- a/CFDStruct/CUIProperty/CUIConfig.cpp +++ b/CFDStruct/CUIProperty/CUIConfig.cpp @@ -99,10 +99,12 @@ void CUIConfig::printConfig() void CUIConfig::setValue(QVariant value) { +// qDebug()<<"setValue "<(pValue); + qDebug()<<"value_type is int"< ./icons/icoR_license.svg ./img/createbox.png + ./img/test1.png + diff --git a/Resources/img/test1.png b/Resources/img/test1.png new file mode 100644 index 0000000000000000000000000000000000000000..4268207aa67e27a336954e3397b6ad49dbf429c0 GIT binary patch literal 3903 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