|
|
|
|
@ -227,6 +227,18 @@ public:
|
|
|
|
|
highlightRun(-1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QSharedPointer<nmDataSensitive::BatchResult> results() const { return m_results; }
|
|
|
|
|
|
|
|
|
|
void setResults(const QSharedPointer<nmDataSensitive::BatchResult>& results)
|
|
|
|
|
{
|
|
|
|
|
// 重置行数与列数,旧批次的选择和高亮不能带到新结果。
|
|
|
|
|
highlightRun(-1);
|
|
|
|
|
beginResetModel();
|
|
|
|
|
m_pendingVisibility.clear();
|
|
|
|
|
m_results = results;
|
|
|
|
|
endResetModel();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
QList<ZxObjCurve*> 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<nmDataSensitive::BatchResult>& 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<nmDataSensitive::BatchResult>& results)
|
|
|
|
|
{
|
|
|
|
|
// 复用表格模型,同时恢复当前批次已应用的分箱和统计变量。
|
|
|
|
|
static_cast<SensitivityResultsModel*>(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<nmDataSensitive::BatchResult>& 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<ZxObjCurve*>(m_plot->m_pPlot->getObjByIndex(i))) m_plot->m_pPlot->removeObjByIndex(i);
|
|
|
|
|
m_plot->clearUndoStack();
|
|
|
|
|
m_plot->setCurveData(QVector<iCurveDesc>());
|
|
|
|
|
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<nmDataSensitive::BatchResult>());
|
|
|
|
|
// 使用现有表格控件绘制表头、行选中和单元格,滚动条控制完整列表。
|
|
|
|
|
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<QDialog*>())
|
|
|
|
|
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<QDialog*>())
|
|
|
|
|
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<const nmSensitivityFitSettings>(new nmSensitivityFitSettings(settings)));
|
|
|
|
|
if(m_improveSettingsDraft.isNull()) m_improveSettingsDraft = QSharedPointer<nmSensitivityFitSettings>(new nmSensitivityFitSettings);
|
|
|
|
|
*m_improveSettingsDraft = settings;
|
|
|
|
|
nmWxAutomaticFitting* dialog = findChild<nmWxAutomaticFitting*>("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<const nmSensitivityFitSettings>(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<QDialog*>("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<QVBoxLayout*>(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)
|
|
|
|
|
|