jfjoch_viewer: navigation keys, one-shot auto-contrast, file manager panel, cleanup
* Dataset-info plot hover shows a horizontal crosshair alongside the existing vertical one, so a run of hovers reads as a level or a drift at a glance. * `A` applies auto-contrast once instead of switching on persistent Auto mode (a new `oneShotAutoForeground()`, distinct from the toolbar's Auto toggle); pressing it a second time on the same image switches Auto on for good, and pressing it while Auto is already on leaves it on. The value itself comes from one `AutoForegroundValue()` shared with the continuous Auto path. * `Home`/`End`/`Page Up`/`Page Down` navigate the dataset (first/last image, one image forward/back); claimed in the diffraction view's keyPressEvent before QGraphicsView's default handling, which otherwise eats them to scroll the viewport. * Alt+wheel dataset navigation is removed - some window managers already took it before the app ever saw it, per the caveat that used to sit next to its entry in the shortcuts list. * The image strip dock and its dedicated thumbnail-rendering machinery in the reading worker (SetThumbnail*, RenderThumbnail_i) are removed; it cost a lot and nothing else used any of it. * Toolbar text: "Colour" -> "Color". * Color map, Auto and HDR mode now persist across sessions, the same way the window layout already does. * The Inspector's "Dataset:" path wraps at '/' (a zero-width space after each one) instead of being cut off when it doesn't fit one line. * LoadFile no longer reopens an already-open file - it forwards straight to LoadImage instead - which was the likely cause of a D-Bus client's per-image navigation lagging behind the same navigation done via the grid-scan hover. * New file-manager dock (left, tabbed with Settings via tabifyDockWidget): a directory tree filtered to *_master.h5/*_process.h5, rooted at JUNGFRAUJOCH_DATA_ROOT if set, else the last-browsed root, else the home directory. Most beamline users care about opening images, not reprocessing settings, so it's the tab raised by default. Its filter box narrows files only - a directory always passes - because filtering the directories too hid the matching files under any directory whose own name did not match, and hid the root's ancestors, which left the tree with no valid root index until the root was set again by hand. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01PogHY7bWXV4bpctDPdyuDN Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
1 parent
40dd6f25fd
commit
d24cdfcff4
20 files changed
+375
-462
No files matched your search
@@ -17,10 +17,11 @@
|
||||
#include <QPushButton>
|
||||
|
||||
#include "JFJochImageReadingWorker.h"
|
||||
#include "../common/ColorScale.h"
|
||||
#include "image_viewer/JFJochDiffractionImage.h"
|
||||
#include "JFJochViewerSidePanel.h"
|
||||
#include "widgets/JFJochViewerSettingsDock.h"
|
||||
#include "widgets/JFJochViewerImageStrip.h"
|
||||
#include "widgets/JFJochViewerFileBrowser.h"
|
||||
#include "JFJochViewerStatusBar.h"
|
||||
#include "../common/CUDAWrapper.h"
|
||||
#include "../rugnux/RugnuxDefaults.h"
|
||||
@@ -46,7 +47,7 @@
|
||||
// Dock-layout version for saveState/restoreState: bump whenever the dock set / structure changes so a
|
||||
// stale saved layout (which can restore a dock as a broken, non-responsive floating window) is rejected
|
||||
// and the default layout applies instead.
|
||||
static constexpr int kLayoutVersion = 2;
|
||||
static constexpr int kLayoutVersion = 4;
|
||||
|
||||
JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString &file) : QMainWindow(parent) {
|
||||
menuBar = new JFJochViewerMenu(this);
|
||||
@@ -449,6 +450,9 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
|
||||
connect(this, &JFJochViewerWindow::setAutoForeground,
|
||||
viewer, &JFJochDiffractionImage::setAutoForeground);
|
||||
|
||||
connect(this, &JFJochViewerWindow::oneShotAutoForeground,
|
||||
viewer, &JFJochDiffractionImage::oneShotAutoForeground);
|
||||
|
||||
// Processing jobs: run rugnux locally / copy a cluster command line, and surface
|
||||
// finished runs as switchable dataset snapshots.
|
||||
connect(processingJobsWindow, &JFJochProcessingJobsWindow::registerSnapshot,
|
||||
@@ -500,6 +504,21 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
|
||||
addDockWidget(Qt::LeftDockWidgetArea, settingsDock);
|
||||
menuBar->AddDockEntry(settingsDock, "Settings");
|
||||
|
||||
// File manager: an alternative to Settings in the same left-hand slot, tabbed together (the
|
||||
// canonical Qt way to offer two panels one on top of the other without doubling the width) - most
|
||||
// beamline users care about opening images, not reprocessing settings, so this one starts on top.
|
||||
auto *fileBrowser = new JFJochViewerFileBrowser(this);
|
||||
fileBrowserDock = new QDockWidget("File manager", this);
|
||||
fileBrowserDock->setObjectName("fileBrowserDock");
|
||||
fileBrowserDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
|
||||
fileBrowserDock->setWidget(fileBrowser);
|
||||
addDockWidget(Qt::LeftDockWidgetArea, fileBrowserDock);
|
||||
tabifyDockWidget(settingsDock, fileBrowserDock);
|
||||
fileBrowserDock->raise();
|
||||
menuBar->AddDockEntry(fileBrowserDock, "File manager");
|
||||
connect(fileBrowser, &JFJochViewerFileBrowser::openDataset,
|
||||
reading_worker, &JFJochImageReadingWorker::LoadFile);
|
||||
|
||||
connect(settingsPanel, &JFJochViewerSettingsDock::spotFindingChanged,
|
||||
reading_worker, &JFJochImageReadingWorker::UpdateSpotFindingSettings);
|
||||
connect(settingsPanel, &JFJochViewerSettingsDock::azintChanged,
|
||||
@@ -554,35 +573,6 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
|
||||
processingDock->raise();
|
||||
});
|
||||
|
||||
// Image strip / hit feed: thumbnails of representative images, rendered off-thread; click opens.
|
||||
// Stacked below the plots — both want vertical room, and the strip needs less of it.
|
||||
auto *imageStrip = new JFJochViewerImageStrip(this);
|
||||
imageStripDock = new QDockWidget("Image strip", this);
|
||||
imageStripDock->setObjectName("imageStripDock");
|
||||
imageStripDock->setWidget(imageStrip);
|
||||
addDockWidget(Qt::BottomDockWidgetArea, imageStripDock);
|
||||
if (lastDatasetInfoDock) {
|
||||
splitDockWidget(lastDatasetInfoDock, imageStripDock, Qt::Vertical);
|
||||
resizeDocks({lastDatasetInfoDock, imageStripDock}, {260, 140}, Qt::Vertical);
|
||||
}
|
||||
menuBar->AddDockEntry(imageStripDock, "Image strip");
|
||||
connect(this, &JFJochViewerWindow::datasetReady,
|
||||
imageStrip, &JFJochViewerImageStrip::datasetLoaded);
|
||||
connect(reading_worker, &JFJochImageReadingWorker::fileOpened,
|
||||
imageStrip, &JFJochViewerImageStrip::resetForNewFile);
|
||||
connect(imageStrip, &JFJochViewerImageStrip::requestThumbnails,
|
||||
reading_worker, &JFJochImageReadingWorker::RenderThumbnails);
|
||||
connect(reading_worker, &JFJochImageReadingWorker::thumbnailReady,
|
||||
imageStrip, &JFJochViewerImageStrip::thumbnailReady);
|
||||
connect(imageStrip, &JFJochViewerImageStrip::imageSelected,
|
||||
reading_worker, &JFJochImageReadingWorker::LoadImage);
|
||||
connect(toolBarDisplay, &JFJochViewerToolbarDisplay::colorMapChanged,
|
||||
reading_worker, &JFJochImageReadingWorker::SetThumbnailColorMap);
|
||||
connect(side_panel, &JFJochViewerSidePanel::setFeatureColor,
|
||||
reading_worker, &JFJochImageReadingWorker::SetThumbnailFeatureColor);
|
||||
connect(side_panel, &JFJochViewerSidePanel::setSpotColor,
|
||||
reading_worker, &JFJochImageReadingWorker::SetThumbnailSpotColor);
|
||||
|
||||
connect(menuBar, &JFJochViewerMenu::imageLayoutSelected, this,
|
||||
[this] { ApplyPerspective(Perspective::Image); });
|
||||
connect(menuBar, &JFJochViewerMenu::processingLayoutSelected, this,
|
||||
@@ -603,6 +593,18 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
|
||||
restoreGeometry(settings.value("geometry").toByteArray());
|
||||
restoreState(settings.value("windowState").toByteArray(), kLayoutVersion);
|
||||
|
||||
// Display settings (color map, Auto, HDR) persist across sessions the same way the layout does.
|
||||
const int colorMap = settings.value("colorMap", static_cast<int>(ColorScaleEnum::Indigo)).toInt();
|
||||
viewer->setColorMap(colorMap);
|
||||
toolBarDisplay->updateColorMap(colorMap);
|
||||
|
||||
const bool autoForeground = settings.value("autoForeground", false).toBool();
|
||||
viewer->setAutoForeground(autoForeground); // emits autoForegroundChanged -> toolbar button state
|
||||
|
||||
const bool hdrMode = settings.value("hdrMode", false).toBool();
|
||||
viewer->setHDRMode(hdrMode);
|
||||
toolBarDisplay->updateHDRMode(hdrMode);
|
||||
|
||||
if (!file.isEmpty())
|
||||
LoadFile(file, 0, 1, false);
|
||||
}
|
||||
@@ -615,11 +617,14 @@ JFJochViewerWindow::~JFJochViewerWindow() {
|
||||
}
|
||||
|
||||
void JFJochViewerWindow::ApplyPerspective(Perspective p) {
|
||||
// Image: just the image + inspector. Processing: also settings, dataset-info plots, jobs panel.
|
||||
// Image: just the image + inspector (+ file manager, on top of its tab with Settings).
|
||||
// Processing: also dataset-info plots and the jobs panel, with Settings raised instead.
|
||||
const bool processing = (p == Perspective::Processing);
|
||||
if (inspectorDock) inspectorDock->setVisible(true);
|
||||
if (settingsDock) settingsDock->setVisible(processing);
|
||||
if (imageStripDock) imageStripDock->setVisible(processing);
|
||||
// Settings and the file manager stay tabbed together either way; only which one is on top changes.
|
||||
if (settingsDock) settingsDock->setVisible(true);
|
||||
if (fileBrowserDock) fileBrowserDock->setVisible(true);
|
||||
(processing ? settingsDock : fileBrowserDock)->raise();
|
||||
if (processingDock && !processing) processingDock->hide(); // shows only when a job starts
|
||||
for (auto *d : findChildren<QDockWidget *>())
|
||||
if (d->objectName().startsWith("datasetInfoDock"))
|
||||
@@ -631,6 +636,9 @@ void JFJochViewerWindow::closeEvent(QCloseEvent *event) {
|
||||
QSettings settings("PSI", "jfjoch_viewer");
|
||||
settings.setValue("geometry", saveGeometry());
|
||||
settings.setValue("windowState", saveState(kLayoutVersion));
|
||||
settings.setValue("colorMap", toolBarDisplay->colorMap());
|
||||
settings.setValue("autoForeground", toolBarDisplay->autoForeground());
|
||||
settings.setValue("hdrMode", toolBarDisplay->hdrMode());
|
||||
QMainWindow::closeEvent(event);
|
||||
}
|
||||
|
||||
@@ -701,7 +709,7 @@ void JFJochViewerWindow::keyPressEvent(QKeyEvent *event) {
|
||||
return;
|
||||
}
|
||||
if (event->key() == Qt::Key_A && ! event->isAutoRepeat()) {
|
||||
emit setAutoForeground(true);
|
||||
emit oneShotAutoForeground();
|
||||
event->accept();
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user