From b13503ba91f9da46e28ed88dff15f81980af88a1 Mon Sep 17 00:00:00 2001 From: lvjunjie Date: Tue, 26 May 2026 17:30:55 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=B5=81=E5=8A=A8=E6=AE=B5=E5=88=86=E6=9E=90?= =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E4=B8=A4=E4=B8=AA=E7=AA=97=E5=8F=A3=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E7=BB=A7=E6=89=BFiDlgBase=202.=E4=B8=8A=E9=9D=A2?= =?UTF-8?q?=E9=82=A3=E4=B8=AA=E7=AA=97=E5=8F=A3=E9=A2=9C=E8=89=B2=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E7=99=BD=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Include/nmNum/nmSubWxs/nmWxNumericalDesign.h | 3 ++- Include/nmNum/nmSubWxs/nmWxParameterProperty.h | 3 ++- Src/nmNum/nmSubWxs/nmWxNumericalDesign.cpp | 4 +++- Src/nmNum/nmSubWxs/nmWxParameterProperty.cpp | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Include/nmNum/nmSubWxs/nmWxNumericalDesign.h b/Include/nmNum/nmSubWxs/nmWxNumericalDesign.h index 1a40592..6ade40c 100644 --- a/Include/nmNum/nmSubWxs/nmWxNumericalDesign.h +++ b/Include/nmNum/nmSubWxs/nmWxNumericalDesign.h @@ -2,6 +2,7 @@ #define NMWXANALYTICALDESIGN_H #include "nmSubWxs_global.h" +#include "iDlgBase.h" #include // 前向声明 @@ -23,7 +24,7 @@ class nmDataReservoir; class nmGUIComponentLineEdit; class nmDataAnalyzeManager; -class NM_SUB_WXS_EXPORT nmWxNumericalDesign : public QWidget +class NM_SUB_WXS_EXPORT nmWxNumericalDesign : public iDlgBase { Q_OBJECT public: diff --git a/Include/nmNum/nmSubWxs/nmWxParameterProperty.h b/Include/nmNum/nmSubWxs/nmWxParameterProperty.h index 6b8c3cd..2b96f1f 100644 --- a/Include/nmNum/nmSubWxs/nmWxParameterProperty.h +++ b/Include/nmNum/nmSubWxs/nmWxParameterProperty.h @@ -10,6 +10,7 @@ #include #include "nmSubWxs_global.h" +#include "iDlgBase.h" #include "nmDataReservoir.h" #include "nmDataVerticalWell.h" @@ -42,7 +43,7 @@ enum DataCategory { RegionMarkCat }; -class NM_SUB_WXS_EXPORT nmWxParameterProperty : public QWidget +class NM_SUB_WXS_EXPORT nmWxParameterProperty : public iDlgBase { Q_OBJECT diff --git a/Src/nmNum/nmSubWxs/nmWxNumericalDesign.cpp b/Src/nmNum/nmSubWxs/nmWxNumericalDesign.cpp index 1d0285a..251bae2 100644 --- a/Src/nmNum/nmSubWxs/nmWxNumericalDesign.cpp +++ b/Src/nmNum/nmSubWxs/nmWxNumericalDesign.cpp @@ -33,7 +33,7 @@ nmWxNumericalDesign* nmWxNumericalDesign::s_pCurrentInstance = nullptr; nmWxNumericalDesign::nmWxNumericalDesign(QWidget *parent) - : QWidget(parent) + : iDlgBase(parent) { // 设置当前实例为静态指针 s_pCurrentInstance = this; @@ -51,6 +51,8 @@ nmWxNumericalDesign::nmWxNumericalDesign(QWidget *parent) pScrollArea->setWidgetResizable(true); QWidget* pScrollWidget = new QWidget(); + pScrollWidget->setObjectName("nmNumericalDesignScrollWidget"); + pScrollWidget->setStyleSheet("#nmNumericalDesignScrollWidget { background-color: white; }"); QVBoxLayout* pScrollLayout = new QVBoxLayout(pScrollWidget); // 初始化所有UI组件 diff --git a/Src/nmNum/nmSubWxs/nmWxParameterProperty.cpp b/Src/nmNum/nmSubWxs/nmWxParameterProperty.cpp index 85c6a55..e0e4342 100644 --- a/Src/nmNum/nmSubWxs/nmWxParameterProperty.cpp +++ b/Src/nmNum/nmSubWxs/nmWxParameterProperty.cpp @@ -21,7 +21,7 @@ nmWxParameterProperty* nmWxParameterProperty::s_pCurrentInstance = nullptr; #include "nmWxWellboreStorageCalculator.h" nmWxParameterProperty::nmWxParameterProperty(QWidget* mainWindow, QWidget* parent) - : QWidget(parent), m_pMainWindow(mainWindow) + : iDlgBase(parent), m_pMainWindow(mainWindow) { s_pCurrentInstance = this; m_pLayout = nullptr;