leonarski_fandClaude Opus 4.8
74f36710e4
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 11m43s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 12m24s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 12m33s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 12m34s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 12m58s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 11m38s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 12m33s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 13m22s
Build Packages / build:rpm (rocky8) (push) Successful in 13m41s
Build Packages / Generate python client (push) Successful in 14s
Build Packages / build:rpm (rocky9) (push) Successful in 14m14s
Build Packages / Create release (push) Skipped
Build Packages / DIALS test (push) Successful in 13m55s
Build Packages / Build documentation (push) Successful in 45s
Build Packages / XDS test (durin plugin) (push) Successful in 6m54s
Build Packages / XDS test (neggia plugin) (push) Successful in 5m50s
Build Packages / XDS test (JFJoch plugin) (push) Successful in 6m31s
Build Packages / Unit tests (push) Failing after 1h0m10s
One "Processing settings" window with tabs: Spot finding & indexing | Azimuthal | Bragg integration | Scaling, replacing the two separate settings windows. The spot/index and azimuthal tabs reuse the existing windows' widgets unchanged (their content is lifted into tabs via takeCentralWidget), so all their logic/signals keep working; Bragg integration and scaling are new editable panels (previously not adjustable in the GUI). JFJochImageReadingWorker gains UpdateBraggIntegrationSettings / UpdateScalingSettings; both persist as worker state and are re-imported into curr_experiment on file load / dataset update (like the indexing/azint settings), so they apply to interactive analysis (Bragg) and flow into processing jobs via GetReprocessingInputs (Bragg + scaling). Scaling only affects the job post-pass, so it is just stored, not reanalyzed. Verified: jfjoch_viewer builds and runs (offscreen) with the converged window. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
41 lines
1.9 KiB
C++
41 lines
1.9 KiB
C++
// SPDX-FileCopyrightText: 2026 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#include "JFJochSettingsWindow.h"
|
|
|
|
#include <QTabWidget>
|
|
|
|
JFJochSettingsWindow::JFJochSettingsWindow(const SpotFindingSettings &spot, const IndexingSettings &indexing,
|
|
const AzimuthalIntegrationSettings &azint,
|
|
const BraggIntegrationSettings &bragg,
|
|
const ScalingSettings &scaling, QWidget *parent)
|
|
: JFJochHelperWindow(parent) {
|
|
setWindowTitle("Processing settings");
|
|
|
|
// Reuse the existing spot/index + azimuthal windows: build them (kept hidden) and lift their
|
|
// content into tabs, so all their existing widgets, logic and signals keep working.
|
|
m_processing = new JFJochViewerProcessingWindow(spot, indexing, this);
|
|
m_azint = new JFJochAzIntWindow(azint, this);
|
|
m_bragg = new JFJochBraggIntegrationPanel(bragg, this);
|
|
m_scaling = new JFJochScalingPanel(scaling, this);
|
|
|
|
auto *tabs = new QTabWidget(this);
|
|
tabs->addTab(m_processing->takeCentralWidget(), "Spot finding && indexing");
|
|
tabs->addTab(m_azint->takeCentralWidget(), "Azimuthal");
|
|
tabs->addTab(m_bragg, "Bragg integration");
|
|
tabs->addTab(m_scaling, "Scaling");
|
|
setCentralWidget(tabs);
|
|
|
|
m_processing->hide(); // the emptied shells stay alive only to drive their signals
|
|
m_azint->hide();
|
|
|
|
connect(m_processing, &JFJochViewerProcessingWindow::settingsChanged,
|
|
this, &JFJochSettingsWindow::spotFindingChanged);
|
|
connect(m_azint, &JFJochAzIntWindow::settingsChanged,
|
|
this, &JFJochSettingsWindow::azintChanged);
|
|
connect(m_bragg, &JFJochBraggIntegrationPanel::settingsChanged,
|
|
this, &JFJochSettingsWindow::braggChanged);
|
|
connect(m_scaling, &JFJochScalingPanel::settingsChanged,
|
|
this, &JFJochSettingsWindow::scalingChanged);
|
|
}
|