1.流动段分析左侧两个窗口改为继承iDlgBase 2.上面那个窗口颜色改为白色

feature/DialogBox-20260526
lvjunjie 3 weeks ago
parent 0fd1b04108
commit b13503ba91

@ -2,6 +2,7 @@
#define NMWXANALYTICALDESIGN_H #define NMWXANALYTICALDESIGN_H
#include "nmSubWxs_global.h" #include "nmSubWxs_global.h"
#include "iDlgBase.h"
#include <QWidget> #include <QWidget>
// 前向声明 // 前向声明
@ -23,7 +24,7 @@ class nmDataReservoir;
class nmGUIComponentLineEdit; class nmGUIComponentLineEdit;
class nmDataAnalyzeManager; class nmDataAnalyzeManager;
class NM_SUB_WXS_EXPORT nmWxNumericalDesign : public QWidget class NM_SUB_WXS_EXPORT nmWxNumericalDesign : public iDlgBase
{ {
Q_OBJECT Q_OBJECT
public: public:

@ -10,6 +10,7 @@
#include <QList> #include <QList>
#include "nmSubWxs_global.h" #include "nmSubWxs_global.h"
#include "iDlgBase.h"
#include "nmDataReservoir.h" #include "nmDataReservoir.h"
#include "nmDataVerticalWell.h" #include "nmDataVerticalWell.h"
@ -42,7 +43,7 @@ enum DataCategory {
RegionMarkCat RegionMarkCat
}; };
class NM_SUB_WXS_EXPORT nmWxParameterProperty : public QWidget class NM_SUB_WXS_EXPORT nmWxParameterProperty : public iDlgBase
{ {
Q_OBJECT Q_OBJECT

@ -33,7 +33,7 @@
nmWxNumericalDesign* nmWxNumericalDesign::s_pCurrentInstance = nullptr; nmWxNumericalDesign* nmWxNumericalDesign::s_pCurrentInstance = nullptr;
nmWxNumericalDesign::nmWxNumericalDesign(QWidget *parent) nmWxNumericalDesign::nmWxNumericalDesign(QWidget *parent)
: QWidget(parent) : iDlgBase(parent)
{ {
// 设置当前实例为静态指针 // 设置当前实例为静态指针
s_pCurrentInstance = this; s_pCurrentInstance = this;
@ -51,6 +51,8 @@ nmWxNumericalDesign::nmWxNumericalDesign(QWidget *parent)
pScrollArea->setWidgetResizable(true); pScrollArea->setWidgetResizable(true);
QWidget* pScrollWidget = new QWidget(); QWidget* pScrollWidget = new QWidget();
pScrollWidget->setObjectName("nmNumericalDesignScrollWidget");
pScrollWidget->setStyleSheet("#nmNumericalDesignScrollWidget { background-color: white; }");
QVBoxLayout* pScrollLayout = new QVBoxLayout(pScrollWidget); QVBoxLayout* pScrollLayout = new QVBoxLayout(pScrollWidget);
// 初始化所有UI组件 // 初始化所有UI组件

@ -21,7 +21,7 @@ nmWxParameterProperty* nmWxParameterProperty::s_pCurrentInstance = nullptr;
#include "nmWxWellboreStorageCalculator.h" #include "nmWxWellboreStorageCalculator.h"
nmWxParameterProperty::nmWxParameterProperty(QWidget* mainWindow, QWidget* parent) nmWxParameterProperty::nmWxParameterProperty(QWidget* mainWindow, QWidget* parent)
: QWidget(parent), m_pMainWindow(mainWindow) : iDlgBase(parent), m_pMainWindow(mainWindow)
{ {
s_pCurrentInstance = this; s_pCurrentInstance = this;
m_pLayout = nullptr; m_pLayout = nullptr;

Loading…
Cancel
Save