Build Packages / Create release (push) Successful in 24s
Build Packages / build:viewer:macos-arm64:nocuda (push) Successful in 3m29s
Build Packages / build:rugnux:macos-arm64:nocuda (push) Successful in 2m43s
Build Packages / build:rugnux:linux-aarch64:cuda (push) Successful in 8m27s
Build Packages / build:rugnux:linux-x86_64:cuda (push) Successful in 9m53s
Build Packages / build:viewer:linux-x86_64:nocuda (push) Successful in 9m58s
Build Packages / build:viewer:linux-x86_64:cuda (push) Successful in 11m22s
Build Packages / build:jfjoch:rocky8:nocuda (push) Successful in 13m39s
Build Packages / build:viewer:windows-x86_64:nocuda (push) Successful in 18m37s
Build Packages / build:jfjoch:rocky9:nocuda (push) Successful in 16m32s
Build Packages / build:viewer:windows-x86_64:cuda (push) Successful in 24m11s
Build Packages / HDF5 consumer tests (DIALS, XDS) (push) Successful in 25m30s
Build Packages / build:jfjoch:ubuntu2404:nocuda (push) Successful in 19m3s
Build Packages / build:jfjoch:ubuntu2204:nocuda (push) Successful in 20m23s
Build Packages / build:jfjoch:rocky8:cuda-sls9 (push) Successful in 19m41s
Build Packages / Generate python client (push) Successful in 50s
Build Packages / Build documentation (push) Successful in 1m16s
Build Packages / build:jfjoch:rocky9:cuda-sls9 (push) Successful in 21m0s
Build Packages / build:jfjoch:rocky8:cuda (push) Successful in 18m38s
Build Packages / build:rugnux:windows-x86_64:cuda (push) Successful in 14m33s
Build Packages / build:jfjoch:rocky9:cuda (push) Successful in 17m55s
Build Packages / build:jfjoch:ubuntu2204:cuda (push) Successful in 20m50s
Build Packages / build:jfjoch:ubuntu2404:cuda (push) Successful in 18m38s
Build Packages / Unit tests (push) Successful in 1h46m14s
* jfjoch_broker: Optional per-dataset authentication - statistics, images and plots can require a bearer token, which jfjoch_viewer supports. * jfjoch_viewer: Dark mode and a theme-matched colour scheme, a magnifier panel, and simpler contrast and background controls. * Rugnux: Multiple performance improvements on GPU and CPU (CPU-only processing up to 40% faster, faster image decoding on ARM), with unchanged results. * Rugnux: `--model` rigid-body refinement runs on the GPU, and the model-validation check is faster and more reliable. * Rugnux: Improved scaling and merging - error model, outlier rejection, absorption correction and French-Wilson amplitudes now agree more closely with XDS and ctruncate. * Rugnux: Improved integration - radial background on powder and ice rings, crowded rotation data keep their reflections, and CPU-only builds integrate large unit cells as GPU builds do. * Rugnux: More robust detector geometry - measured beam centre, X-ray bandwidth and goniometer rate, and geometry refinement accepted only on significant evidence. * Rugnux: Merged files are written in the standard setting, or in the setting of a reference MTZ, structure-factor mmCIF or model, with its free-R flags. * Rugnux: Richer report - ice and powder rings, further lattices, superstructure candidates and mosaicity, with warnings worded as prompts to check. * Rugnux: Clear error messages when a data set needs more GPU or host memory than is available. Reviewed-on: #83 Co-authored-by: Filip Leonarski <filip.leonarski@psi.ch>
86 lines
3.4 KiB
C++
86 lines
3.4 KiB
C++
// SPDX-FileCopyrightText: 2025 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#pragma once
|
|
|
|
#include <QToolBar>
|
|
#include <QElapsedTimer>
|
|
#include <QTimer>
|
|
#include "../widgets/SliderPlusBox.h"
|
|
#include <QButtonGroup>
|
|
#include <QToolButton>
|
|
#include <QComboBox>
|
|
#include "../../reader/JFJochReaderImage.h"
|
|
|
|
// Display toolbar: how the image is rendered — foreground (white-point) and background
|
|
// (black-point) sliders, auto-contrast, HDR (full dynamic range), and the colour map; at its right
|
|
// end the font size and the light/dark switch, which are also in the View menu but easy to miss there.
|
|
class JFJochViewerToolbarDisplay : public QToolBar {
|
|
Q_OBJECT
|
|
|
|
bool auto_foreground = false;
|
|
|
|
SliderPlusBox *foreground_slider;
|
|
SliderPlusBox *background_slider;
|
|
// The background slider is rarely needed, so it is hidden unless this toggle (View menu) is on.
|
|
// A non-zero black point switches it on, so an active background is never invisible.
|
|
QAction *background_label_action;
|
|
QAction *background_slider_action;
|
|
QAction *show_background_action;
|
|
QToolButton *auto_foreground_button;
|
|
QToolButton *hdr_mode_button;
|
|
QComboBox *color_map_select;
|
|
QButtonGroup *font_zoom_group; // three "A" buttons; the id is the zoom in per cent
|
|
QToolButton *theme_button; // light/dark switch; its tooltip names the theme it switches to
|
|
void UpdateThemeButton();
|
|
|
|
// A ctrl-wheel or auto-foreground burst reports a new foreground per event, and on a remote
|
|
// display each slider update is a repaint of its own. Hold the readback to the remote
|
|
// cadence; the tail run shows the final value. The background readback (held B + wheel)
|
|
// gets the same treatment.
|
|
void ApplyPendingForeground();
|
|
float pending_foreground_ = 0.0f;
|
|
QElapsedTimer foreground_rate_;
|
|
QTimer *foreground_tail_timer_ = nullptr;
|
|
void ApplyPendingBackground();
|
|
float pending_background_ = 0.0f;
|
|
QElapsedTimer background_rate_;
|
|
QTimer *background_tail_timer_ = nullptr;
|
|
public:
|
|
JFJochViewerToolbarDisplay(QWidget *parent = nullptr);
|
|
|
|
// Current display settings, for persisting them across sessions (see JFJochViewerWindow).
|
|
[[nodiscard]] int colorMap() const { return color_map_select->currentIndex(); }
|
|
[[nodiscard]] bool autoForeground() const { return auto_foreground_button->isChecked(); }
|
|
[[nodiscard]] bool hdrMode() const { return hdr_mode_button->isChecked(); }
|
|
[[nodiscard]] bool backgroundSliderShown() const { return show_background_action->isChecked(); }
|
|
[[nodiscard]] QAction *backgroundSliderAction() const { return show_background_action; }
|
|
|
|
signals:
|
|
void setForeground(float val);
|
|
void setBackground(float val);
|
|
void colorMapChanged(int val);
|
|
void setAutoForeground(bool val);
|
|
void setHDRMode(bool val);
|
|
void fontZoomSelected(int percent);
|
|
|
|
public slots:
|
|
void updateForeground(float val);
|
|
void updateBackground(float val);
|
|
void updateAutoForeground(bool val);
|
|
void updateColorMap(int val);
|
|
void updateHDRMode(bool val);
|
|
void showBackgroundSlider(bool val);
|
|
void updateFontZoom(int percent);
|
|
void imageLoaded(std::shared_ptr<const JFJochReaderImage> image);
|
|
private slots:
|
|
void foregroundSet(double val);
|
|
void backgroundSet(double val);
|
|
void colorComboBoxSet(int val);
|
|
void autoForegroundButtonPressed();
|
|
void HDRModeButtonPressed();
|
|
};
|
|
|
|
|
|
|