Build Packages / Create release (push) Successful in 21s
Build Packages / build:rugnux-tgz (x86_64) (push) Successful in 9m40s
Build Packages / build:rugnux:aarch64 (cross) (push) Successful in 9m49s
Build Packages / build:viewer-tgz:cpu (push) Successful in 11m37s
Build Packages / build:viewer-tgz:cuda (push) Successful in 12m40s
Build Packages / build:windows:nocuda (push) Successful in 17m44s
Build Packages / build:windows:cuda (push) Successful in 20m13s
Build Packages / build:rpm (rocky8_nocuda) (push) Successful in 14m41s
Build Packages / HDF5 consumer tests (DIALS, XDS) (push) Successful in 25m59s
Build Packages / build:rpm (ubuntu2204_nocuda) (push) Successful in 15m5s
Build Packages / build:rpm (ubuntu2404_nocuda) (push) Successful in 14m35s
Build Packages / build:rpm (rocky9_nocuda) (push) Successful in 15m53s
Build Packages / build:rugnux:windows (push) Successful in 11m29s
Build Packages / build:rpm (rocky8_sls9) (push) Successful in 18m51s
Build Packages / build:rpm (rocky9_sls9) (push) Successful in 18m43s
Build Packages / Generate python client (push) Successful in 51s
Build Packages / build:rpm (rocky8) (push) Successful in 18m51s
Build Packages / Build documentation (push) Successful in 1m21s
Build Packages / build:rpm (ubuntu2204) (push) Successful in 18m38s
Build Packages / build:rpm (ubuntu2404) (push) Successful in 18m24s
Build Packages / build:rpm (rocky9) (push) Successful in 19m19s
Build Packages / Unit tests (push) Successful in 1h37m15s
* Building Jungfraujoch no longer needs zlib or Eigen installed on the machine, and the dependencies the build fetches are pinned and updated to current releases. * rugnux: improvements in indexing, lattice selection and geometry post-refinement, which index crystals that previously returned no lattice and keep the better of the two geometries a run measures. * rugnux: improvements in beam-centre measurement, beam-stop detection and space-group determination. * rugnux: the unit cell reported with a determined space group now obeys that group - a cell whose symmetry was confirmed from the intensities is re-refined under it, and a cell the group cannot describe is reported with a warning rather than as it stands. * rugnux drops the stretches of a rotation sweep whose removal measurably improves the merged intensities and reports what became of every frame, and decides the resolution cut on the crystal's own diffraction rather than on its ice rings. * The rugnux results report is machine-readable - every line that is not `KEY= value` data starts with `#` - and states the build it was written by, its authorship and its terms of use (`REPORT_VERSION= 8`). * `jfjoch_viewer`: improvements in the file manager (CBF frames beside HDF5 datasets, a remembered root), the dataset plots, the inspector and the image statistics, plus a settable font size, a view of the rugnux results report, usable performance over a remote display (`ssh -X`) and a reset of all settings to defaults; the reciprocal-space window is removed. * Broker fixes around DECTRIS collections and dark-mask calibration: re-initialising after a run that never started no longer freezes the broker, a cancelled calibration is abandoned instead of reported as done, and a collection whose start message never arrives ends by itself. Reviewed-on: #79 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
120 lines
5.7 KiB
C++
120 lines
5.7 KiB
C++
// SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#pragma once
|
|
|
|
#include <QElapsedTimer>
|
|
#include <QMainWindow>
|
|
#include <QProgressDialog>
|
|
#include <QTimer>
|
|
|
|
#include "JFJochViewerMenu.h"
|
|
#include "../reader/JFJochHDF5Reader.h"
|
|
#include "JFJochImageReadingWorker.h"
|
|
#include "JFJochViewerDatasetInfo.h"
|
|
#include "JFJochViewerStatusBar.h"
|
|
#include "toolbar/JFJochViewerToolbarDisplay.h"
|
|
|
|
class JFJochProcessingJobsWindow;
|
|
class JFJochDiffractionImage;
|
|
class QDockWidget;
|
|
class QScrollArea;
|
|
|
|
class JFJochViewerWindow : public QMainWindow {
|
|
Q_OBJECT
|
|
// Theming is done via the application palette in main() (salmon panels, white entry fields,
|
|
// navy accent) so it applies consistently to every widget, including dialogs.
|
|
public:
|
|
explicit JFJochViewerWindow(QWidget *parent = nullptr, bool dbus = true, const QString &file = "");
|
|
~JFJochViewerWindow() override;
|
|
|
|
private:
|
|
JFJochViewerMenu *menuBar;
|
|
JFJochImageReadingWorker *reading_worker;
|
|
JFJochDiffractionImage *viewer; // central diffraction image
|
|
JFJochViewerToolbarDisplay *toolBarDisplay;
|
|
JFJochViewerStatusBar *statusbar;
|
|
JFJochProcessingJobsWindow *processingJobsWindow;
|
|
|
|
std::shared_ptr<const JFJochReaderDataset> lastDataset; // added
|
|
std::shared_ptr<const JFJochReaderImage> lastImage; // added
|
|
|
|
// Remote-display frame throttle (see OnImageReady): the newest frame not yet fanned out,
|
|
// delivered at most every kRemoteRepaintIntervalMs while a fast producer runs.
|
|
std::shared_ptr<const JFJochReaderImage> pendingImage;
|
|
QElapsedTimer image_rate_;
|
|
QTimer *image_tail_timer_ = nullptr;
|
|
void DeliverPendingImage();
|
|
QVector<RunData> lastRuns; // for dataset-info docks opened later
|
|
QString lastActiveRunId;
|
|
|
|
QProgressDialog *retryDialog = nullptr;
|
|
|
|
QDockWidget *lastDatasetInfoDock = nullptr; // most recent dataset-info dock, for docking layout
|
|
QDockWidget *inspectorDock = nullptr; // image inspector (former right-hand side panel)
|
|
QScrollArea *inspectorScroll = nullptr; // its scroll area; width bounds follow the font
|
|
QDockWidget *settingsDock = nullptr; // inline MX/AzInt settings panel
|
|
QDockWidget *fileBrowserDock = nullptr; // data-root directory tree, tabbed with settingsDock
|
|
QDockWidget *processingDock = nullptr; // processing jobs panel
|
|
QByteArray defaultLayoutState; // captured after construction, for "Reset layout"
|
|
int datasetInfoCounter = 0; // gives each dataset-info dock a unique objectName
|
|
|
|
void ResetAllSettings();
|
|
void UpdateInspectorWidth();
|
|
|
|
// Both ways of opening a dataset from outside the file manager - the File menu and D-Bus -
|
|
// come through here, so the browser follows the same way for either.
|
|
void FollowInFileBrowser(const QString &filename);
|
|
|
|
QThread *reading_thread;
|
|
|
|
// Named layouts. Image = just the image + inspector; Processing = also the plots + jobs panel.
|
|
enum class Perspective { Image, Processing };
|
|
void ApplyPerspective(Perspective p);
|
|
|
|
// Keyboard shortcuts (F/B/A, Home/End/PageUp/PageDown) are handled in an application-wide
|
|
// event filter rather than keyPressEvent, so they work wherever the focus happens to be,
|
|
// stepping aside when the focused widget genuinely uses the key (text entry, item views).
|
|
bool eventFilter(QObject *obj, QEvent *event) override;
|
|
void closeEvent(QCloseEvent *event) override;
|
|
void changeEvent(QEvent *event) override;
|
|
|
|
private slots:
|
|
// Single cross-thread sink for the worker's imageLoaded: fans out to every GUI consumer
|
|
// (synchronously, same thread) via imageReady, then acks the worker so it may produce the next.
|
|
void OnImageReady(std::shared_ptr<const JFJochReaderImage> image);
|
|
|
|
// Single cross-thread sink for the worker's datasetLoaded, mirroring OnImageReady: fans out to
|
|
// every GUI consumer synchronously via datasetReady, then acks the worker (datasetConsumed) so the
|
|
// worker can cap how many datasets are in flight - without this the queued datasetLoaded backlog
|
|
// (each event pinning a full dataset) grew without bound in live follow (100 GB OOM).
|
|
void OnDatasetReady(std::shared_ptr<const JFJochReaderDataset> dataset);
|
|
|
|
public slots:
|
|
void LoadFile(const QString &filename, qint64 image_number, qint64 summation, bool retry);
|
|
void LoadImage(qint64 image_number, qint64 summation);
|
|
void NewDatasetInfo();
|
|
void OnFileLoadError(QString title, QString message);
|
|
void OnFileLoadRetryStatus(bool active, QString message);
|
|
|
|
signals:
|
|
// Internal GUI-thread fan-out of the newest frame: OnImageReady re-emits this to every GUI
|
|
// consumer synchronously, then acks via imageConsumed (see OnImageReady).
|
|
void imageReady(std::shared_ptr<const JFJochReaderImage> image);
|
|
void imageConsumed(); // ack to the worker that one frame has been consumed (backpressure)
|
|
|
|
// Same GUI-thread fan-out + ack for the dataset stream (see OnDatasetReady).
|
|
void datasetReady(std::shared_ptr<const JFJochReaderDataset> dataset);
|
|
void datasetConsumed(); // ack to the worker that one dataset has been consumed (backpressure)
|
|
|
|
void LoadFileRequest(const QString &filename, qint64 image_number, qint64 summation, bool retry);
|
|
void LoadImageRequest(int64_t image_number, int64_t summation);
|
|
void adjustForegroundButton(bool input);
|
|
void adjustBackgroundButton(bool input);
|
|
void setAutoForeground(bool val);
|
|
void oneShotAutoForeground();
|
|
// Re-emitted by the shortcut filter; the navigation toolbar applies the step, clamped.
|
|
void stepImage(int steps);
|
|
};
|
|
|