mx/Jungfraujoch
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 44 Wiki Activity

jfjoch_viewer: Split toolbar into two (image and display), allow to change background (not perfect, but...)

Browse Source
This commit is contained in:
leonarski_f
2025-11-06 11:31:44 +01:00
parent 9235d1d4bc
commit c19803ad69
9 changed files with 189 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
viewer/JFJochViewerWindow.cpp
View File

@@ -22,8 +22,11 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
menuBar = new JFJochViewerMenu(this);
setMenuBar(menuBar);
toolBar = new JFJochViewerToolbar(this);
addToolBar(toolBar);
toolBarImage = new JFJochViewerToolbarImage(this);
addToolBar(toolBarImage);
toolBarDisplay = new JFJochViewerToolbarDisplay(this);
addToolBar(toolBarDisplay);
auto statusbar = new JFJochViewerStatusBar(this);
setStatusBar(statusbar);
@@ -150,22 +153,25 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
connect(reading_worker, &JFJochImageReadingWorker::imageStatsUpdated,
side_panel, &JFJochViewerSidePanel::loadImage);
connect(reading_worker, &JFJochImageReadingWorker::imageNumberChanged, toolBar,
&JFJochViewerToolbar::setImageNumber);
connect(reading_worker, &JFJochImageReadingWorker::imageNumberChanged, toolBarImage,
&JFJochViewerToolbarImage::setImageNumber);
connect(toolBar, &JFJochViewerToolbar::loadImage, reading_worker, &JFJochImageReadingWorker::LoadImage);
connect(toolBarImage, &JFJochViewerToolbarImage::loadImage, reading_worker, &JFJochImageReadingWorker::LoadImage);
connect(toolBar, &JFJochViewerToolbar::setForeground, viewer,
connect(toolBarDisplay, &JFJochViewerToolbarDisplay::setForeground, viewer,
&JFJochViewerImage::changeForeground);
connect(toolBar, &JFJochViewerToolbar::setAutoForeground, viewer,
connect(toolBarDisplay, &JFJochViewerToolbarDisplay::setBackground, viewer,
&JFJochViewerImage::changeBackground);
connect(toolBarDisplay, &JFJochViewerToolbarDisplay::setAutoForeground, viewer,
&JFJochViewerImage::setAutoForeground);
connect(toolBar, &JFJochViewerToolbar::colorMapChanged, viewer,
connect(toolBarDisplay, &JFJochViewerToolbarDisplay::colorMapChanged, viewer,
&JFJochViewerImage::setColorMap);
connect(viewer, &JFJochViewerImage::foregroundChanged,
toolBar, &JFJochViewerToolbar::updateForeground);
toolBarDisplay, &JFJochViewerToolbarDisplay::updateForeground);
connect(viewer, &JFJochViewerImage::roiBoxUpdated,
reading_worker, &JFJochImageReadingWorker::SetROIBox);
@@ -234,7 +240,7 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
reading_worker, &JFJochImageReadingWorker::LoadImage);
connect(reading_worker, &JFJochImageReadingWorker::setToolbarMode,
toolBar, &JFJochViewerToolbar::setAutoloadMode);
toolBarImage, &JFJochViewerToolbarImage::setAutoloadMode);
connect(side_panel, &JFJochViewerSidePanel::analyze,
reading_worker, &JFJochImageReadingWorker::Analyze);