From 0fd1b041087d00ede1a4294a6e2b8842c37613fd Mon Sep 17 00:00:00 2001 From: lvjunjie Date: Tue, 26 May 2026 16:14:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E8=AF=9D=E6=A1=86=E7=B1=BB=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E7=BB=A7=E6=89=BFiDlgBase?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Include/nmNum/nmSubWxs/nmDeleteConfirmationDlg.h | 4 ++-- Include/nmNum/nmSubWxs/nmSwitchOutlineConfirmationDlg.h | 4 ++-- Include/nmNum/nmSubWxs/nmWxAutomaticFitting.h | 4 ++-- Include/nmNum/nmSubWxs/nmWxAutomaticFittingStart.h | 4 ++-- Include/nmNum/nmSubWxs/nmWxChangeAnal.h | 4 ++-- Include/nmNum/nmSubWxs/nmWxDFN.h | 4 ++-- Include/nmNum/nmSubWxs/nmWxDFNExportDlg.h | 4 ++-- Include/nmNum/nmSubWxs/nmWxDFNGenerateDlg.h | 4 ++-- Include/nmNum/nmSubWxs/nmWxDFNLoadFromFile.h | 4 ++-- Include/nmNum/nmSubWxs/nmWxDisplaySettings.h | 4 ++-- Include/nmNum/nmSubWxs/nmWxEditWellPlot.h | 4 ++-- Include/nmNum/nmSubWxs/nmWxForecast.h | 4 ++-- Include/nmNum/nmSubWxs/nmWxGeoRefDlg.h | 4 ++-- Include/nmNum/nmSubWxs/nmWxGeometryLayerDlg.h | 4 ++-- Include/nmNum/nmSubWxs/nmWxGridDlg.h | 4 ++-- Include/nmNum/nmSubWxs/nmWxIncludeOtherWells.h | 4 ++-- Include/nmNum/nmSubWxs/nmWxMeasureDlg.h | 4 ++-- Include/nmNum/nmSubWxs/nmWxMeasuringScaleDlg.h | 4 ++-- Include/nmNum/nmSubWxs/nmWxPerforationClosing.h | 4 ++-- Include/nmNum/nmSubWxs/nmWxPointerPosDlg.h | 4 ++-- .../nmSubWxs/nmWxPostprocessingAnimationDataFiltering.h | 4 ++-- .../nmNum/nmSubWxs/nmWxPostprocessingAnimationWidget.h | 4 ++-- Include/nmNum/nmSubWxs/nmWxRCDialog.h | 4 ++-- Include/nmNum/nmSubWxs/nmWxReservoirProperties.h | 4 ++-- Include/nmNum/nmSubWxs/nmWxReservoirPropertiesDlg.h | 4 ++-- Include/nmNum/nmSubWxs/nmWxSelectResultWellsDlg.h | 4 ++-- Include/nmNum/nmSubWxs/nmWxSelectWellsDlg.h | 4 ++-- Include/nmNum/nmSubWxs/nmWxSensitive.h | 4 ++-- Include/nmNum/nmSubWxs/nmWxTimeDependentSkin.h | 4 ++-- Include/nmNum/nmSubWxs/nmWxWellLayerDlg.h | 4 ++-- Include/nmNum/nmSubWxs/nmWxWellboreStorageCalculator.h | 4 ++-- .../nmSubWxs/nmWxWellboreStorageCalculatorTubingData.h | 4 ++-- .../nmNum/nmSubWxs/nmWxWellboreStorageCalculatorVolume.h | 4 ++-- Src/nmNum/nmSubWxs/nmWxAutomaticFitting.cpp | 2 +- Src/nmNum/nmSubWxs/nmWxAutomaticFittingStart.cpp | 2 +- Src/nmNum/nmSubWxs/nmWxChangeAnal.cpp | 2 +- Src/nmNum/nmSubWxs/nmWxDFN.cpp | 2 +- Src/nmNum/nmSubWxs/nmWxDFNExportDlg.cpp | 2 +- Src/nmNum/nmSubWxs/nmWxDFNGenerateDlg.cpp | 2 +- Src/nmNum/nmSubWxs/nmWxDFNLoadFromFile.cpp | 2 +- Src/nmNum/nmSubWxs/nmWxDisplaySettings.cpp | 2 +- Src/nmNum/nmSubWxs/nmWxEditWellPlot.cpp | 8 ++++---- Src/nmNum/nmSubWxs/nmWxForecast.cpp | 2 +- Src/nmNum/nmSubWxs/nmWxGeoRefDlg.cpp | 6 +++--- Src/nmNum/nmSubWxs/nmWxIncludeOtherWells.cpp | 2 +- Src/nmNum/nmSubWxs/nmWxMeasureDlg.cpp | 4 ++-- Src/nmNum/nmSubWxs/nmWxMeasuringScaleDlg.cpp | 2 +- Src/nmNum/nmSubWxs/nmWxPerforationClosing.cpp | 2 +- Src/nmNum/nmSubWxs/nmWxPointerPosDlg.cpp | 2 +- .../nmSubWxs/nmWxPostprocessingAnimationDataFiltering.cpp | 2 +- Src/nmNum/nmSubWxs/nmWxPostprocessingAnimationWidget.cpp | 2 +- Src/nmNum/nmSubWxs/nmWxReservoirProperties.cpp | 2 +- Src/nmNum/nmSubWxs/nmWxReservoirPropertiesDlg.cpp | 4 ++-- Src/nmNum/nmSubWxs/nmWxSelectResultWellsDlg.cpp | 2 +- Src/nmNum/nmSubWxs/nmWxSelectWellsDlg.cpp | 2 +- Src/nmNum/nmSubWxs/nmWxSensitive.cpp | 3 +-- Src/nmNum/nmSubWxs/nmWxTimeDependentSkin.cpp | 2 +- Src/nmNum/nmSubWxs/nmWxWellboreStorageCalculator.cpp | 2 +- .../nmSubWxs/nmWxWellboreStorageCalculatorTubingData.cpp | 2 +- .../nmSubWxs/nmWxWellboreStorageCalculatorVolume.cpp | 2 +- 60 files changed, 100 insertions(+), 101 deletions(-) diff --git a/Include/nmNum/nmSubWxs/nmDeleteConfirmationDlg.h b/Include/nmNum/nmSubWxs/nmDeleteConfirmationDlg.h index a7bc909..5422883 100644 --- a/Include/nmNum/nmSubWxs/nmDeleteConfirmationDlg.h +++ b/Include/nmNum/nmSubWxs/nmDeleteConfirmationDlg.h @@ -1,10 +1,10 @@ #ifndef NMDELETECONFIRMATIONDLG_H #define NMDELETECONFIRMATIONDLG_H -#include +#include "iDlgBase.h" #include "nmSubWxs_global.h" -class NM_SUB_WXS_EXPORT nmDeleteConfirmationDlg : public QDialog +class NM_SUB_WXS_EXPORT nmDeleteConfirmationDlg : public iDlgBase { Q_OBJECT public: diff --git a/Include/nmNum/nmSubWxs/nmSwitchOutlineConfirmationDlg.h b/Include/nmNum/nmSubWxs/nmSwitchOutlineConfirmationDlg.h index 3032c92..5af5881 100644 --- a/Include/nmNum/nmSubWxs/nmSwitchOutlineConfirmationDlg.h +++ b/Include/nmNum/nmSubWxs/nmSwitchOutlineConfirmationDlg.h @@ -1,10 +1,10 @@ #ifndef NMSWITCHOUTLINECONFIRMATIONDLG_H #define NMSWITCHOUTLINECONFIRMATIONDLG_H -#include +#include "iDlgBase.h" #include "nmSubWxs_global.h" -class NM_SUB_WXS_EXPORT nmSwitchOutlineConfirmationDlg : public QDialog +class NM_SUB_WXS_EXPORT nmSwitchOutlineConfirmationDlg : public iDlgBase { Q_OBJECT public: diff --git a/Include/nmNum/nmSubWxs/nmWxAutomaticFitting.h b/Include/nmNum/nmSubWxs/nmWxAutomaticFitting.h index b94e5c9..ff6223d 100644 --- a/Include/nmNum/nmSubWxs/nmWxAutomaticFitting.h +++ b/Include/nmNum/nmSubWxs/nmWxAutomaticFitting.h @@ -1,7 +1,7 @@ #ifndef NMWXAUTOMATICFITTING_H #define NMWXAUTOMATICFITTING_H -#include +#include "iDlgBase.h" #include #include #include @@ -32,7 +32,7 @@ enum OptimizationAlgorithm { ALGORITHM_GA = 1 }; -class NM_SUB_WXS_EXPORT nmWxAutomaticFitting : public QDialog +class NM_SUB_WXS_EXPORT nmWxAutomaticFitting : public iDlgBase { Q_OBJECT diff --git a/Include/nmNum/nmSubWxs/nmWxAutomaticFittingStart.h b/Include/nmNum/nmSubWxs/nmWxAutomaticFittingStart.h index ad17e7e..58fcced 100644 --- a/Include/nmNum/nmSubWxs/nmWxAutomaticFittingStart.h +++ b/Include/nmNum/nmSubWxs/nmWxAutomaticFittingStart.h @@ -1,7 +1,7 @@ #ifndef NMWXAUTOMATICFITTINGSTART_H #define NMWXAUTOMATICFITTINGSTART_H -#include +#include "iDlgBase.h" #include #include #include @@ -72,7 +72,7 @@ enum FittingAlgorithmType { FITTING_ALGORITHM_GA = 1 }; -class nmWxAutomaticfittingStart : public QDialog +class nmWxAutomaticfittingStart : public iDlgBase { Q_OBJECT diff --git a/Include/nmNum/nmSubWxs/nmWxChangeAnal.h b/Include/nmNum/nmSubWxs/nmWxChangeAnal.h index a171c81..22cf2a2 100644 --- a/Include/nmNum/nmSubWxs/nmWxChangeAnal.h +++ b/Include/nmNum/nmSubWxs/nmWxChangeAnal.h @@ -1,7 +1,7 @@ #ifndef NMWXCHANGEANAL_H #define NMWXCHANGEANAL_H -#include +#include "iDlgBase.h" #include "nmSubWxs_global.h" #include #include @@ -11,7 +11,7 @@ #include // 分析视图切换对话框 -class NM_SUB_WXS_EXPORT nmWxChangeAnal : public QDialog +class NM_SUB_WXS_EXPORT nmWxChangeAnal : public iDlgBase { Q_OBJECT public: diff --git a/Include/nmNum/nmSubWxs/nmWxDFN.h b/Include/nmNum/nmSubWxs/nmWxDFN.h index ef940f0..1d0d547 100644 --- a/Include/nmNum/nmSubWxs/nmWxDFN.h +++ b/Include/nmNum/nmSubWxs/nmWxDFN.h @@ -2,7 +2,7 @@ #define NMWXDFN_H #include "nmSubWxs_global.h" -#include +#include "iDlgBase.h" #include #include #include @@ -10,7 +10,7 @@ #include "nmDataFracture.h" // DFN初始页面 -class NM_SUB_WXS_EXPORT nmWxDFN : public QDialog +class NM_SUB_WXS_EXPORT nmWxDFN : public iDlgBase { Q_OBJECT diff --git a/Include/nmNum/nmSubWxs/nmWxDFNExportDlg.h b/Include/nmNum/nmSubWxs/nmWxDFNExportDlg.h index 5441448..46ea517 100644 --- a/Include/nmNum/nmSubWxs/nmWxDFNExportDlg.h +++ b/Include/nmNum/nmSubWxs/nmWxDFNExportDlg.h @@ -1,7 +1,7 @@ #ifndef NMWXDFNEXPORTDLG_H #define NMWXDFNEXPORTDLG_H -#include +#include "iDlgBase.h" QT_BEGIN_NAMESPACE class QRadioButton; @@ -9,7 +9,7 @@ class QLineEdit; class QPushButton; QT_END_NAMESPACE -class nmWxDFNExportDlg : public QDialog +class nmWxDFNExportDlg : public iDlgBase { Q_OBJECT diff --git a/Include/nmNum/nmSubWxs/nmWxDFNGenerateDlg.h b/Include/nmNum/nmSubWxs/nmWxDFNGenerateDlg.h index 5ecdd4e..17362dc 100644 --- a/Include/nmNum/nmSubWxs/nmWxDFNGenerateDlg.h +++ b/Include/nmNum/nmSubWxs/nmWxDFNGenerateDlg.h @@ -1,6 +1,6 @@ #pragma once -#include +#include "iDlgBase.h" class QDoubleSpinBox; class QComboBox; @@ -9,7 +9,7 @@ class QPushButton; class nmGuiPlot; class nmDataOutline; -class nmWxDFNGenerateDlg : public QDialog +class nmWxDFNGenerateDlg : public iDlgBase { Q_OBJECT public: diff --git a/Include/nmNum/nmSubWxs/nmWxDFNLoadFromFile.h b/Include/nmNum/nmSubWxs/nmWxDFNLoadFromFile.h index b365a5a..6e0b94c 100644 --- a/Include/nmNum/nmSubWxs/nmWxDFNLoadFromFile.h +++ b/Include/nmNum/nmSubWxs/nmWxDFNLoadFromFile.h @@ -2,7 +2,7 @@ #define NMWXDFNLOADFROMFILE_H #include "nmSubWxs_global.h" -#include +#include "iDlgBase.h" #include #include #include @@ -20,7 +20,7 @@ struct DFNData { }; // DFN从文件导入页面 -class NM_SUB_WXS_EXPORT nmWxDFNLoadFromFile : public QDialog +class NM_SUB_WXS_EXPORT nmWxDFNLoadFromFile : public iDlgBase { Q_OBJECT public: diff --git a/Include/nmNum/nmSubWxs/nmWxDisplaySettings.h b/Include/nmNum/nmSubWxs/nmWxDisplaySettings.h index 29b2da6..186f9d2 100644 --- a/Include/nmNum/nmSubWxs/nmWxDisplaySettings.h +++ b/Include/nmNum/nmSubWxs/nmWxDisplaySettings.h @@ -2,7 +2,7 @@ #define NMWXDISPLAYSETTINGS_H #include "nmSubWxs_global.h" // 确保包含您的全局导出宏 -#include +#include "iDlgBase.h" #include #include #include @@ -91,7 +91,7 @@ class CustomDisPlayTreeWidget : public QTreeWidget * @brief nmWxDisplaySettings类 * 显示设置对话框，包含一个自定义的树形控件和控制按钮。 */ -class NM_SUB_WXS_EXPORT nmWxDisplaySettings : public QDialog +class NM_SUB_WXS_EXPORT nmWxDisplaySettings : public iDlgBase { Q_OBJECT public: diff --git a/Include/nmNum/nmSubWxs/nmWxEditWellPlot.h b/Include/nmNum/nmSubWxs/nmWxEditWellPlot.h index a1ec6b1..b430ab0 100644 --- a/Include/nmNum/nmSubWxs/nmWxEditWellPlot.h +++ b/Include/nmNum/nmSubWxs/nmWxEditWellPlot.h @@ -1,7 +1,7 @@ #ifndef NMWXEDITWELLPLOT_H #define NMWXEDITWELLPLOT_H -#include +#include "iDlgBase.h" #include "nmSubWxs_global.h" #include @@ -40,7 +40,7 @@ class nmGUIComponentComboBox; // 编辑井控制器 class nmWellEditorController; -class NM_SUB_WXS_EXPORT nmWxEditWellPlot : public QDialog +class NM_SUB_WXS_EXPORT nmWxEditWellPlot : public iDlgBase { Q_OBJECT public: diff --git a/Include/nmNum/nmSubWxs/nmWxForecast.h b/Include/nmNum/nmSubWxs/nmWxForecast.h index 79e076d..40fd93d 100644 --- a/Include/nmNum/nmSubWxs/nmWxForecast.h +++ b/Include/nmNum/nmSubWxs/nmWxForecast.h @@ -1,7 +1,7 @@ #ifndef NMWXFORECAST_H #define NMWXFORECAST_H -#include +#include "iDlgBase.h" #include #include #include @@ -17,7 +17,7 @@ #include "nmGUIComponentLineEdit.h" #include "nmDataAnalyzeManager.h" -class nmWxForecast : public QDialog +class nmWxForecast : public iDlgBase { Q_OBJECT public: diff --git a/Include/nmNum/nmSubWxs/nmWxGeoRefDlg.h b/Include/nmNum/nmSubWxs/nmWxGeoRefDlg.h index c9f3d24..4241ca3 100644 --- a/Include/nmNum/nmSubWxs/nmWxGeoRefDlg.h +++ b/Include/nmNum/nmSubWxs/nmWxGeoRefDlg.h @@ -1,7 +1,7 @@ #ifndef NMWXGEOREFDLG_H #define NMWXGEOREFDLG_H -#include +#include "iDlgBase.h" #include #include #include @@ -10,7 +10,7 @@ #include "nmSubWxs_global.h" #include "nmDataGeoRef.h" -class NM_SUB_WXS_EXPORT nmWxGeoRefDlg : public QDialog +class NM_SUB_WXS_EXPORT nmWxGeoRefDlg : public iDlgBase { Q_OBJECT diff --git a/Include/nmNum/nmSubWxs/nmWxGeometryLayerDlg.h b/Include/nmNum/nmSubWxs/nmWxGeometryLayerDlg.h index ff530e2..c02204e 100644 --- a/Include/nmNum/nmSubWxs/nmWxGeometryLayerDlg.h +++ b/Include/nmNum/nmSubWxs/nmWxGeometryLayerDlg.h @@ -1,7 +1,7 @@ #ifndef NMWXGEOMETRYLAYERDLG_H #define NMWXGEOMETRYLAYERDLG_H -#include +#include "iDlgBase.h" #include #include "nmSubWxs_global.h" #include "nmDataLayer.h" @@ -16,7 +16,7 @@ class QCheckBox; class nmDataReservoir; -class NM_SUB_WXS_EXPORT nmWxGeometryLayerDlg : public QDialog { +class NM_SUB_WXS_EXPORT nmWxGeometryLayerDlg : public iDlgBase { Q_OBJECT public: nmWxGeometryLayerDlg(); diff --git a/Include/nmNum/nmSubWxs/nmWxGridDlg.h b/Include/nmNum/nmSubWxs/nmWxGridDlg.h index 12bccd1..ac81707 100644 --- a/Include/nmNum/nmSubWxs/nmWxGridDlg.h +++ b/Include/nmNum/nmSubWxs/nmWxGridDlg.h @@ -1,14 +1,14 @@ #ifndef NMWXGRIDDLG_H #define NMWXGRIDDLG_H -#include +#include "iDlgBase.h" #include "nmSubWxs_global.h" class QLineEdit; class QComboBox; -class NM_SUB_WXS_EXPORT nmWxGridDlg : public QDialog +class NM_SUB_WXS_EXPORT nmWxGridDlg : public iDlgBase { Q_OBJECT diff --git a/Include/nmNum/nmSubWxs/nmWxIncludeOtherWells.h b/Include/nmNum/nmSubWxs/nmWxIncludeOtherWells.h index 45271bd..94f8992 100644 --- a/Include/nmNum/nmSubWxs/nmWxIncludeOtherWells.h +++ b/Include/nmNum/nmSubWxs/nmWxIncludeOtherWells.h @@ -2,7 +2,7 @@ #define NMWXINCLUDEOTHERWELLS_H #include "nmSubWxs_global.h" -#include +#include "iDlgBase.h" #include #include #include @@ -26,7 +26,7 @@ struct WellDataRow { } }; -class NM_SUB_WXS_EXPORT nmWxIncludeOtherWells : public QDialog +class NM_SUB_WXS_EXPORT nmWxIncludeOtherWells : public iDlgBase { Q_OBJECT public: diff --git a/Include/nmNum/nmSubWxs/nmWxMeasureDlg.h b/Include/nmNum/nmSubWxs/nmWxMeasureDlg.h index a5a850a..692eb85 100644 --- a/Include/nmNum/nmSubWxs/nmWxMeasureDlg.h +++ b/Include/nmNum/nmSubWxs/nmWxMeasureDlg.h @@ -1,7 +1,7 @@ #ifndef NMWXMEASUREDLG_H #define NMWXMEASUREDLG_H -#include +#include "iDlgBase.h" #include #include "nmSubWxs_global.h" #include "nmDataMeasure.h" @@ -11,7 +11,7 @@ class QPushButton; class nmGUIComponentBase; class nmDataWellBase; -class NM_SUB_WXS_EXPORT nmWxMeasureDlg : public QDialog +class NM_SUB_WXS_EXPORT nmWxMeasureDlg : public iDlgBase { Q_OBJECT public: diff --git a/Include/nmNum/nmSubWxs/nmWxMeasuringScaleDlg.h b/Include/nmNum/nmSubWxs/nmWxMeasuringScaleDlg.h index bdf3bd0..a6faa8c 100644 --- a/Include/nmNum/nmSubWxs/nmWxMeasuringScaleDlg.h +++ b/Include/nmNum/nmSubWxs/nmWxMeasuringScaleDlg.h @@ -1,7 +1,7 @@ #ifndef NMWXMEASURINGSCALEDLG_H #define NMWXMEASURINGSCALEDLG_H -#include +#include "iDlgBase.h" #include "nmSubWxs_global.h" #include "nmDataMeasuringScale.h" @@ -11,7 +11,7 @@ class nmGUIComponentBase; //class nmDataAttribute; -class NM_SUB_WXS_EXPORT nmWxMeasuringScaleDlg : public QDialog { +class NM_SUB_WXS_EXPORT nmWxMeasuringScaleDlg : public iDlgBase { Q_OBJECT public: nmWxMeasuringScaleDlg(QPointF startPoint, QPointF endPoint, double* pLength); diff --git a/Include/nmNum/nmSubWxs/nmWxPerforationClosing.h b/Include/nmNum/nmSubWxs/nmWxPerforationClosing.h index 3612c70..57f2607 100644 --- a/Include/nmNum/nmSubWxs/nmWxPerforationClosing.h +++ b/Include/nmNum/nmSubWxs/nmWxPerforationClosing.h @@ -2,7 +2,7 @@ #define NMWXPERFORATIONCLOSING_H #include -#include +#include "iDlgBase.h" #include #include #include @@ -13,7 +13,7 @@ #include "nmDataPerforation.h" #include "nmDataWellBase.h" -class nmWxPerforationClosing : public QDialog +class nmWxPerforationClosing : public iDlgBase { Q_OBJECT diff --git a/Include/nmNum/nmSubWxs/nmWxPointerPosDlg.h b/Include/nmNum/nmSubWxs/nmWxPointerPosDlg.h index 151f22e..d8366f4 100644 --- a/Include/nmNum/nmSubWxs/nmWxPointerPosDlg.h +++ b/Include/nmNum/nmSubWxs/nmWxPointerPosDlg.h @@ -1,7 +1,7 @@ #ifndef NMWXPOINTERPOSDLG_H #define NMWXPOINTERPOSDLG_H -#include +#include "iDlgBase.h" #include "nmSubWxs_global.h" #include "nmDataGeoRef.h" @@ -12,7 +12,7 @@ class QPushButton; class nmGUIComponentLineEdit; class nmDataAttribute; -class NM_SUB_WXS_EXPORT nmWxPointerPosDlg : public QDialog +class NM_SUB_WXS_EXPORT nmWxPointerPosDlg : public iDlgBase { Q_OBJECT diff --git a/Include/nmNum/nmSubWxs/nmWxPostprocessingAnimationDataFiltering.h b/Include/nmNum/nmSubWxs/nmWxPostprocessingAnimationDataFiltering.h index 1635637..ba6d6a6 100644 --- a/Include/nmNum/nmSubWxs/nmWxPostprocessingAnimationDataFiltering.h +++ b/Include/nmNum/nmSubWxs/nmWxPostprocessingAnimationDataFiltering.h @@ -1,7 +1,7 @@ #ifndef NMWXPOSTPROCESSINGANIMATIONDATAFILTERING_H #define NMWXPOSTPROCESSINGANIMATIONDATAFILTERING_H -#include +#include "iDlgBase.h" #include "nmSubWxs_global.h" class QCheckBox; @@ -9,7 +9,7 @@ class QLineEdit; class QComboBox; class QPushButton; -class NM_SUB_WXS_EXPORT nmWxPostprocessingAnimationDataFiltering : public QDialog +class NM_SUB_WXS_EXPORT nmWxPostprocessingAnimationDataFiltering : public iDlgBase { Q_OBJECT diff --git a/Include/nmNum/nmSubWxs/nmWxPostprocessingAnimationWidget.h b/Include/nmNum/nmSubWxs/nmWxPostprocessingAnimationWidget.h index 1563d49..fa4ab3a 100644 --- a/Include/nmNum/nmSubWxs/nmWxPostprocessingAnimationWidget.h +++ b/Include/nmNum/nmSubWxs/nmWxPostprocessingAnimationWidget.h @@ -73,9 +73,9 @@ private: nmWxPostprocessingAnimationWidget* m_parent; }; -#include +#include "iDlgBase.h" // 区域平均压力显示对话框 -class nmContourResultDialog : public QDialog +class nmContourResultDialog : public iDlgBase { Q_OBJECT diff --git a/Include/nmNum/nmSubWxs/nmWxRCDialog.h b/Include/nmNum/nmSubWxs/nmWxRCDialog.h index ae4dae2..70512a0 100644 --- a/Include/nmNum/nmSubWxs/nmWxRCDialog.h +++ b/Include/nmNum/nmSubWxs/nmWxRCDialog.h @@ -1,7 +1,7 @@ #ifndef NMWXRCDIALOG_H #define NMWXRCDIALOG_H -#include +#include "iDlgBase.h" #include #include #include "nmSubWxs_global.h" @@ -9,7 +9,7 @@ class QTableWidget; class nmWxRCWell; -class NM_SUB_WXS_EXPORT nmWxRCDialog : public QDialog { +class NM_SUB_WXS_EXPORT nmWxRCDialog : public iDlgBase { Q_OBJECT public: nmWxRCDialog(); diff --git a/Include/nmNum/nmSubWxs/nmWxReservoirProperties.h b/Include/nmNum/nmSubWxs/nmWxReservoirProperties.h index 0dba47c..9ca8aa9 100644 --- a/Include/nmNum/nmSubWxs/nmWxReservoirProperties.h +++ b/Include/nmNum/nmSubWxs/nmWxReservoirProperties.h @@ -72,7 +72,7 @@ private: }; #include "nmSubWxs_global.h" -#include +#include "iDlgBase.h" #include #include "nmDataAttribute.h" @@ -80,7 +80,7 @@ class BackupManager; class CustomDelegate; class WxCustomTreeWidget; -class NM_SUB_WXS_EXPORT nmWxReservoirProperties : public QDialog { +class NM_SUB_WXS_EXPORT nmWxReservoirProperties : public iDlgBase { Q_OBJECT public: explicit nmWxReservoirProperties(QWidget* parent = 0); diff --git a/Include/nmNum/nmSubWxs/nmWxReservoirPropertiesDlg.h b/Include/nmNum/nmSubWxs/nmWxReservoirPropertiesDlg.h index bc15ff3..398a3a8 100644 --- a/Include/nmNum/nmSubWxs/nmWxReservoirPropertiesDlg.h +++ b/Include/nmNum/nmSubWxs/nmWxReservoirPropertiesDlg.h @@ -1,7 +1,7 @@ #ifndef NMWXRESERVOIRPROPERTIESDLG_H #define NMWXRESERVOIRPROPERTIESDLG_H -#include +#include "iDlgBase.h" #include #include #include @@ -24,7 +24,7 @@ class QTreeWidgetItem; class QComboBox; class QCheckBox; -class NM_SUB_WXS_EXPORT nmWxReservoirPropertiesDlg : public QDialog { +class NM_SUB_WXS_EXPORT nmWxReservoirPropertiesDlg : public iDlgBase { Q_OBJECT public: nmWxReservoirPropertiesDlg(); diff --git a/Include/nmNum/nmSubWxs/nmWxSelectResultWellsDlg.h b/Include/nmNum/nmSubWxs/nmWxSelectResultWellsDlg.h index 0fdb73f..52fde4f 100644 --- a/Include/nmNum/nmSubWxs/nmWxSelectResultWellsDlg.h +++ b/Include/nmNum/nmSubWxs/nmWxSelectResultWellsDlg.h @@ -1,13 +1,13 @@ #ifndef NMWXSELECTRESULTWELLSDLG_H #define NMWXSELECTRESULTWELLSDLG_H -#include +#include "iDlgBase.h" #include "nmSubWxs_global.h" #include "nmWxSelectResultWellsWidget.h" class QVBoxLayout; -class NM_SUB_WXS_EXPORT nmWxSelectResultWellsDlg : public QDialog +class NM_SUB_WXS_EXPORT nmWxSelectResultWellsDlg : public iDlgBase { Q_OBJECT public: diff --git a/Include/nmNum/nmSubWxs/nmWxSelectWellsDlg.h b/Include/nmNum/nmSubWxs/nmWxSelectWellsDlg.h index 43caf24..9536097 100644 --- a/Include/nmNum/nmSubWxs/nmWxSelectWellsDlg.h +++ b/Include/nmNum/nmSubWxs/nmWxSelectWellsDlg.h @@ -1,12 +1,12 @@ #ifndef nmWxSelectWellsDlg_H #define nmWxSelectWellsDlg_H -#include +#include "iDlgBase.h" #include "nmSubWxs_global.h" class QVBoxLayout; -class NM_SUB_WXS_EXPORT nmWxSelectWellsDlg : public QDialog +class NM_SUB_WXS_EXPORT nmWxSelectWellsDlg : public iDlgBase { Q_OBJECT public: diff --git a/Include/nmNum/nmSubWxs/nmWxSensitive.h b/Include/nmNum/nmSubWxs/nmWxSensitive.h index 97791ad..220c800 100644 --- a/Include/nmNum/nmSubWxs/nmWxSensitive.h +++ b/Include/nmNum/nmSubWxs/nmWxSensitive.h @@ -1,7 +1,7 @@ #ifndef NMWXSENSITIVE_H #define NMWXSENSITIVE_H -#include +#include "iDlgBase.h" #include "nmSubWxs_global.h" #include "nmDataSensitive.h" @@ -18,7 +18,7 @@ class QTableWidget; class QLabel; class QIcon; -class NM_SUB_WXS_EXPORT nmWxSensitive : public QDialog +class NM_SUB_WXS_EXPORT nmWxSensitive : public iDlgBase { Q_OBJECT diff --git a/Include/nmNum/nmSubWxs/nmWxTimeDependentSkin.h b/Include/nmNum/nmSubWxs/nmWxTimeDependentSkin.h index 84b8387..72b3229 100644 --- a/Include/nmNum/nmSubWxs/nmWxTimeDependentSkin.h +++ b/Include/nmNum/nmSubWxs/nmWxTimeDependentSkin.h @@ -1,7 +1,7 @@ #ifndef NMWXTIMEDEPENDENTSKIN_H #define NMWXTIMEDEPENDENTSKIN_H -#include +#include "iDlgBase.h" #include #include #include @@ -26,7 +26,7 @@ class QVBoxLayout; class QHBoxLayout; class QLabel; -class nmWxTimeDependentSkin : public QDialog +class nmWxTimeDependentSkin : public iDlgBase { Q_OBJECT diff --git a/Include/nmNum/nmSubWxs/nmWxWellLayerDlg.h b/Include/nmNum/nmSubWxs/nmWxWellLayerDlg.h index f75d273..a6a5603 100644 --- a/Include/nmNum/nmSubWxs/nmWxWellLayerDlg.h +++ b/Include/nmNum/nmSubWxs/nmWxWellLayerDlg.h @@ -1,12 +1,12 @@ #ifndef NMWXWELLLAYERDLG_H #define NMWXWELLLAYERDLG_H -#include +#include "iDlgBase.h" #include "nmSubWxs_global.h" class QLineEdit; -class NM_SUB_WXS_EXPORT nmWxWellLayerDlg : public QDialog { +class NM_SUB_WXS_EXPORT nmWxWellLayerDlg : public iDlgBase { Q_OBJECT public: nmWxWellLayerDlg(QVector *vLayerHeights = NULL); diff --git a/Include/nmNum/nmSubWxs/nmWxWellboreStorageCalculator.h b/Include/nmNum/nmSubWxs/nmWxWellboreStorageCalculator.h index beba27b..70e30e5 100644 --- a/Include/nmNum/nmSubWxs/nmWxWellboreStorageCalculator.h +++ b/Include/nmNum/nmSubWxs/nmWxWellboreStorageCalculator.h @@ -2,7 +2,7 @@ #define NMWXWELLBORESTORAGECALCULATOR_H #include "nmSubWxs_global.h" -#include +#include "iDlgBase.h" class QButtonGroup; class QRadioButton; @@ -18,7 +18,7 @@ class QGroupBox; class nmWxWellboreStorageCalculatorVolume; class nmWxWellboreStorageCalculatorTubingData; -class NM_SUB_WXS_EXPORT nmWxWellboreStorageCalculator : public QDialog +class NM_SUB_WXS_EXPORT nmWxWellboreStorageCalculator : public iDlgBase { Q_OBJECT public: diff --git a/Include/nmNum/nmSubWxs/nmWxWellboreStorageCalculatorTubingData.h b/Include/nmNum/nmSubWxs/nmWxWellboreStorageCalculatorTubingData.h index 9b3cac8..33865eb 100644 --- a/Include/nmNum/nmSubWxs/nmWxWellboreStorageCalculatorTubingData.h +++ b/Include/nmNum/nmSubWxs/nmWxWellboreStorageCalculatorTubingData.h @@ -2,7 +2,7 @@ #define NMWXWELLBORESTORAGECALCULATORTUBINGDATA_H #include "nmSubWxs_global.h" -#include +#include "iDlgBase.h" #include class QTableWidget; @@ -10,7 +10,7 @@ class QComboBox; class QPushButton; class QLabel; -class NM_SUB_WXS_EXPORT nmWxWellboreStorageCalculatorTubingData : public QDialog +class NM_SUB_WXS_EXPORT nmWxWellboreStorageCalculatorTubingData : public iDlgBase { Q_OBJECT public: diff --git a/Include/nmNum/nmSubWxs/nmWxWellboreStorageCalculatorVolume.h b/Include/nmNum/nmSubWxs/nmWxWellboreStorageCalculatorVolume.h index 6035774..a1c94af 100644 --- a/Include/nmNum/nmSubWxs/nmWxWellboreStorageCalculatorVolume.h +++ b/Include/nmNum/nmSubWxs/nmWxWellboreStorageCalculatorVolume.h @@ -2,7 +2,7 @@ #define NMWXWELLBORESTORAGECALCULATORVOLUME_H #include "nmSubWxs_global.h" -#include +#include "iDlgBase.h" class QTableWidget; class QPushButton; @@ -11,7 +11,7 @@ class QLineEdit; class QComboBox; // 根据井筒高度和内径计算测试井筒体积 -class NM_SUB_WXS_EXPORT nmWxWellboreStorageCalculatorVolume : public QDialog +class NM_SUB_WXS_EXPORT nmWxWellboreStorageCalculatorVolume : public iDlgBase { Q_OBJECT public: diff --git a/Src/nmNum/nmSubWxs/nmWxAutomaticFitting.cpp b/Src/nmNum/nmSubWxs/nmWxAutomaticFitting.cpp index 4e17855..d257308 100644 --- a/Src/nmNum/nmSubWxs/nmWxAutomaticFitting.cpp +++ b/Src/nmNum/nmSubWxs/nmWxAutomaticFitting.cpp @@ -12,7 +12,7 @@ #endif nmWxAutomaticFitting::nmWxAutomaticFitting(QWidget *parent) - : QDialog(parent) + : iDlgBase(parent) , m_autoFitterPSO(nullptr) , m_autoFitterGA(nullptr) , m_progressDialog(nullptr) diff --git a/Src/nmNum/nmSubWxs/nmWxAutomaticFittingStart.cpp b/Src/nmNum/nmSubWxs/nmWxAutomaticFittingStart.cpp index dfdd143..ab79e41 100644 --- a/Src/nmNum/nmSubWxs/nmWxAutomaticFittingStart.cpp +++ b/Src/nmNum/nmSubWxs/nmWxAutomaticFittingStart.cpp @@ -366,7 +366,7 @@ void nmAutomaticFittingCurveChart::drawCircleMarkers(QPainter& painter, const QV } nmWxAutomaticfittingStart::nmWxAutomaticfittingStart(QWidget *parent) - : QDialog(parent) + : iDlgBase(parent) , rightSplitter(nullptr) , chartGroup(nullptr) , curveChart(nullptr) diff --git a/Src/nmNum/nmSubWxs/nmWxChangeAnal.cpp b/Src/nmNum/nmSubWxs/nmWxChangeAnal.cpp index fa652b0..79a910a 100644 --- a/Src/nmNum/nmSubWxs/nmWxChangeAnal.cpp +++ b/Src/nmNum/nmSubWxs/nmWxChangeAnal.cpp @@ -6,7 +6,7 @@ // 构造函数实现 nmWxChangeAnal::nmWxChangeAnal(QWidget *parent, ZxMainWindow* pMainWindow) - : QDialog(parent) // 初始化基类 + : iDlgBase(parent) // 初始化基类 , m_pMainWindow(pMainWindow) // 初始化主窗口指针 , m_pAnalysisLabel(nullptr) // 初始化标签指针 , m_pAnalysisComboBox(nullptr) // 初始化下拉框指针 diff --git a/Src/nmNum/nmSubWxs/nmWxDFN.cpp b/Src/nmNum/nmSubWxs/nmWxDFN.cpp index dbd4ef9..58b4341 100644 --- a/Src/nmNum/nmSubWxs/nmWxDFN.cpp +++ b/Src/nmNum/nmSubWxs/nmWxDFN.cpp @@ -15,7 +15,7 @@ // 构造函数 nmWxDFN::nmWxDFN(QWidget *parent) - : QDialog(parent) + : iDlgBase(parent) { setWindowTitle(tr("DFN")); setMinimumSize(516, 519); diff --git a/Src/nmNum/nmSubWxs/nmWxDFNExportDlg.cpp b/Src/nmNum/nmSubWxs/nmWxDFNExportDlg.cpp index d34162a..1d00e88 100644 --- a/Src/nmNum/nmSubWxs/nmWxDFNExportDlg.cpp +++ b/Src/nmNum/nmSubWxs/nmWxDFNExportDlg.cpp @@ -19,7 +19,7 @@ #include nmWxDFNExportDlg::nmWxDFNExportDlg(QWidget *parent) - : QDialog(parent) + : iDlgBase(parent) { setWindowTitle(tr("Export DFN")); setMinimumSize(400, 200); diff --git a/Src/nmNum/nmSubWxs/nmWxDFNGenerateDlg.cpp b/Src/nmNum/nmSubWxs/nmWxDFNGenerateDlg.cpp index 31aa768..68f1a70 100644 --- a/Src/nmNum/nmSubWxs/nmWxDFNGenerateDlg.cpp +++ b/Src/nmNum/nmSubWxs/nmWxDFNGenerateDlg.cpp @@ -14,7 +14,7 @@ #include nmWxDFNGenerateDlg::nmWxDFNGenerateDlg(QWidget* parent, nmGuiPlot* plot, nmDataOutline* outline) - : QDialog(parent), m_pPlot(plot), m_pOutline(outline) + : iDlgBase(parent), m_pPlot(plot), m_pOutline(outline) { setWindowTitle(tr("Generate DFN")); setMinimumWidth(360); diff --git a/Src/nmNum/nmSubWxs/nmWxDFNLoadFromFile.cpp b/Src/nmNum/nmSubWxs/nmWxDFNLoadFromFile.cpp index 808b44d..bc9399a 100644 --- a/Src/nmNum/nmSubWxs/nmWxDFNLoadFromFile.cpp +++ b/Src/nmNum/nmSubWxs/nmWxDFNLoadFromFile.cpp @@ -18,7 +18,7 @@ // 构造函数 nmWxDFNLoadFromFile::nmWxDFNLoadFromFile(QWidget* pParent) - : QDialog(pParent) + : iDlgBase(pParent) { this->setWindowTitle(tr("Load from file...")); this->setMinimumSize(861, 708); diff --git a/Src/nmNum/nmSubWxs/nmWxDisplaySettings.cpp b/Src/nmNum/nmSubWxs/nmWxDisplaySettings.cpp index 04dd64f..a83fa5e 100644 --- a/Src/nmNum/nmSubWxs/nmWxDisplaySettings.cpp +++ b/Src/nmNum/nmSubWxs/nmWxDisplaySettings.cpp @@ -168,7 +168,7 @@ void CustomDisPlayTreeWidget::paintEvent(QPaintEvent *pEvent) } // --- nmWxDisplaySettings 类实现 --- -nmWxDisplaySettings::nmWxDisplaySettings(QWidget *pParent) : QDialog(pParent) +nmWxDisplaySettings::nmWxDisplaySettings(QWidget *pParent) : iDlgBase(pParent) { setWindowTitle(tr("Display settings")); // 设置窗口标题 resize(313, 416); // 设置窗口大小 diff --git a/Src/nmNum/nmSubWxs/nmWxEditWellPlot.cpp b/Src/nmNum/nmSubWxs/nmWxEditWellPlot.cpp index e13b7b7..065c68d 100644 --- a/Src/nmNum/nmSubWxs/nmWxEditWellPlot.cpp +++ b/Src/nmNum/nmSubWxs/nmWxEditWellPlot.cpp @@ -34,7 +34,7 @@ #include "nmWellEditorController.h" nmWxEditWellPlot::nmWxEditWellPlot(QWidget *parent, ZxDataWell* pZxDataWell, nmDataWellBase* pNmDataWell) - : QDialog(parent) + : iDlgBase(parent) , m_pMainSplitter(nullptr) , m_pTopVLayout(nullptr) , m_pLeftVLayout(nullptr) @@ -563,7 +563,7 @@ void nmWxEditWellPlot::onOkClicked() { if(!m_pNmDataWell) { qDebug() << "nmDataWellBase pointer is null in onOkClicked!"; - QDialog::reject(); + iDlgBase::reject(); return; } @@ -600,7 +600,7 @@ void nmWxEditWellPlot::onOkClicked() manager->updateHorizontalFracturedWells(wells); } } else { - QDialog::reject(); + iDlgBase::reject(); return; } @@ -757,7 +757,7 @@ void nmWxEditWellPlot::keyPressEvent(QKeyEvent *event) } // 对于所有其他按键，调用基类的处理 - QDialog::keyPressEvent(event); + iDlgBase::keyPressEvent(event); } void nmWxEditWellPlot::onTimeDependentIconClicked() diff --git a/Src/nmNum/nmSubWxs/nmWxForecast.cpp b/Src/nmNum/nmSubWxs/nmWxForecast.cpp index d004c90..92369d8 100644 --- a/Src/nmNum/nmSubWxs/nmWxForecast.cpp +++ b/Src/nmNum/nmSubWxs/nmWxForecast.cpp @@ -6,7 +6,7 @@ #include nmWxForecast::nmWxForecast(QWidget *parent) - : QDialog(parent) + : iDlgBase(parent) , m_initialPressureComponent(nullptr) , m_abandonmentRateComponent(nullptr) , m_maximumRateComponent(nullptr) diff --git a/Src/nmNum/nmSubWxs/nmWxGeoRefDlg.cpp b/Src/nmNum/nmSubWxs/nmWxGeoRefDlg.cpp index fed5419..73d1611 100644 --- a/Src/nmNum/nmSubWxs/nmWxGeoRefDlg.cpp +++ b/Src/nmNum/nmSubWxs/nmWxGeoRefDlg.cpp @@ -12,7 +12,7 @@ #include "nmDataAxis.h" nmWxGeoRefDlg::nmWxGeoRefDlg(QWidget* parent) - : QDialog(parent), m_bUpdating(false) + : iDlgBase(parent), m_bUpdating(false) { this->setWindowTitle(tr("Geo referencing")); initUI(); @@ -779,11 +779,11 @@ void nmWxGeoRefDlg::okAccept() nmDataAnalyzeManager::getCurrentInstance()->updateGeoRefData(m_geoRefData); // 调用基类的accept - QDialog::accept(); + iDlgBase::accept(); } void nmWxGeoRefDlg::cancelReject() { // 调用基类的reject - QDialog::reject(); + iDlgBase::reject(); } diff --git a/Src/nmNum/nmSubWxs/nmWxIncludeOtherWells.cpp b/Src/nmNum/nmSubWxs/nmWxIncludeOtherWells.cpp index 7d0702f..71c3bee 100644 --- a/Src/nmNum/nmSubWxs/nmWxIncludeOtherWells.cpp +++ b/Src/nmNum/nmSubWxs/nmWxIncludeOtherWells.cpp @@ -11,7 +11,7 @@ #include nmWxIncludeOtherWells::nmWxIncludeOtherWells(QWidget* pParent) - : QDialog(pParent), m_pTableWidget(nullptr), + : iDlgBase(pParent), m_pTableWidget(nullptr), m_pOkButton(nullptr), m_pCancelButton(nullptr), m_pButtonLayout(nullptr), m_pMainLayout(nullptr) { diff --git a/Src/nmNum/nmSubWxs/nmWxMeasureDlg.cpp b/Src/nmNum/nmSubWxs/nmWxMeasureDlg.cpp index 9ef8ce0..267ac3d 100644 --- a/Src/nmNum/nmSubWxs/nmWxMeasureDlg.cpp +++ b/Src/nmNum/nmSubWxs/nmWxMeasureDlg.cpp @@ -15,7 +15,7 @@ Q_DECLARE_METATYPE(double *) Q_DECLARE_METATYPE(QString *) nmWxMeasureDlg::nmWxMeasureDlg(QWidget* parent) - : QDialog(parent), + : iDlgBase(parent), m_pMainLayout(NULL), m_pFitStartButton(NULL), m_pFitEndButton(NULL), @@ -219,7 +219,7 @@ void nmWxMeasureDlg::updateDisplay() { void nmWxMeasureDlg::closeEvent(QCloseEvent* event) { emit needDeleteMeasureObj(); - QDialog::closeEvent(event); + iDlgBase::closeEvent(event); } void nmWxMeasureDlg::onCloseClicked() diff --git a/Src/nmNum/nmSubWxs/nmWxMeasuringScaleDlg.cpp b/Src/nmNum/nmSubWxs/nmWxMeasuringScaleDlg.cpp index 5090f17..fbe895c 100644 --- a/Src/nmNum/nmSubWxs/nmWxMeasuringScaleDlg.cpp +++ b/Src/nmNum/nmSubWxs/nmWxMeasuringScaleDlg.cpp @@ -84,5 +84,5 @@ void nmWxMeasuringScaleDlg::accept() *m_pLength = m_data.getLength().getValue().toDouble(); // 在这里添加预处理逻辑 - QDialog::accept(); // 调用基类实现 + iDlgBase::accept(); // 调用基类实现 } diff --git a/Src/nmNum/nmSubWxs/nmWxPerforationClosing.cpp b/Src/nmNum/nmSubWxs/nmWxPerforationClosing.cpp index 0c23631..135668e 100644 --- a/Src/nmNum/nmSubWxs/nmWxPerforationClosing.cpp +++ b/Src/nmNum/nmSubWxs/nmWxPerforationClosing.cpp @@ -15,7 +15,7 @@ #include "nmDataAnalyzeManager.h" nmWxPerforationClosing::nmWxPerforationClosing(nmDataWellBase* pWellData, QWidget *parent) - : QDialog(parent) + : iDlgBase(parent) { setWindowTitle(tr("Perforation closing intervals")); setMinimumSize(500, 625); diff --git a/Src/nmNum/nmSubWxs/nmWxPointerPosDlg.cpp b/Src/nmNum/nmSubWxs/nmWxPointerPosDlg.cpp index 95704ac..27f1b42 100644 --- a/Src/nmNum/nmSubWxs/nmWxPointerPosDlg.cpp +++ b/Src/nmNum/nmSubWxs/nmWxPointerPosDlg.cpp @@ -14,7 +14,7 @@ #include nmWxPointerPosDlg::nmWxPointerPosDlg(QWidget* parent) - : QDialog(parent) + : iDlgBase(parent) { setWindowTitle(tr("Pointer position")); diff --git a/Src/nmNum/nmSubWxs/nmWxPostprocessingAnimationDataFiltering.cpp b/Src/nmNum/nmSubWxs/nmWxPostprocessingAnimationDataFiltering.cpp index 66027d9..4fd1a63 100644 --- a/Src/nmNum/nmSubWxs/nmWxPostprocessingAnimationDataFiltering.cpp +++ b/Src/nmNum/nmSubWxs/nmWxPostprocessingAnimationDataFiltering.cpp @@ -9,7 +9,7 @@ #include nmWxPostprocessingAnimationDataFiltering::nmWxPostprocessingAnimationDataFiltering(QWidget* parent) : - QDialog(parent) + iDlgBase(parent) { setWindowTitle(tr("Filtering settings")); setFixedSize(300, 200); diff --git a/Src/nmNum/nmSubWxs/nmWxPostprocessingAnimationWidget.cpp b/Src/nmNum/nmSubWxs/nmWxPostprocessingAnimationWidget.cpp index 9a98cf3..645c185 100644 --- a/Src/nmNum/nmSubWxs/nmWxPostprocessingAnimationWidget.cpp +++ b/Src/nmNum/nmSubWxs/nmWxPostprocessingAnimationWidget.cpp @@ -127,7 +127,7 @@ void nmCustomInteractorStyle::OnLeftButtonDown() { } nmContourResultDialog::nmContourResultDialog(QWidget *parent) - : QDialog(parent) + : iDlgBase(parent) { setWindowTitle(tr("Contour Pressure")); setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); diff --git a/Src/nmNum/nmSubWxs/nmWxReservoirProperties.cpp b/Src/nmNum/nmSubWxs/nmWxReservoirProperties.cpp index 819028b..c4afa7b 100644 --- a/Src/nmNum/nmSubWxs/nmWxReservoirProperties.cpp +++ b/Src/nmNum/nmSubWxs/nmWxReservoirProperties.cpp @@ -328,7 +328,7 @@ bool BackupManager::isEditing(QTreeWidgetItem* item) const { #include nmWxReservoirProperties::nmWxReservoirProperties(QWidget* parent) - : QDialog(parent) { + : iDlgBase(parent) { resize(700, 500); setupUI(); populateTree(); diff --git a/Src/nmNum/nmSubWxs/nmWxReservoirPropertiesDlg.cpp b/Src/nmNum/nmSubWxs/nmWxReservoirPropertiesDlg.cpp index 3c88c9d..b474757 100644 --- a/Src/nmNum/nmSubWxs/nmWxReservoirPropertiesDlg.cpp +++ b/Src/nmNum/nmSubWxs/nmWxReservoirPropertiesDlg.cpp @@ -562,10 +562,10 @@ void nmWxReservoirPropertiesDlg::accept() { // 更新完成后，通知参数界面刷新 nmWxParameterProperty::notifyUpdateTable(); - QDialog::accept(); + iDlgBase::accept(); } void nmWxReservoirPropertiesDlg::reject() { // 放弃所有修改，直接关闭对话框 - QDialog::reject(); + iDlgBase::reject(); } diff --git a/Src/nmNum/nmSubWxs/nmWxSelectResultWellsDlg.cpp b/Src/nmNum/nmSubWxs/nmWxSelectResultWellsDlg.cpp index 11b1497..0c5290a 100644 --- a/Src/nmNum/nmSubWxs/nmWxSelectResultWellsDlg.cpp +++ b/Src/nmNum/nmSubWxs/nmWxSelectResultWellsDlg.cpp @@ -8,7 +8,7 @@ #include "ZxResolutionHelper.h" nmWxSelectResultWellsDlg::nmWxSelectResultWellsDlg(QWidget* parent) - : QDialog(parent), + : iDlgBase(parent), m_mainLayout(NULL), m_wellListWidget(NULL) { diff --git a/Src/nmNum/nmSubWxs/nmWxSelectWellsDlg.cpp b/Src/nmNum/nmSubWxs/nmWxSelectWellsDlg.cpp index 37705f7..7a884b0 100644 --- a/Src/nmNum/nmSubWxs/nmWxSelectWellsDlg.cpp +++ b/Src/nmNum/nmSubWxs/nmWxSelectWellsDlg.cpp @@ -7,7 +7,7 @@ #include "nmData/nmDataLogFile.h" #include "ZxResolutionHelper.h" -nmWxSelectWellsDlg::nmWxSelectWellsDlg(QWidget* parent): QDialog(parent) +nmWxSelectWellsDlg::nmWxSelectWellsDlg(QWidget* parent): iDlgBase(parent) { m_mainLayout = NULL; this->setWindowTitle(tr("Select Wells")); diff --git a/Src/nmNum/nmSubWxs/nmWxSensitive.cpp b/Src/nmNum/nmSubWxs/nmWxSensitive.cpp index b972bfe..c09a1fb 100644 --- a/Src/nmNum/nmSubWxs/nmWxSensitive.cpp +++ b/Src/nmNum/nmSubWxs/nmWxSensitive.cpp @@ -3,7 +3,6 @@ #include "nmDataAnalyzeManager.h" #include "nmDataSensitive.h" -#include #include #include #include @@ -68,7 +67,7 @@ public: }; nmWxSensitive::nmWxSensitive(QWidget *parent) - : QDialog(parent), m_selectedValueIndex(0) // 初始化选中的值索引为0 + : iDlgBase(parent), m_selectedValueIndex(0) // 初始化选中的值索引为0 { m_sensitiveData = nmDataAnalyzeManager::getCurrentInstance()->getSensitiveDataCopy(); setupUI(); diff --git a/Src/nmNum/nmSubWxs/nmWxTimeDependentSkin.cpp b/Src/nmNum/nmSubWxs/nmWxTimeDependentSkin.cpp index 23be81c..523900f 100644 --- a/Src/nmNum/nmSubWxs/nmWxTimeDependentSkin.cpp +++ b/Src/nmNum/nmSubWxs/nmWxTimeDependentSkin.cpp @@ -81,7 +81,7 @@ void nmWxTimeDependentSkin::showForCurrentWell(nmDataWellBase* pSpecificWellData } nmWxTimeDependentSkin::nmWxTimeDependentSkin(nmDataWellBase* pWellData, QWidget *parent) - : QDialog(parent) + : iDlgBase(parent) , m_pChartWidget(nullptr) , m_pOriginalPressureChart(nullptr) , m_pOriginalFlowRateChart(nullptr) diff --git a/Src/nmNum/nmSubWxs/nmWxWellboreStorageCalculator.cpp b/Src/nmNum/nmSubWxs/nmWxWellboreStorageCalculator.cpp index 423820f..1c17d8b 100644 --- a/Src/nmNum/nmSubWxs/nmWxWellboreStorageCalculator.cpp +++ b/Src/nmNum/nmSubWxs/nmWxWellboreStorageCalculator.cpp @@ -15,7 +15,7 @@ #include "nmWxWellboreStorageCalculatorVolume.h" #include "nmWxWellboreStorageCalculatorTubingData.h" -nmWxWellboreStorageCalculator::nmWxWellboreStorageCalculator(QWidget *parent) : QDialog(parent) +nmWxWellboreStorageCalculator::nmWxWellboreStorageCalculator(QWidget *parent) : iDlgBase(parent) { this->initUI(); this->initConnections(); diff --git a/Src/nmNum/nmSubWxs/nmWxWellboreStorageCalculatorTubingData.cpp b/Src/nmNum/nmSubWxs/nmWxWellboreStorageCalculatorTubingData.cpp index d65a411..179424d 100644 --- a/Src/nmNum/nmSubWxs/nmWxWellboreStorageCalculatorTubingData.cpp +++ b/Src/nmNum/nmSubWxs/nmWxWellboreStorageCalculatorTubingData.cpp @@ -9,7 +9,7 @@ #include #include -nmWxWellboreStorageCalculatorTubingData::nmWxWellboreStorageCalculatorTubingData(QWidget *parent) : QDialog(parent) +nmWxWellboreStorageCalculatorTubingData::nmWxWellboreStorageCalculatorTubingData(QWidget *parent) : iDlgBase(parent) { this->initUI(); this->initConnections(); diff --git a/Src/nmNum/nmSubWxs/nmWxWellboreStorageCalculatorVolume.cpp b/Src/nmNum/nmSubWxs/nmWxWellboreStorageCalculatorVolume.cpp index 4d690aa..3c08d38 100644 --- a/Src/nmNum/nmSubWxs/nmWxWellboreStorageCalculatorVolume.cpp +++ b/Src/nmNum/nmSubWxs/nmWxWellboreStorageCalculatorVolume.cpp @@ -11,7 +11,7 @@ #include #include -nmWxWellboreStorageCalculatorVolume::nmWxWellboreStorageCalculatorVolume(QWidget *parent) : QDialog(parent) +nmWxWellboreStorageCalculatorVolume::nmWxWellboreStorageCalculatorVolume(QWidget *parent) : iDlgBase(parent) { this->initUI(); // 初始化用户界面 this->initConnections(); // 连接信号和槽