From 08096c7630f21253d0c983338abe09bb0ca84fa0 Mon Sep 17 00:00:00 2001 From: lvjunjie Date: Fri, 23 Oct 2026 15:04:09 +0800 Subject: [PATCH] =?UTF-8?q?feat(nmNum):=20=E5=A2=9E=E5=8A=A0=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E5=9B=BE=E5=85=A5=E5=8F=A3=E5=B9=B6=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=97=B6=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 预测和敏感性分析设置增加结果图入口及中文翻译。 - 打开项目不再自动弹出结果,敏感性分析生成后仅显示双对数图。 --- Bin/Config/Lang/cn/nmNum_cn.qm | Bin 187431 -> 187606 bytes Bin/Config/Lang/cn/nmNum_cn.ts | 20 +++++++ Include/nmNum/nmSubWnd/nmSubWndMain.h | 2 + Include/nmNum/nmSubWxs/nmWxForecast.h | 3 + Include/nmNum/nmSubWxs/nmWxNumericalDesign.h | 2 + Include/nmNum/nmSubWxs/nmWxSensitive.h | 5 ++ Src/nmNum/nmSubWnd/nmSubWndMain.cpp | 60 ++++++++++++++----- Src/nmNum/nmSubWnd/nmSubWndUtils.cpp | 14 ++--- Src/nmNum/nmSubWxs/nmWxForecast.cpp | 20 +++++++ Src/nmNum/nmSubWxs/nmWxNumericalDesign.cpp | 3 + Src/nmNum/nmSubWxs/nmWxSensitive.cpp | 22 +++++++ 11 files changed, 129 insertions(+), 22 deletions(-) diff --git a/Bin/Config/Lang/cn/nmNum_cn.qm b/Bin/Config/Lang/cn/nmNum_cn.qm index f73a33e2d2849a9e114ce08ca108bfeb54efe743..40d61a60747b7cd3bb07a7c416ad7b6558ce5bd3 100644 GIT binary patch delta 16390 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 delta 16400 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 Dl}U{} diff --git a/Bin/Config/Lang/cn/nmNum_cn.ts b/Bin/Config/Lang/cn/nmNum_cn.ts index ff5abd58..d7252349 100644 --- a/Bin/Config/Lang/cn/nmNum_cn.ts +++ b/Bin/Config/Lang/cn/nmNum_cn.ts @@ -7377,6 +7377,22 @@ Average pressure in contour: %2 MPa nmWxSensitive + + Result plots + 结果图 + + + Loglog plot + 双对数图 + + + History plot + 历史曲线 + + + Histogram + 直方图 + Sensitivity 敏感性分析 @@ -8727,6 +8743,10 @@ Average pressure in contour: %2 MPa nmWxForecast + + Result plots + 结果图 + Forecast 预测 diff --git a/Include/nmNum/nmSubWnd/nmSubWndMain.h b/Include/nmNum/nmSubWnd/nmSubWndMain.h index cf0b5cd5..36f26593 100644 --- a/Include/nmNum/nmSubWnd/nmSubWndMain.h +++ b/Include/nmNum/nmSubWnd/nmSubWndMain.h @@ -173,6 +173,8 @@ class NM_SUB_WND_EXPORT nmSubWndMain : public iSubWndBaseFit { void onAuxiliarySolverTaskDestroyed(); /** @brief 在独立对话框中显示本分析的敏感性结果。 */ void onShowSensitiveResults(); + // 输入窗口菜单按需打开指定结果图。 + void onShowSensitiveResult(int plotType); // 预测结果复用所属分析的独立对话框。 void onShowForecastResult(); void onForecastDataChanged(); diff --git a/Include/nmNum/nmSubWxs/nmWxForecast.h b/Include/nmNum/nmSubWxs/nmWxForecast.h index df624577..df8490e8 100644 --- a/Include/nmNum/nmSubWxs/nmWxForecast.h +++ b/Include/nmNum/nmSubWxs/nmWxForecast.h @@ -33,6 +33,7 @@ public: signals: void sigForecastTaskReady(nmWxForecast* dialog, nmCalculationDllPebiSolverTask* task); void sigForecastCancelRequested(); + void sigShowForecastResult(); public slots: void reject(); @@ -60,6 +61,7 @@ protected: void onCancelClicked(); void onForecastFinished(); void onModelChanged(); + void updateResultButton(); void saveDataToManager(); // Table edit @@ -144,6 +146,7 @@ private: QHBoxLayout *m_buttonLayout; QPushButton *m_loadDataButton; QPushButton *m_generateButton; + QPushButton *m_resultPlotButton; QPushButton *m_cancelButton; // Table diff --git a/Include/nmNum/nmSubWxs/nmWxNumericalDesign.h b/Include/nmNum/nmSubWxs/nmWxNumericalDesign.h index 666651a7..0ddc30b4 100644 --- a/Include/nmNum/nmSubWxs/nmWxNumericalDesign.h +++ b/Include/nmNum/nmSubWxs/nmWxNumericalDesign.h @@ -77,6 +77,8 @@ signals: void sigGenerateClicked(); // 点击生成按钮时发出的信号 // 敏感性批量任务交给所属主窗口,复用普通求解进度框。 void sigSensitivityTaskReady(nmWxSensitive* dialog, nmCalculationDllPebiSolverTask* task); + void sigShowSensitivityResult(int plotType); + void sigShowForecastResult(); void sigIncludeWells(); // 包含其他井后刷新参数栏的信号 /** @brief 用户切换结果井时发送快照中的稳定井 UUID。 */ void sigResultWellChanged(const QString& sWellInstanceId); diff --git a/Include/nmNum/nmSubWxs/nmWxSensitive.h b/Include/nmNum/nmSubWxs/nmWxSensitive.h index 2c4bfbee..eee7b937 100644 --- a/Include/nmNum/nmSubWxs/nmWxSensitive.h +++ b/Include/nmNum/nmSubWxs/nmWxSensitive.h @@ -104,6 +104,7 @@ class NM_SUB_WXS_EXPORT nmWxSensitive : public iDlgBase Q_OBJECT public: + enum ResultPlot { LoglogResult, HistoryResult, HistogramResult }; explicit nmWxSensitive(QWidget *parent = 0, nmDataAnalyzeManager* manager = nullptr); ~nmWxSensitive(); // 主窗口接管普通求解进度框后,才隐藏参数窗口并启动批量任务。 @@ -113,6 +114,7 @@ public: signals: void sigSensitivityTaskReady(nmWxSensitive* dialog, nmCalculationDllPebiSolverTask* task); void sigSensitivityCancelRequested(); + void sigShowSensitivityResult(int plotType); public slots: void reject() override; @@ -134,6 +136,7 @@ protected: void onPreviewScrollAction(int action); void onSensitivityFinished(); void onResultsChanged(); + void onResultPlotTriggered(QAction* action); void onModelResultChanged(); private: @@ -161,6 +164,8 @@ private: QStackedWidget *detailStack; QLabel *modelCountLabel; QSpinBox *m_monteCarloCount; + QPushButton *m_resultPlotsButton; + QAction *m_histogramResultAction; QPushButton *generateButton; QPushButton *cancelButton; QPushButton *previewButton; diff --git a/Src/nmNum/nmSubWnd/nmSubWndMain.cpp b/Src/nmNum/nmSubWnd/nmSubWndMain.cpp index 1e53fd11..9976120b 100644 --- a/Src/nmNum/nmSubWnd/nmSubWndMain.cpp +++ b/Src/nmNum/nmSubWnd/nmSubWndMain.cpp @@ -157,6 +157,7 @@ void resetResultDialog(QDialog* window) plot->setCurveData(QVector()); plot->runUpdate(); } + window->setProperty("nmResultDirty", true); } QSet hiddenSensitiveCurves(iGuiPlot* plot) @@ -363,6 +364,11 @@ void nmSubWndMain::onPebiResultSnapshotChanged() return; } + // 项目读取或结果井切换后清理旧图,保留数据,等待设置窗口请求显示。 + const char* names[] = { "nmForecastResult", "nmSensitivityLoglog", "nmSensitivityHistory", "nmSensitivityHistogram" }; + for(int i = 0; i < 4; ++i) + resetResultDialog(pSubWndFitting->findChild(names[i])); + QSharedPointer pSnapshot = pDataManager->getPebiResultSnapshot(); if(pSnapshot.isNull()) { @@ -372,12 +378,6 @@ void nmSubWndMain::onPebiResultSnapshotChanged() const QString sSnapshotId = pSnapshot->getSnapshotId(); if(sSnapshotId == m_sObservedPebiResultSnapshotId) { - // 切换结果井时关闭上一口井的敏感性窗口及附属表格,保留批次数据供再次查看。 - const char* names[] = { "nmSensitivityLoglog", "nmSensitivityHistory", "nmSensitivityHistogram" }; - for(int i = 0; i < 3; ++i) { - QDialog* window = pSubWndFitting->findChild(names[i]); - if(window) window->close(); - } // 同一快照内切换结果井仍由 onWellSelected() 处理,不重复刷新全部结果页面。 return; } @@ -2210,18 +2210,45 @@ void nmSubWndMain::onShowSensitiveResults() { nmDataAnalyzeManager* manager = m_pResultRefreshDataManager.data(); iSubWndFitting* fitting = m_pResultRefreshFitting.data(); - if(!manager || !fitting || !manager->getSensitiveData()) return; - // 新批次先清理已有窗口的旧数据,再复用原窗口显示结果。 + if(!manager || !fitting) return; + // 新批次先清理已有窗口的旧数据,默认只重绘并显示双对数图。 const char* names[] = { "nmSensitivityLoglog", "nmSensitivityHistory", "nmSensitivityHistogram" }; - for(int i = 0; i < 3; ++i) - resetResultDialog(fitting->findChild(names[i])); + for(int i = 0; i < 3; ++i) { + QDialog* window = fitting->findChild(names[i]); + resetResultDialog(window); + } onSensitiveFilterChanged(); - updateSensitiveHistoryPlot(); - updateSensitiveHistogramPlot(); - const QSharedPointer result = manager->getSensitiveData()->getResults(); + onShowSensitiveResult(nmWxSensitive::LoglogResult); if(sender() == manager) fitting->setModified(true); - if(result.isNull()) return; - QDialog* window = fitting->findChild("nmSensitivityLoglog"); +} + +void nmSubWndMain::onShowSensitiveResult(int plotType) +{ + // 仅从数据中心读取已有批次,已打开的图直接恢复并激活,不重复绘制。 + nmDataAnalyzeManager* manager = m_pResultRefreshDataManager.data(); + iSubWndFitting* fitting = m_pResultRefreshFitting.data(); + if(!manager || !fitting || !manager->getSensitiveData()) return; + const QSharedPointer result = manager->getSensitiveData()->getResults(); + if(result.isNull() || plotType < nmWxSensitive::LoglogResult || + plotType > nmWxSensitive::HistogramResult) return; + if(plotType == nmWxSensitive::HistogramResult && result->m_calcType != nmDataSensitive::CALC_MONTE_CARLO) return; + const char* names[] = { "nmSensitivityLoglog", "nmSensitivityHistory", "nmSensitivityHistogram" }; + QDialog* window = fitting->findChild(names[plotType]); + if(window && !window->property("nmResultDirty").toBool()) { + if(window->isMinimized()) window->showNormal(); + else window->show(); + window->raise(); + window->activateWindow(); + return; + } + if(plotType == nmWxSensitive::HistoryResult) { + updateSensitiveHistoryPlot(); + return; + } + if(plotType == nmWxSensitive::HistogramResult) { + updateSensitiveHistogramPlot(); + return; + } // 与预测一致,直接在结果对话框内创建框架绘图控件,不经过主界面 MDI。 if(!window) { window = createResultDialog("nmSensitivityLoglog", tr("Sensitivity loglog plot")); @@ -2295,6 +2322,7 @@ void nmSubWndMain::onShowSensitiveResults() plot->setReadOnly(true); plot->freshAxisScales(true, false); plot->show(); + window->setProperty("nmResultDirty", false); if(window->isMinimized()) window->showNormal(); else window->show(); window->raise(); @@ -2396,6 +2424,7 @@ void nmSubWndMain::updateSensitiveHistoryPlot() plot->freshAxisScales(true, true); } history->show(); + window->setProperty("nmResultDirty", false); if(window->isMinimized()) window->showNormal(); else window->show(); // 历史图只显示曲线,隐藏框架默认的空数据表侧栏。 @@ -2583,6 +2612,7 @@ void nmSubWndMain::updateSensitiveHistogramPlot() plot->setAxisScaleY(0.0, top, ticksY); plot->setAxisScaleY2(0.0, 110.0, ticksY2); plot->show(); + window->setProperty("nmResultDirty", false); if(window->isMinimized()) window->showNormal(); else window->show(); window->raise(); diff --git a/Src/nmNum/nmSubWnd/nmSubWndUtils.cpp b/Src/nmNum/nmSubWnd/nmSubWndUtils.cpp index faa7ce95..ae3c2ef6 100644 --- a/Src/nmNum/nmSubWnd/nmSubWndUtils.cpp +++ b/Src/nmNum/nmSubWnd/nmSubWndUtils.cpp @@ -485,18 +485,21 @@ void nmSubWndUtils::setupNumericalDockWidgets(nmDataAnalyzeManager* pDataManager pSubWndMain, SLOT(onForecastTaskReady(nmWxForecast*,nmCalculationDllPebiSolverTask*))); connect(pAnalWx, SIGNAL(sigSensitivityTaskReady(nmWxSensitive*,nmCalculationDllPebiSolverTask*)), pSubWndMain, SLOT(onSensitivityTaskReady(nmWxSensitive*,nmCalculationDllPebiSolverTask*))); + connect(pAnalWx, SIGNAL(sigShowForecastResult()), + pSubWndMain, SLOT(onShowForecastResult())); + connect(pAnalWx, SIGNAL(sigShowSensitivityResult(int)), + pSubWndMain, SLOT(onShowSensitiveResult(int))); connect(pAnalWx, SIGNAL(sigResultWellChanged(QString)), pSubWndMain, SLOT(onWellSelected(QString))); // 手工求解和自动拟合都发布同一种正式快照,统一复用主窗口结果刷新逻辑。 pSubWndMain->bindPebiResultRefreshContext(pDataManager, pSubWndFitting); - // 预测发布和失效统一由数据管理器通知,加载时也复用同一绘图入口。 + // 新计算结果自动展示;项目读取只恢复数据,由设置窗口按需打开结果图。 connect(pDataManager, SIGNAL(sigForecastDataChanged()), pSubWndMain, SLOT(onForecastDataChanged()), Qt::UniqueConnection); connect(pDataManager, SIGNAL(sigForecastResultChanged()), pSubWndMain, SLOT(onShowForecastResult()), Qt::UniqueConnection); - connect(pDataManager, SIGNAL(sigPebiResultSnapshotChanged()), - pSubWndMain, SLOT(onShowForecastResult()), Qt::UniqueConnection); + connect(pDataManager, SIGNAL(sigSensitiveResultsChanged()), pSubWndMain, SLOT(onShowSensitiveResults()), static_cast(Qt::QueuedConnection | Qt::UniqueConnection)); @@ -508,10 +511,7 @@ void nmSubWndUtils::setupNumericalDockWidgets(nmDataAnalyzeManager* pDataManager pWxDockNm1->setWidget(pAnalWx); pWxDockNm2->setWidget(pParaWx); - // 成果加载和首次创建面板共用入口,有已保存的敏感性结果时恢复同一子窗口。 - if(pDataManager->getSensitiveData() && !pDataManager->getSensitiveData()->getResults().isNull()) - pSubWndMain->onShowSensitiveResults(); - pSubWndMain->onShowForecastResult(); + } bool nmSubWndUtils::fillNmDockWxs(iSubWnd* pSubWnd) diff --git a/Src/nmNum/nmSubWxs/nmWxForecast.cpp b/Src/nmNum/nmSubWxs/nmWxForecast.cpp index 8b3e4fd0..138c53c8 100644 --- a/Src/nmNum/nmSubWxs/nmWxForecast.cpp +++ b/Src/nmNum/nmSubWxs/nmWxForecast.cpp @@ -73,8 +73,11 @@ nmWxForecast::nmWxForecast(QWidget *parent, nmDataAnalyzeManager* manager) connect(m_manager, SIGNAL(sigPebiResultSnapshotChanged()), this, SLOT(onModelChanged())); connect(m_manager, SIGNAL(sigPebiResultSnapshotChanged()), this, SLOT(reloadInputData())); connect(m_manager, SIGNAL(sigPebiResultStateChanged()), this, SLOT(onModelChanged())); + connect(m_manager, SIGNAL(sigForecastResultChanged()), this, SLOT(updateResultButton())); + connect(m_manager, SIGNAL(sigPebiResultSnapshotChanged()), this, SLOT(updateResultButton())); connect(m_manager, SIGNAL(destroyed()), this, SLOT(close())); } + updateResultButton(); } nmWxForecast::~nmWxForecast() @@ -285,11 +288,15 @@ void nmWxForecast::setupUI() m_buttonLayout = new QHBoxLayout(); m_loadDataButton = new QPushButton(tr("Load data"), this); m_generateButton = new QPushButton(tr("Generate"), this); + // 只有一张预测结果图,直接打开已有结果,不重新求解。 + m_resultPlotButton = new QPushButton(tr("Result plots"), this); + m_resultPlotButton->setObjectName("nmForecastResultPlots"); m_cancelButton = new QPushButton(tr("Cancel"), this); m_loadDataButton->setEnabled(false); m_buttonLayout->addWidget(m_loadDataButton); m_buttonLayout->addStretch(); + m_buttonLayout->addWidget(m_resultPlotButton); m_buttonLayout->addWidget(m_generateButton); m_buttonLayout->addWidget(m_cancelButton); @@ -537,6 +544,7 @@ void nmWxForecast::setupConnections() // Buttons connect(m_loadDataButton, SIGNAL(clicked()), this, SLOT(onLoadDataClicked())); connect(m_generateButton, SIGNAL(clicked()), this, SLOT(onGenerateClicked())); + connect(m_resultPlotButton, SIGNAL(clicked()), this, SIGNAL(sigShowForecastResult())); connect(m_cancelButton, SIGNAL(clicked()), this, SLOT(onCancelClicked())); // Pressure Table @@ -1195,6 +1203,18 @@ void nmWxForecast::onForecastFinished() m_forecastData.setResult(QSharedPointer()); } +void nmWxForecast::updateResultButton() +{ + // 与结果绘图入口保持相同的有效性条件,读取项目后即可查看已保存的结果。 + const QSharedPointer result = m_manager && m_manager->getForecastData() + ? m_manager->getForecastData()->getResult() : QSharedPointer(); + const QSharedPointer snapshot = m_manager + ? m_manager->getPebiResultSnapshot() : QSharedPointer(); + m_resultPlotButton->setEnabled(!result.isNull() && !snapshot.isNull() && + result->snapshotId == snapshot->getSnapshotId() && + result->wellInstanceId == m_manager->getCurrentResultWellInstanceId()); +} + void nmWxForecast::onModelChanged() { // 模型或输入改变时停止本次计算;已显示的结果由所属主界面清理。 diff --git a/Src/nmNum/nmSubWxs/nmWxNumericalDesign.cpp b/Src/nmNum/nmSubWxs/nmWxNumericalDesign.cpp index e6f5b014..13f79352 100644 --- a/Src/nmNum/nmSubWxs/nmWxNumericalDesign.cpp +++ b/Src/nmNum/nmSubWxs/nmWxNumericalDesign.cpp @@ -1451,6 +1451,8 @@ void nmWxNumericalDesign::onForecastClicked() // 关闭和生成后均保留输入窗口,只在首次使用时创建并连接任务信号。 if(m_pForecastDialog.isNull()) { m_pForecastDialog = new nmWxForecast(this, m_pDataManager); + // 设置窗口只请求查看,绘图仍交给所属主窗口。 + connect(m_pForecastDialog, SIGNAL(sigShowForecastResult()), this, SIGNAL(sigShowForecastResult())); connect(m_pForecastDialog, SIGNAL(sigForecastTaskReady(nmWxForecast*,nmCalculationDllPebiSolverTask*)), this, SIGNAL(sigForecastTaskReady(nmWxForecast*,nmCalculationDllPebiSolverTask*))); } @@ -1480,6 +1482,7 @@ void nmWxNumericalDesign::onSensitiveClicked() // 每个分析只创建一个输入窗口,关闭后隐藏,重新打开直接激活。 if(m_pSensitiveDialog.isNull()) { m_pSensitiveDialog = new nmWxSensitive(this, m_pDataManager); + connect(m_pSensitiveDialog, SIGNAL(sigShowSensitivityResult(int)), this, SIGNAL(sigShowSensitivityResult(int))); connect(m_pSensitiveDialog, SIGNAL(sigSensitivityTaskReady(nmWxSensitive*,nmCalculationDllPebiSolverTask*)), this, SIGNAL(sigSensitivityTaskReady(nmWxSensitive*,nmCalculationDllPebiSolverTask*))); } diff --git a/Src/nmNum/nmSubWxs/nmWxSensitive.cpp b/Src/nmNum/nmSubWxs/nmWxSensitive.cpp index cdcf3940..9ddcdc6f 100644 --- a/Src/nmNum/nmSubWxs/nmWxSensitive.cpp +++ b/Src/nmNum/nmSubWxs/nmWxSensitive.cpp @@ -2005,6 +2005,17 @@ void nmWxSensitive::setupUI() generateButton = new QPushButton(tr("Generate"), this); cancelButton = new QPushButton(tr("Cancel"), this); + // 查看已有计算结果,不改变采样配置,也不重新求解。 + m_resultPlotsButton = new QPushButton(tr("Result plots"), this); + m_resultPlotsButton->setObjectName("nmSensitivityResultPlots"); + QMenu* resultMenu = new QMenu(m_resultPlotsButton); + resultMenu->addAction(tr("Loglog plot"))->setData(LoglogResult); + resultMenu->addAction(tr("History plot"))->setData(HistoryResult); + m_histogramResultAction = resultMenu->addAction(tr("Histogram")); + m_histogramResultAction->setData(HistogramResult); + m_resultPlotsButton->setMenu(resultMenu); + connect(resultMenu, SIGNAL(triggered(QAction*)), this, SLOT(onResultPlotTriggered(QAction*))); + bottomLayout->addWidget(m_resultPlotsButton); bottomLayout->addWidget(generateButton); bottomLayout->addWidget(cancelButton); @@ -2713,6 +2724,7 @@ void nmWxSensitive::setCalculationRunning(bool running) detailStack->setEnabled(!running); m_monteCarloCount->setEnabled(!running); previewButton->setEnabled(!running); + m_resultPlotsButton->setEnabled(!running && !m_sensitiveData.getResults().isNull()); cancelButton->setEnabled(!running); if(running) { generateButton->setEnabled(false); @@ -2758,6 +2770,16 @@ void nmWxSensitive::onResultsChanged() if(m_pDataManager && m_pDataManager->getSensitiveData()) results = m_pDataManager->getSensitiveData()->getResults(); m_sensitiveData.setResults(results); + m_resultPlotsButton->setEnabled(!m_calculationRunning && !results.isNull()); + m_histogramResultAction->setEnabled(!results.isNull() && + results->m_calcType == nmDataSensitive::CALC_MONTE_CARLO); +} + +void nmWxSensitive::onResultPlotTriggered(QAction* action) +{ + // 菜单按已生成批次开放,切换输入计算方法不改变旧结果可查看的图形。 + if(!action || m_calculationRunning || m_sensitiveData.getResults().isNull()) return; + emit sigShowSensitivityResult(action->data().toInt()); } void nmWxSensitive::onCalculationTypeChanged(int index)