diff --git a/Bin/Config/Lang/cn/nmNum_cn.qm b/Bin/Config/Lang/cn/nmNum_cn.qm
index f73a33e2..40d61a60 100644
Binary files a/Bin/Config/Lang/cn/nmNum_cn.qm and b/Bin/Config/Lang/cn/nmNum_cn.qm differ
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)