Build Packages / Create release (push) Successful in 28s
Build Packages / build:viewer:macos-arm64:nocuda (push) Successful in 2m54s
Build Packages / build:rugnux:macos-arm64:nocuda (push) Successful in 2m25s
Build Packages / build:viewer:linux-x86_64:nocuda (push) Successful in 11m31s
Build Packages / build:viewer:linux-x86_64:cuda (push) Successful in 12m3s
Build Packages / build:rugnux:linux-x86_64:cuda (push) Successful in 8m18s
Build Packages / build:rugnux:linux-aarch64:cuda (push) Successful in 6m19s
Build Packages / build:viewer:windows-x86_64:nocuda (push) Successful in 17m31s
Build Packages / build:viewer:windows-x86_64:cuda (push) Successful in 20m8s
Build Packages / HDF5 consumer tests (DIALS, XDS) (push) Successful in 23m21s
Build Packages / build:jfjoch:rocky8:nocuda (push) Successful in 14m5s
Build Packages / build:jfjoch:rocky9:nocuda (push) Successful in 15m27s
Build Packages / build:jfjoch:ubuntu2204:nocuda (push) Successful in 14m45s
Build Packages / build:jfjoch:ubuntu2404:nocuda (push) Successful in 13m42s
Build Packages / build:rugnux:windows-x86_64:cuda (push) Successful in 11m13s
Build Packages / build:jfjoch:rocky8:cuda-sls9 (push) Successful in 15m11s
Build Packages / Generate python client (push) Successful in 27s
Build Packages / Build documentation (push) Successful in 1m17s
Build Packages / build:jfjoch:rocky9:cuda-sls9 (push) Successful in 16m20s
Build Packages / build:jfjoch:rocky8:cuda (push) Successful in 17m55s
Build Packages / build:jfjoch:ubuntu2404:cuda (push) Successful in 16m34s
Build Packages / build:jfjoch:ubuntu2204:cuda (push) Successful in 17m34s
Build Packages / build:jfjoch:rocky9:cuda (push) Successful in 18m4s
Build Packages / Unit tests (push) Successful in 1h20m54s
macOS turns Shift + a vertical mouse wheel into horizontal scrolling, so the notch arrives in angleDelta().x() and y() is 0; the contrast step read only y and did nothing. The wheel handler now takes whichever axis carries the notch, for zoom, foreground and background alike. Help > Mouse Shortcuts names Cmd for Ctrl on macOS (Qt maps Command to Ctrl), Ctrl-click for right click and Fn + arrows for Home/End/Page Up/Down, and lists B held + wheel, which was missing. The magnifier's tooltip says how to drive it. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
71 lines
2.6 KiB
C++
71 lines
2.6 KiB
C++
// SPDX-FileCopyrightText: 2026 Filip Leonarski, Paul Scherrer Institute <filip.leonarski@psi.ch>
|
|
// SPDX-License-Identifier: GPL-3.0-only
|
|
|
|
#include "JFJochViewerMagnifier.h"
|
|
|
|
#include <QButtonGroup>
|
|
#include <QHBoxLayout>
|
|
#include <QToolButton>
|
|
#include <QVBoxLayout>
|
|
|
|
JFJochViewerMagnifier::JFJochViewerMagnifier(QWidget *parent) : QWidget(parent) {
|
|
auto layout = new QVBoxLayout(this);
|
|
layout->setContentsMargins(0, 0, 0, 0);
|
|
|
|
// Screen pixels per detector pixel and label font size; the labels are sized to fit a
|
|
// six-digit count inside its pixel.
|
|
struct Level { const char *name; const char *tooltip; double zoom; int font_px; };
|
|
const Level levels[] = {
|
|
{"\u00d764", "Pixel values in large text", 64.0, 15},
|
|
{"\u00d732", "Pixel values in small text", 32.0, 9},
|
|
{"\u00d710", "Wider field, no pixel values", 10.0, 0},
|
|
};
|
|
|
|
auto buttons = new QHBoxLayout();
|
|
auto group = new QButtonGroup(this);
|
|
for (const auto &l : levels) {
|
|
auto b = new QToolButton(this);
|
|
b->setText(QString::fromUtf8(l.name));
|
|
b->setToolTip(l.tooltip);
|
|
b->setCheckable(true);
|
|
group->addButton(b);
|
|
buttons->addWidget(b);
|
|
connect(b, &QToolButton::toggled, this, [this, l](bool on) {
|
|
if (on)
|
|
image_->SetZoom(l.zoom, l.font_px);
|
|
});
|
|
}
|
|
buttons->addStretch();
|
|
pop_out_ = new QToolButton(this);
|
|
connect(pop_out_, &QToolButton::clicked, this, &JFJochViewerMagnifier::popOutClicked);
|
|
setPoppedOut(false);
|
|
buttons->addWidget(pop_out_);
|
|
layout->addLayout(buttons);
|
|
|
|
image_ = new JFJochFollowerImage(this);
|
|
image_->setMinimumHeight(200);
|
|
image_->setToolTip("Hold Shift and move the cursor over the diffraction image to update");
|
|
image_->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
|
|
layout->addWidget(image_, 1);
|
|
connect(image_, &JFJochFollowerImage::fieldChanged, this, &JFJochViewerMagnifier::fieldChanged);
|
|
|
|
group->buttons().first()->setChecked(true);
|
|
}
|
|
|
|
void JFJochViewerMagnifier::setPoppedOut(bool on) {
|
|
pop_out_->setText(on ? "Dock" : "Pop out");
|
|
pop_out_->setToolTip(on ? "Put the magnifier back into its panel" : "Show the magnifier in a window of its own");
|
|
}
|
|
|
|
void JFJochViewerMagnifier::setFrame(std::shared_ptr<const QImage> frame) {
|
|
image_->SetFrame(std::move(frame));
|
|
}
|
|
|
|
void JFJochViewerMagnifier::setPixelValues(std::shared_ptr<const JFJochReaderImage> image) {
|
|
image_->SetPixelValues(std::move(image));
|
|
}
|
|
|
|
void JFJochViewerMagnifier::centerAt(QPointF scenePos) {
|
|
image_->CenterAt(scenePos);
|
|
}
|