Merge branch 'dev' of http://git.hivekion.com:3000/xuhai_cpp/EnergySpectrumAnalyer into dev_axl
This commit is contained in:
commit
3db1425737
|
|
@ -68,10 +68,14 @@ void MeasureAnalysisParticleCountPlotView::InitViewWorkspace(const QString& proj
|
||||||
} else if (project_dir.mkpath(workspace)) {
|
} else if (project_dir.mkpath(workspace)) {
|
||||||
this->_workspace = workspace;
|
this->_workspace = workspace;
|
||||||
}
|
}
|
||||||
|
QString win_title = _find_peaks_result_dlg->windowTitle() + QStringLiteral(u"[%1]").arg(project_name);
|
||||||
|
_find_peaks_result_dlg->setWindowTitle(win_title);
|
||||||
const QString& peaks_result_filename = QDir(workspace).filePath(QStringLiteral(u"自动寻峰结果.csv"));
|
const QString& peaks_result_filename = QDir(workspace).filePath(QStringLiteral(u"自动寻峰结果.csv"));
|
||||||
_find_peaks_result_dlg->SetPeakResultDataFilename(peaks_result_filename);
|
_find_peaks_result_dlg->SetPeakResultDataFilename(peaks_result_filename);
|
||||||
_find_peaks_result_dlg->UpdatePeakResult();
|
_find_peaks_result_dlg->UpdatePeakResult();
|
||||||
|
|
||||||
|
win_title = _batch_energy_scale_dlg->windowTitle() + QStringLiteral(u"[%1]").arg(project_name);
|
||||||
|
_batch_energy_scale_dlg->setWindowTitle(win_title);
|
||||||
_batch_energy_scale_dlg->SetProjectName(project_name);
|
_batch_energy_scale_dlg->SetProjectName(project_name);
|
||||||
_batch_energy_scale_dlg->SetViewWorkspace(workspace);
|
_batch_energy_scale_dlg->SetViewWorkspace(workspace);
|
||||||
_batch_energy_scale_dlg->SetPeakResultDataModel(_find_peaks_result_dlg->GetPeakResultDataModel());
|
_batch_energy_scale_dlg->SetPeakResultDataModel(_find_peaks_result_dlg->GetPeakResultDataModel());
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user