From 0ba39cb556a1950426ac8ec68b7d1b94eaa0cf40 Mon Sep 17 00:00:00 2001 From: lvjunjie Date: Fri, 23 Oct 2026 14:59:00 +0800 Subject: [PATCH] =?UTF-8?q?refactor(nmNum):=20=E5=A4=8D=E7=94=A8=E9=A2=84?= =?UTF-8?q?=E6=B5=8B=E4=B8=8E=E6=95=8F=E6=84=9F=E6=80=A7=E5=88=86=E6=9E=90?= =?UTF-8?q?=E7=AA=97=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 关闭后隐藏复用窗口,刷新时清理旧结果。 - 读取项目后同步输入,修复最小化后窗口尺寸异常。 --- Include/nmNum/nmSubWxs/nmWxAutomaticFitting.h | 1 + Include/nmNum/nmSubWxs/nmWxForecast.h | 2 + Include/nmNum/nmSubWxs/nmWxNumericalDesign.h | 1 + Include/nmNum/nmSubWxs/nmWxSensitive.h | 7 + Src/nmNum/nmSubWnd/nmSubWndMain.cpp | 136 +++++++------ Src/nmNum/nmSubWxs/nmWxAutomaticFitting.cpp | 20 ++ Src/nmNum/nmSubWxs/nmWxForecast.cpp | 13 ++ Src/nmNum/nmSubWxs/nmWxNumericalDesign.cpp | 15 +- Src/nmNum/nmSubWxs/nmWxSensitive.cpp | 184 +++++++++++++++--- 9 files changed, 278 insertions(+), 101 deletions(-) diff --git a/Include/nmNum/nmSubWxs/nmWxAutomaticFitting.h b/Include/nmNum/nmSubWxs/nmWxAutomaticFitting.h index 0c3d4172..cb5ffd8a 100644 --- a/Include/nmNum/nmSubWxs/nmWxAutomaticFitting.h +++ b/Include/nmNum/nmSubWxs/nmWxAutomaticFitting.h @@ -37,6 +37,7 @@ public: const QStringList& sampledParameters = QStringList()); ~nmWxAutomaticFitting(); virtual QSize sizeHint() const; + void reloadSensitivitySettings(const QStringList& sampledParameters); private slots: void onSelectAll(bool checked); diff --git a/Include/nmNum/nmSubWxs/nmWxForecast.h b/Include/nmNum/nmSubWxs/nmWxForecast.h index 2ab3d0de..df624577 100644 --- a/Include/nmNum/nmSubWxs/nmWxForecast.h +++ b/Include/nmNum/nmSubWxs/nmWxForecast.h @@ -36,6 +36,7 @@ signals: public slots: void reject(); + void reloadInputData(); protected: void closeEvent(QCloseEvent* event); @@ -89,6 +90,7 @@ private: private: + bool m_loading; ///< 读取配置时禁止界面信号写回旧值。 nmDataForecast m_forecastData; QPointer m_manager; ///< 固定所属分析窗口,不跟随全局当前窗口。 nmCalculationDllPebiSolverTask* m_task; diff --git a/Include/nmNum/nmSubWxs/nmWxNumericalDesign.h b/Include/nmNum/nmSubWxs/nmWxNumericalDesign.h index a13fd4d0..666651a7 100644 --- a/Include/nmNum/nmSubWxs/nmWxNumericalDesign.h +++ b/Include/nmNum/nmSubWxs/nmWxNumericalDesign.h @@ -229,6 +229,7 @@ private: QPushButton* m_pForecastBtn; QPointer m_pForecastDialog; ///< 每个分析面板复用自己的预测输入窗口。 QPushButton* m_pSensitiveBtn; + QPointer m_pSensitiveDialog; ///< 每个分析面板复用自己的敏感性分析输入窗口。 QHBoxLayout* m_pGenerateLayout; // 主布局 diff --git a/Include/nmNum/nmSubWxs/nmWxSensitive.h b/Include/nmNum/nmSubWxs/nmWxSensitive.h index a75774ac..2c4bfbee 100644 --- a/Include/nmNum/nmSubWxs/nmWxSensitive.h +++ b/Include/nmNum/nmSubWxs/nmWxSensitive.h @@ -34,12 +34,14 @@ class NM_SUB_WXS_EXPORT nmWxSensitivityHistogramOptions : public iDlgBase public: nmWxSensitivityHistogramOptions(const QSharedPointer& results, int bins, QWidget* parent); + void setResults(const QSharedPointer& results); signals: void settingsChanged(int bins, int variable); private slots: void onApply(); void onAccept(); private: + QTableView* m_table; QSpinBox* m_bins; QComboBox* m_variable; }; @@ -50,6 +52,7 @@ class NM_SUB_WXS_EXPORT nmWxSensitivityScatter : public iDlgBase public: nmWxSensitivityScatter(const QSharedPointer& results, double baseError, QWidget* parent = nullptr); + void setResults(const QSharedPointer& results, double baseError); signals: void filterChanged(); protected: @@ -83,6 +86,7 @@ public: nmWxSensitivityShow(const QSharedPointer& results, iGuiPlot* plot, QWidget* parent); void done(int result) override; + void setResults(const QSharedPointer& results); private slots: void onApply(); @@ -104,6 +108,7 @@ public: ~nmWxSensitive(); // 主窗口接管普通求解进度框后,才隐藏参数窗口并启动批量任务。 void startSensitivityCalculation(); + void reloadInputData(); signals: void sigSensitivityTaskReady(nmWxSensitive* dialog, nmCalculationDllPebiSolverTask* task); @@ -176,8 +181,10 @@ private: // 跟踪当前选中的值索引 int m_selectedValueIndex; + QSharedPointer m_improveSettingsDraft; bool m_loading; nmDataAnalyzeManager* m_pDataManager; + const nmDataSensitive* m_sourceData; ///< 识别项目读取后数据对象的替换,不持有其所有权。 SensitivityRunsView* m_previewView; nmCalculationDllPebiSolverTask* m_pSensitivityTask; bool m_calculationRunning; diff --git a/Src/nmNum/nmSubWnd/nmSubWndMain.cpp b/Src/nmNum/nmSubWnd/nmSubWndMain.cpp index bee80262..1e53fd11 100644 --- a/Src/nmNum/nmSubWnd/nmSubWndMain.cpp +++ b/Src/nmNum/nmSubWnd/nmSubWndMain.cpp @@ -130,6 +130,35 @@ void clearResultCurveDataTables(iGuiPlot* plot) } } +// 结果替换时保留窗口,清理旧批次引用、曲线与框架表格,随后按需重绘。 +void resetResultDialog(QDialog* window) +{ + if(!window) return; + // 最小化窗口在隐藏重绘前恢复正常尺寸,避免小图标尺寸成为下次显示尺寸。 + const bool minimized = window->isMinimized(); + const QRect normalGeometry = window->normalGeometry(); + window->hide(); + if(minimized) { + window->setWindowState(window->windowState() & ~Qt::WindowMinimized); + window->setGeometry(normalGeometry); + } + foreach(iGuiPlot* plot, window->findChildren()) clearResultCurveDataTables(plot); + foreach(nmWxSensitivityShow* dialog, window->findChildren()) + dialog->setResults(QSharedPointer()); + foreach(nmWxSensitivityHistogramOptions* dialog, window->findChildren()) + dialog->setResults(QSharedPointer()); + foreach(nmWxSensitivityScatter* dialog, window->findChildren()) + dialog->setResults(QSharedPointer(), -1.0); + foreach(iGuiPlot* plot, window->findChildren()) { + clearResultCurveDataTables(plot); + for(int i = plot->m_pPlot->getObjCount() - 1; i >= 0; --i) + if(qobject_cast(plot->m_pPlot->getObjByIndex(i))) plot->m_pPlot->removeObjByIndex(i); + plot->clearUndoStack(); + plot->setCurveData(QVector()); + plot->runUpdate(); + } +} + QSet hiddenSensitiveCurves(iGuiPlot* plot) { // 刷新同一批次或重新打开窗口时保留本图的显示选择。 @@ -1950,12 +1979,12 @@ void nmSubWndMain::onForecastDataChanged() QDialog* nmSubWndMain::createResultDialog(const QString& name, const QString& title) { - // 关闭时销毁结果窗口及子控件,计算结果保留在数据中心供再次查看。 + // 关闭只隐藏,窗口及绘图控件由所属分析统一销毁。 QDialog* dialog = new QDialog(m_pResultRefreshFitting.data(), Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint); dialog->setObjectName(name); dialog->setWindowTitle(title); - dialog->setAttribute(Qt::WA_DeleteOnClose, true); + dialog->setAttribute(Qt::WA_DeleteOnClose, false); dialog->resize(900, 650); QVBoxLayout* layout = new QVBoxLayout(dialog); layout->setContentsMargins(0, 0, 0, 0); @@ -1978,10 +2007,7 @@ void nmSubWndMain::onShowForecastResult() result->snapshotId != snapshot->getSnapshotId() || result->wellInstanceId != manager->getCurrentResultWellInstanceId()) { // 基础结果或结果井切换后清除旧窗口;模型参数编辑不影响上次预测的显示。 - if(window) { - foreach(iGuiPlot* plot, window->findChildren()) clearResultCurveDataTables(plot); - delete window; - } + resetResultDialog(window); return; } const QVector& times = result->times; @@ -2098,7 +2124,9 @@ void nmSubWndMain::onShowForecastResult() // 时间刻度及标题只在下图显示,上图仍保留横轴数据与同步关系。 plot->getAxisOf(0)->setMinimizeAxis(i == 0); } - window->show(); + // 再次生成时恢复已最小化的结果窗口,正常或最大化状态保持不变。 + if(window->isMinimized()) window->showNormal(); + else window->show(); window->raise(); window->activateWindow(); QTimer::singleShot(0, this, SLOT(fitForecastViews())); @@ -2180,31 +2208,24 @@ void nmSubWndMain::syncForecastTimeAxis(double minimum, double maximum, bool rec void nmSubWndMain::onShowSensitiveResults() { - // 使用固定所属分析的窗口与数据,不能把结果画到当前活动的其他分析中。 nmDataAnalyzeManager* manager = m_pResultRefreshDataManager.data(); iSubWndFitting* fitting = m_pResultRefreshFitting.data(); if(!manager || !fitting || !manager->getSensitiveData()) return; - // 新批次或清空结果时同步移除上一批的上下限分组。 + // 新批次先清理已有窗口的旧数据,再复用原窗口显示结果。 + const char* names[] = { "nmSensitivityLoglog", "nmSensitivityHistory", "nmSensitivityHistogram" }; + for(int i = 0; i < 3; ++i) + resetResultDialog(fitting->findChild(names[i])); onSensitiveFilterChanged(); updateSensitiveHistoryPlot(); updateSensitiveHistogramPlot(); - QSharedPointer result = manager->getSensitiveData()->getResults(); + const QSharedPointer result = manager->getSensitiveData()->getResults(); + if(sender() == manager) fitting->setModified(true); + if(result.isNull()) return; QDialog* window = fitting->findChild("nmSensitivityLoglog"); - if(result.isNull()) { - // 清除批次时销毁旧图及附属窗口。 - if(window) { - window->close(); - delete window; - } - if(sender() == manager) fitting->setModified(true); - return; - } - iGuiPlot* plot = window ? window->findChild() : nullptr; - if(plot) clearResultCurveDataTables(plot); // 与预测一致,直接在结果对话框内创建框架绘图控件,不经过主界面 MDI。 if(!window) { window = createResultDialog("nmSensitivityLoglog", tr("Sensitivity loglog plot")); - plot = new iGuiPlot(true, window); + iGuiPlot* plot = new iGuiPlot(true, window); plot->initUI(tr("Sensitivity loglog plot")); plot->m_pPlotView->setSimpleMode(true); plot->setAxisX(tr("Time"), "hr"); @@ -2212,10 +2233,10 @@ void nmSubWndMain::onShowSensitiveResults() plot->m_pPlot->setBKColor(Qt::white); window->layout()->addWidget(plot); } + iGuiPlot* plot = window->findChild(); connect(plot, SIGNAL(sigDoubleClicked(ZxPlot*,ZxObjBase*,const QPointF&,bool&)), this, SLOT(onReadonlyCurveDoubleClicked(ZxPlot*,ZxObjBase*,const QPointF&,bool&)), Qt::UniqueConnection); installSensitiveShow(plot); - const QSet hidden = sender() == manager ? QSet() : hiddenSensitiveCurves(plot); QVector curves; QVector > history = result->m_vecHistoryLogLog; if(history.size() == 3 && history[0].size() == history[1].size() && @@ -2269,31 +2290,15 @@ void nmSubWndMain::onShowSensitiveResults() plot->setAxisXYLog(true, 1); if(!result->m_sAxisXName.isEmpty()) plot->setAxisX(result->m_sAxisXName, result->m_sAxisXUnit); if(!result->m_sAxisYName.isEmpty()) plot->setAxisY(result->m_sAxisYName, result->m_sAxisYUnit); - // 框架刷新只创建或更新传入曲线,不删除缺席曲线,先移除已隐藏或上一批残留的图元。 - QSet visibleNames; - for(int i = 0; i < curves.size(); ++i) visibleNames.insert(curves[i].m_sCurveName); - bool removed = false; - for(int i = plot->m_pPlot->getObjCount() - 1; i >= 0; --i) { - ZxObjCurve* curve = qobject_cast(plot->m_pPlot->getObjByIndex(i)); - if(curve && !visibleNames.contains(curve->getName())) { - plot->m_pPlot->removeObjByIndex(i); - removed = true; - } - } - // 清理删除曲线相关的撤销记录,避免后续操作恢复已经隐藏的图元。 - if(removed) plot->clearUndoStack(); plot->setCurveData(curves); plot->runUpdate(); - for(int i = 0; i < curves.size(); ++i) - if(ZxObjCurve* curve = plot->getCurve(curves[i].m_sCurveName)) - curve->setVisible(!hidden.contains(curve->getName())); plot->setReadOnly(true); plot->freshAxisScales(true, false); plot->show(); - window->show(); + if(window->isMinimized()) window->showNormal(); + else window->show(); window->raise(); window->activateWindow(); - if(sender() == manager) fitting->setModified(true); } void nmSubWndMain::updateSensitiveHistoryPlot() @@ -2305,11 +2310,8 @@ void nmSubWndMain::updateSensitiveHistoryPlot() QDialog* window = fitting->findChild("nmSensitivityHistory"); const QSharedPointer batch = manager->getSensitiveData()->getResults(); if(batch.isNull()) { - // 新模型丢弃旧批次时一并销毁窗口,曲线和撤销记录不再残留。 - if(window) { - window->close(); - delete window; - } + // 新模型丢弃旧批次时清空并隐藏窗口,曲线和撤销记录不再残留。 + resetResultDialog(window); return; } const bool created = window == nullptr; @@ -2394,7 +2396,8 @@ void nmSubWndMain::updateSensitiveHistoryPlot() plot->freshAxisScales(true, true); } history->show(); - window->show(); + if(window->isMinimized()) window->showNormal(); + else window->show(); // 历史图只显示曲线,隐藏框架默认的空数据表侧栏。 history->m_pTableHelper->hide(); window->raise(); @@ -2439,7 +2442,9 @@ void nmSubWndMain::onSensitiveShowClicked() // 发布新批次或清除旧模型后关闭旧表格,不能再操作上一批曲线。 connect(manager, SIGNAL(sigSensitiveResultsChanged()), dialog, SLOT(reject())); } - dialog->show(); + dialog->setResults(batch); + if(dialog->isMinimized()) dialog->showNormal(); + else dialog->show(); dialog->raise(); dialog->activateWindow(); } @@ -2453,10 +2458,7 @@ void nmSubWndMain::updateSensitiveHistogramPlot() const QSharedPointer batch = manager->getSensitiveData()->getResults(); if(batch.isNull() || batch->m_calcType != nmDataSensitive::CALC_MONTE_CARLO) { // 新模型或确定性批次不保留上一批 Monte-Carlo 的统计图。 - if(window) { - window->close(); - delete window; - } + resetResultDialog(window); return; } const bool created = window == nullptr; @@ -2523,6 +2525,7 @@ void nmSubWndMain::updateSensitiveHistogramPlot() const int index = qMin(binCount - 1, int((values[i] - minimum) / width)); ++counts[index]; } + clearResultCurveDataTables(plot); for(int i = plot->m_pPlot->getObjCount() - 1; i >= 0; --i) if(qobject_cast(plot->m_pPlot->getObjByIndex(i))) plot->m_pPlot->removeObjByIndex(i); plot->clearUndoStack(); @@ -2580,7 +2583,8 @@ void nmSubWndMain::updateSensitiveHistogramPlot() plot->setAxisScaleY(0.0, top, ticksY); plot->setAxisScaleY2(0.0, 110.0, ticksY2); plot->show(); - window->show(); + if(window->isMinimized()) window->showNormal(); + else window->show(); window->raise(); window->activateWindow(); } @@ -2600,7 +2604,9 @@ void nmSubWndMain::onSensitiveHistogramOptions() connect(dialog, SIGNAL(settingsChanged(int,int)), this, SLOT(onSensitiveHistogramSettingsChanged(int,int))); connect(manager, SIGNAL(sigSensitiveResultsChanged()), dialog, SLOT(reject())); } - dialog->show(); + dialog->setResults(batch); + if(dialog->isMinimized()) dialog->showNormal(); + else dialog->show(); dialog->raise(); dialog->activateWindow(); } @@ -2645,16 +2651,16 @@ void nmSubWndMain::onSensitiveScatter() QDialog* window = fitting->findChild("nmSensitivityHistogram"); if(!window) return; nmWxSensitivityScatter* dialog = window->findChild(); + double baseError = -1.0; + const QSharedPointer snapshot = manager->getPebiResultSnapshot(); + for(int i = 0; !snapshot.isNull() && i < snapshot->getWellCount(); ++i) { + const nmPebiResultWellSnapshot* well = snapshot->getWellAt(i); + if(well->m_sWellCode != batch->m_sWellCode) continue; + baseError = nmCalculationDllPebiSolverTask::calculatePressureRmse( + well->m_oCurves.m_vecHistoryPressure, well->m_oCurves.m_vecResultPressure); + break; + } if(!dialog) { - double baseError = -1.0; - const QSharedPointer snapshot = manager->getPebiResultSnapshot(); - for(int i = 0; !snapshot.isNull() && i < snapshot->getWellCount(); ++i) { - const nmPebiResultWellSnapshot* well = snapshot->getWellAt(i); - if(well->m_sWellCode != batch->m_sWellCode) continue; - baseError = nmCalculationDllPebiSolverTask::calculatePressureRmse( - well->m_oCurves.m_vecHistoryPressure, well->m_oCurves.m_vecResultPressure); - break; - } dialog = new nmWxSensitivityScatter(batch, baseError, window); connect(dialog, SIGNAL(filterChanged()), this, SLOT(onSensitiveFilterChanged())); // 构造时已应用初始阈值,连接完成后补一次结果面板同步。 @@ -2662,7 +2668,9 @@ void nmSubWndMain::onSensitiveScatter() // 新结果或新模型生成后关闭弹窗,避免保留旧批次的点和阈值。 connect(manager, SIGNAL(sigSensitiveResultsChanged()), dialog, SLOT(reject())); } - dialog->show(); + dialog->setResults(batch, baseError); + if(dialog->isMinimized()) dialog->showNormal(); + else dialog->show(); dialog->raise(); dialog->activateWindow(); } diff --git a/Src/nmNum/nmSubWxs/nmWxAutomaticFitting.cpp b/Src/nmNum/nmSubWxs/nmWxAutomaticFitting.cpp index 27c726da..f8fd803d 100644 --- a/Src/nmNum/nmSubWxs/nmWxAutomaticFitting.cpp +++ b/Src/nmNum/nmSubWxs/nmWxAutomaticFitting.cpp @@ -329,6 +329,26 @@ nmWxAutomaticFitting::nmWxAutomaticFitting(QWidget *parent, nmSensitivityFitSett DEBUG_UI("AutoFitting Constructor completed"); } +void nmWxAutomaticFitting::reloadSensitivitySettings(const QStringList& sampledParameters) +{ + // 敏感性设置复用原对话框,每次打开恢复已确认配置和本次禁用的采样参数。 + m_sampledParameters = sampledParameters; + nmDataAnalyzeManager* manager = nmDataAnalyzeManager::getCurrentInstance(); + reservoirData = manager->getReservoirDataCopy(); + automaticFittingData = m_sensitivitySettings->confirmed + ? m_sensitivitySettings->parameters : manager->getAutomaticFittingDataCopy(); + if(!m_sensitivitySettings->confirmed) automaticFittingData.getModelParameters().clear(); + nmDataWellBase* well = manager->findWellByCode(manager->getPrimaryWellCode()); + m_targetWellName = well ? well->getWellName() : QString(); + m_targetWellCode = well ? well->getWellCode() : QString(); + m_updatingParameterRanges = true; + initializeModelParameters(); + m_iterationEdit->setText(QString::number(automaticFittingData.getIterationCount().getValue().toInt())); + m_errorLimitEdit->setText(QString::number(automaticFittingData.getErrorTolerance().getValue().toDouble())); + onAlgorithmChanged(1); + m_updatingParameterRanges = false; +} + QSize nmWxAutomaticFitting::sizeHint() const { // 与改版前设置窗口保持相同推荐尺寸,仍允许手动放大。 diff --git a/Src/nmNum/nmSubWxs/nmWxForecast.cpp b/Src/nmNum/nmSubWxs/nmWxForecast.cpp index b6501a9e..8b3e4fd0 100644 --- a/Src/nmNum/nmSubWxs/nmWxForecast.cpp +++ b/Src/nmNum/nmSubWxs/nmWxForecast.cpp @@ -14,6 +14,7 @@ nmWxForecast::nmWxForecast(QWidget *parent, nmDataAnalyzeManager* manager) : iDlgBase(parent) + , m_loading(false) , m_manager(manager ? manager : nmDataAnalyzeManager::getCurrentInstance()) , m_task(NULL) , m_calculationRunning(false) @@ -70,6 +71,7 @@ nmWxForecast::nmWxForecast(QWidget *parent, nmDataAnalyzeManager* manager) } if(m_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(destroyed()), this, SLOT(close())); } @@ -109,8 +111,19 @@ void nmWxForecast::loadDataFromManager() m_multipleRatesRadio->blockSignals(false); } +void nmWxForecast::reloadInputData() +{ + // 保留输入窗口,模型或项目读取通知后同步数据中心配置,不触发反向保存。 + if(m_calculationRunning) return; + m_loading = true; + loadDataFromManager(); + updateParametersForOption(); + m_loading = false; +} + void nmWxForecast::saveDataToManager() { + if(m_loading) return; // 先从界面更新数据 updateDataFromUI(); diff --git a/Src/nmNum/nmSubWxs/nmWxNumericalDesign.cpp b/Src/nmNum/nmSubWxs/nmWxNumericalDesign.cpp index 386e2740..e6f5b014 100644 --- a/Src/nmNum/nmSubWxs/nmWxNumericalDesign.cpp +++ b/Src/nmNum/nmSubWxs/nmWxNumericalDesign.cpp @@ -1477,11 +1477,16 @@ void nmWxNumericalDesign::onSensitiveClicked() // 没有模型时直接阻止进入,正常交互由按钮置灰表达,不再等生成分析时弹框。 updateSensitiveButtonEnabled(); if(!m_pSensitiveBtn->isEnabled()) return; - nmWxSensitive* dlg = new nmWxSensitive(this, m_pDataManager); - // 按数值生成按钮的现有路径,将任务请求转发给所属主窗口。 - connect(dlg, SIGNAL(sigSensitivityTaskReady(nmWxSensitive*,nmCalculationDllPebiSolverTask*)), - this, SIGNAL(sigSensitivityTaskReady(nmWxSensitive*,nmCalculationDllPebiSolverTask*))); - dlg->show(); + // 每个分析只创建一个输入窗口,关闭后隐藏,重新打开直接激活。 + if(m_pSensitiveDialog.isNull()) { + m_pSensitiveDialog = new nmWxSensitive(this, m_pDataManager); + connect(m_pSensitiveDialog, SIGNAL(sigSensitivityTaskReady(nmWxSensitive*,nmCalculationDllPebiSolverTask*)), + this, SIGNAL(sigSensitivityTaskReady(nmWxSensitive*,nmCalculationDllPebiSolverTask*))); + } + if(m_pSensitiveDialog->isMinimized()) m_pSensitiveDialog->showNormal(); + else m_pSensitiveDialog->show(); + m_pSensitiveDialog->raise(); + m_pSensitiveDialog->activateWindow(); } // 实现通知方法 diff --git a/Src/nmNum/nmSubWxs/nmWxSensitive.cpp b/Src/nmNum/nmSubWxs/nmWxSensitive.cpp index 02081152..cdcf3940 100644 --- a/Src/nmNum/nmSubWxs/nmWxSensitive.cpp +++ b/Src/nmNum/nmSubWxs/nmWxSensitive.cpp @@ -227,6 +227,18 @@ public: highlightRun(-1); } + QSharedPointer results() const { return m_results; } + + void setResults(const QSharedPointer& results) + { + // 重置行数与列数,旧批次的选择和高亮不能带到新结果。 + highlightRun(-1); + beginResetModel(); + m_pendingVisibility.clear(); + m_results = results; + endResetModel(); + } + QList runCurves(int row) const { // 双对数图的一组包含压力与导数,历史压力图只包含压力。 @@ -257,7 +269,7 @@ public: int columnCount(const QModelIndex& parent = QModelIndex()) const override { - return parent.isValid() ? 0 : 3 + (m_statistics ? m_results->m_fitParameters.size() : 0); + return parent.isValid() ? 0 : 3 + (m_statistics && !m_results.isNull() ? m_results->m_fitParameters.size() : 0); } QVariant headerData(int section, Qt::Orientation orientation, int role) const override @@ -278,7 +290,7 @@ public: } if(role != Qt::DisplayRole) return QVariant(); if(m_statistics) { - if(section >= 3 && section - 3 < m_results->m_fitParameters.size()) { + if(!m_results.isNull() && section >= 3 && section - 3 < m_results->m_fitParameters.size()) { const nmDataAttribute& parameter = m_results->m_fitParameters[section - 3]; return parameter.getName() + (parameter.getUnit().isEmpty() ? QString() : " [" + parameter.getUnit() + "]"); @@ -474,7 +486,7 @@ nmWxSensitivityShow::nmWxSensitivityShow( : iDlgBase(parent) { // 沿用原 Results 的白色表格及按钮布局,勾选在 Apply 或 OK 后生效。 - setAttribute(Qt::WA_DeleteOnClose); + setAttribute(Qt::WA_DeleteOnClose, false); setObjectName("nmSensitivityShowDialog"); resize(700, 380); QVBoxLayout* layout = new QVBoxLayout(this); @@ -522,10 +534,20 @@ nmWxSensitivityShow::nmWxSensitivityShow( void nmWxSensitivityShow::done(int result) { // 确认、取消及关闭都结束临时高亮,不改变已应用的显示选择。 - m_model->highlightRun(-1); + setResults(m_model->results()); iDlgBase::done(result); } +void nmWxSensitivityShow::setResults(const QSharedPointer& results) +{ + // 保留窗口和模型对象,重新打开时取消未应用的勾选和临时高亮。 + m_highlight->blockSignals(true); + m_highlight->setChecked(false); + m_highlight->blockSignals(false); + m_model->setResults(results); + updateHighlight(); +} + void nmWxSensitivityShow::onApply() { // 应用选择,保留窗口以便继续调整。 @@ -559,7 +581,7 @@ nmWxSensitivityHistogramOptions::nmWxSensitivityHistogramOptions( : iDlgBase(parent) { // 复用运行表格;第四种在误差后追加拟合参数,选择变量后按原有 Apply/OK 流程生效。 - setAttribute(Qt::WA_DeleteOnClose); + setAttribute(Qt::WA_DeleteOnClose, false); setObjectName("nmHistogramOptions"); setWindowTitle(tr("Histogram options")); resize(720, 400); @@ -579,7 +601,7 @@ nmWxSensitivityHistogramOptions::nmWxSensitivityHistogramOptions( m_variable->setCurrentIndex(m_variable->findData(results->m_nHistogramVariable)); options->addWidget(m_variable); layout->addLayout(options); - QTableView* table = new QTableView(this); + QTableView* table = m_table = new QTableView(this); table->setStyleSheet("QTableView { background-color: white; }"); table->setModel(new SensitivityResultsModel(results, nullptr, table, true)); table->setSelectionBehavior(QAbstractItemView::SelectRows); @@ -605,6 +627,22 @@ nmWxSensitivityHistogramOptions::nmWxSensitivityHistogramOptions( connect(cancel, SIGNAL(clicked()), this, SLOT(reject())); } +void nmWxSensitivityHistogramOptions::setResults(const QSharedPointer& results) +{ + // 复用表格模型,同时恢复当前批次已应用的分箱和统计变量。 + static_cast(m_table->model())->setResults(results); + m_variable->clear(); + m_variable->addItem(tr("Goodness of fit"), -1); + if(!results.isNull()) { + for(int i = 0; i < results->m_fitParameters.size(); ++i) + m_variable->addItem(results->m_fitParameters[i].getName(), i); + m_variable->setCurrentIndex(m_variable->findData(results->m_nHistogramVariable)); + m_bins->setValue(results->m_nHistogramBins); + } + for(int i = 2; i < m_table->model()->columnCount(); ++i) + m_table->horizontalHeader()->setResizeMode(i, QHeaderView::ResizeToContents); +} + void nmWxSensitivityHistogramOptions::onApply() { // 分箱数与横轴变量一起提交,取消不会撤销已经应用的设置。 @@ -625,7 +663,7 @@ nmWxSensitivityScatter::nmWxSensitivityScatter( { // 散点与基准均来自同一批次快照,不读取后来编辑的模型参数。 setObjectName("nmSensitivityScatterPlot"); - setAttribute(Qt::WA_DeleteOnClose); + setAttribute(Qt::WA_DeleteOnClose, false); setWindowTitle(tr("Scatter plot")); resize(850, 550); QVBoxLayout* layout = new QVBoxLayout(this); @@ -675,6 +713,42 @@ nmWxSensitivityScatter::nmWxSensitivityScatter( updateParameter(); } +void nmWxSensitivityScatter::setResults(const QSharedPointer& results, double baseError) +{ + // 同一批次保留坐标选择,新批次先清空旧图元与统计引用。 + if(m_results == results && !results.isNull()) return; + m_results = results; + m_baseError = baseError; + m_draggingThreshold = false; + m_points.clear(); + m_runRows.clear(); + for(int i = m_plot->m_pPlot->getObjCount() - 1; i >= 0; --i) + if(qobject_cast(m_plot->m_pPlot->getObjByIndex(i))) m_plot->m_pPlot->removeObjByIndex(i); + m_plot->clearUndoStack(); + m_plot->setCurveData(QVector()); + m_plot->runUpdate(); + m_parameter->blockSignals(true); + m_ordinate->blockSignals(true); + m_parameter->clear(); + m_ordinate->clear(); + m_ordinate->addItem(tr("Goodness of fit"), -1); + m_defaultThreshold = 0.0; + if(!results.isNull()) { + for(int i = 0; i < results->m_variables.size(); ++i) + if(results->m_variables[i].m_enabled) m_parameter->addItem(results->m_variables[i].displayName(), i); + for(int i = 0; i < results->m_fitParameters.size(); ++i) + m_ordinate->addItem(results->m_fitParameters[i].getName(), i); + for(size_t i = 0; i < results->m_runs.size(); ++i) + if(hasSensitivityError(results->m_runs[i])) m_defaultThreshold = qMax(m_defaultThreshold, results->m_runs[i].m_dPressureRmse); + if(qIsFinite(baseError) && baseError >= 0.0) m_defaultThreshold = baseError; + m_threshold = results->m_dFilterThreshold >= 0.0 ? results->m_dFilterThreshold : m_defaultThreshold; + } + m_parameter->blockSignals(false); + m_ordinate->blockSignals(false); + if(!results.isNull()) updateParameter(); + else m_legend->clear(); +} + void nmWxSensitivityScatter::updateParameter() { // 两轴切换都从本批结果重建坐标;拟合参数轴不使用误差阈值。 @@ -1098,6 +1172,8 @@ public: m_total(data.getTotalModelCount()), m_first(0), m_selected(0), m_visibleRows(1), m_updating(false), m_wheelDelta(0) { + // 预览只持有采样配置,不保留计算结果批次。 + m_data.setResults(QSharedPointer()); // 使用现有表格控件绘制表头、行选中和单元格,滚动条控制完整列表。 setFrameShape(QFrame::StyledPanel); setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); @@ -1339,8 +1415,11 @@ private: nmWxSensitive::nmWxSensitive(QWidget *parent, nmDataAnalyzeManager* manager) : iDlgBase(parent), m_selectedValueIndex(0), m_loading(true), m_pDataManager(manager ? manager : nmDataAnalyzeManager::getCurrentInstance()), + m_sourceData(m_pDataManager ? m_pDataManager->getSensitiveData() : nullptr), m_previewView(nullptr), m_pSensitivityTask(nullptr), m_calculationRunning(false) { + // 关闭只隐藏,由所属分析统一销毁,重新打开保留当前输入。 + setAttribute(Qt::WA_DeleteOnClose, false); // 显式绑定所属分析窗口,后续切换窗口不会改变配置保存目标。 if (m_pDataManager) m_sensitiveData = m_pDataManager->getSensitiveDataCopy(); refreshModelValues(); @@ -1375,7 +1454,11 @@ void nmWxSensitive::reject() { // Esc 与取消按钮使用相同的停止路径,保留已完成组供结束后查看。 if(m_calculationRunning) onCancelClicked(); - else iDlgBase::reject(); + else { + foreach(QDialog* dialog, findChildren()) + if(dialog->isWindow()) dialog->close(); + iDlgBase::reject(); + } } void nmWxSensitive::closeEvent(QCloseEvent* event) @@ -1527,12 +1610,35 @@ void nmWxSensitive::refreshModelValues() void nmWxSensitive::onModelResultChanged() { - // 通知后按当前模型刷新数值;未改变的参数保留用户范围。 + // 项目读取替换数据对象时重新加载;普通模型刷新保留当前未提交的采样输入。 + reloadInputData(); +} + +void nmWxSensitive::reloadInputData() +{ + if(m_calculationRunning) return; m_loading = true; + if(m_pDataManager && m_sourceData != m_pDataManager->getSensitiveData()) + m_sensitiveData = m_pDataManager->getSensitiveDataCopy(); + m_sourceData = m_pDataManager ? m_pDataManager->getSensitiveData() : nullptr; + foreach(QDialog* dialog, findChildren()) + if(dialog->isWindow()) dialog->close(); + delete m_previewView; + m_previewView = nullptr; refreshModelValues(); - loadDataToUI(true); + // 井列表可能改变,重建参数页,保留外层输入窗口及底部菜单。 + while(detailStack->count() > 1) delete detailStack->widget(1); + m_modeCombos.clear(); m_logChecks.clear(); m_numSpins.clear(); + m_modelSpins.clear(); m_minSpins.clear(); m_maxSpins.clear(); + m_valueTables.clear(); m_unitLabels.clear(); + m_numLabels.clear(); m_minLabels.clear(); m_maxLabels.clear(); + m_distributionCombos.clear(); m_distributionPanels.clear(); m_distributionPlots.clear(); + populateTreeWidget(); + createDetailPages(); + loadDataToUI(); m_loading = false; - updateModelCount(); + onTreeItemChanged(nullptr, 0); + onResultsChanged(); } void nmWxSensitive::loadDataToUI(bool refreshRangesOnly) @@ -2564,6 +2670,7 @@ void nmWxSensitive::onGenerateClicked() } m_pDataManager->updateSensitiveData(m_sensitiveData); + m_sourceData = m_pDataManager->getSensitiveData(); // 新任务准备成功后才替换上次临时结果,准备失败仍可保留旧结果。 delete m_pSensitivityTask; m_pSensitivityTask = task.take(); @@ -2582,7 +2689,7 @@ void nmWxSensitive::startSensitivityCalculation() connect(m_pSensitivityTask, SIGNAL(finished()), this, SLOT(onSensitivityFinished()), Qt::QueuedConnection); setCalculationRunning(true); - // 仅关闭参数界面;控制器及任务仍存活,结束后继续保留临时计算结果。 + // 计算期间隐藏输入窗口,任务结束后继续复用。 hide(); m_pSensitivityTask->start(); } @@ -2672,9 +2779,16 @@ void nmWxSensitive::onImproveSettingsClicked() QStringList sampledParameters; foreach(const nmDataSensitive::VariableSampling& variable, m_sensitiveData.getVariables()) if(variable.m_enabled) sampledParameters.append(variable.parameterKey()); - nmWxAutomaticFitting dialog(this, &settings, sampledParameters); - if(dialog.exec() == QDialog::Accepted) { - m_sensitiveData.setImproveSettings(QSharedPointer(new nmSensitivityFitSettings(settings))); + if(m_improveSettingsDraft.isNull()) m_improveSettingsDraft = QSharedPointer(new nmSensitivityFitSettings); + *m_improveSettingsDraft = settings; + nmWxAutomaticFitting* dialog = findChild("nmSensitivityImproveSettings"); + if(!dialog) { + dialog = new nmWxAutomaticFitting(this, m_improveSettingsDraft.data(), sampledParameters); + dialog->setObjectName("nmSensitivityImproveSettings"); + dialog->setAttribute(Qt::WA_DeleteOnClose, false); + } else dialog->reloadSensitivitySettings(sampledParameters); + if(dialog->exec() == QDialog::Accepted) { + m_sensitiveData.setImproveSettings(QSharedPointer(new nmSensitivityFitSettings(*m_improveSettingsDraft))); updateModelCount(); } } @@ -2706,25 +2820,31 @@ void nmWxSensitive::onPreviewClicked() // 样本已在允许范围内生成,直接显示预览。 } // Saphir 风格的连续运行列表,组合数再大也不显示分页控件。 - QDialog dialog(this); - dialog.setWindowTitle(tr("Sensitivity Runs")); - dialog.setWindowFlags(dialog.windowFlags() & ~Qt::WindowContextHelpButtonHint); - dialog.setMinimumSize(420, 360); - dialog.resize(470, 650); - QVBoxLayout* layout = new QVBoxLayout(&dialog); - layout->setContentsMargins(16, 16, 16, 12); - layout->setSpacing(8); - m_previewView = new SensitivityRunsView(m_sensitiveData, createTriangleIcon(), &dialog); - layout->addWidget(m_previewView); - QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Close, Qt::Horizontal, &dialog); - buttons->setCenterButtons(true); - buttons->button(QDialogButtonBox::Close)->setMinimumWidth(110); - layout->addWidget(buttons); - connect(buttons, SIGNAL(rejected()), &dialog, SLOT(reject())); + QDialog* dialog = findChild("nmSensitivityPreview"); + if(!dialog) { + dialog = new QDialog(this); + dialog->setObjectName("nmSensitivityPreview"); + dialog->setAttribute(Qt::WA_DeleteOnClose, false); + dialog->setWindowTitle(tr("Sensitivity Runs")); + dialog->setWindowFlags(dialog->windowFlags() & ~Qt::WindowContextHelpButtonHint); + dialog->setMinimumSize(420, 360); + dialog->resize(470, 650); + QVBoxLayout* layout = new QVBoxLayout(dialog); + layout->setContentsMargins(16, 16, 16, 12); + layout->setSpacing(8); + QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Close, Qt::Horizontal, dialog); + buttons->setCenterButtons(true); + buttons->button(QDialogButtonBox::Close)->setMinimumWidth(110); + layout->addWidget(buttons); + connect(buttons, SIGNAL(rejected()), dialog, SLOT(reject())); + } + // 预览窗口保持不变,运行列表按本次采样重建,避免保留旧行数。 + delete m_previewView; + m_previewView = new SensitivityRunsView(m_sensitiveData, createTriangleIcon(), dialog); + qobject_cast(dialog->layout())->insertWidget(0, m_previewView); connect(m_previewView->verticalScrollBar(), SIGNAL(actionTriggered(int)), this, SLOT(onPreviewScrollAction(int))); - dialog.exec(); - m_previewView = nullptr; + dialog->exec(); } void nmWxSensitive::onPreviewScrollAction(int action)