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

jfjoch_viewer: Rename Image views to give more consistency. Continue merging code

Browse Source
This commit is contained in:
leonarski_f
2025-11-07 12:13:32 +01:00
parent ae6574d3ec
commit 2fa7ca7fad
8 changed files with 96 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
viewer/JFJochViewerWindow.cpp
View File

@@ -7,7 +7,7 @@
#include <QThread>
#include "JFJochImageReadingWorker.h"
#include "widgets/JFJochViewerImage.h"
#include "widgets/JFJochDiffractionImage.h"
#include "JFJochViewerSidePanel.h"
#include "JFJochViewerStatusBar.h"
#include "../common/CUDAWrapper.h"
@@ -63,7 +63,7 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
h_splitter->setOrientation(Qt::Horizontal);
v_splitter->addWidget(h_splitter);
auto viewer = new JFJochViewerImage(this);
auto viewer = new JFJochDiffractionImage(this);
viewer->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
h_splitter->addWidget(viewer);
@@ -127,7 +127,7 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
reading_worker, &JFJochImageReadingWorker::CloseFile);
connect(reading_worker, &JFJochImageReadingWorker::imageLoaded,
viewer, &JFJochViewerImage::loadImage);
viewer, &JFJochDiffractionImage::loadImage);
connect(reading_worker, &JFJochImageReadingWorker::imageLoaded,
side_panel, &JFJochViewerSidePanel::loadImage);
@@ -141,30 +141,30 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
connect(toolBarImage, &JFJochViewerToolbarImage::loadImage, reading_worker, &JFJochImageReadingWorker::LoadImage);
connect(toolBarDisplay, &JFJochViewerToolbarDisplay::setForeground, viewer,
&JFJochViewerImage::changeForeground);
&JFJochDiffractionImage::changeForeground);
connect(toolBarDisplay, &JFJochViewerToolbarDisplay::setBackground, viewer,
&JFJochViewerImage::changeBackground);
&JFJochDiffractionImage::changeBackground);
connect(toolBarDisplay, &JFJochViewerToolbarDisplay::setAutoForeground, viewer,
&JFJochViewerImage::setAutoForeground);
&JFJochDiffractionImage::setAutoForeground);
connect(toolBarDisplay, &JFJochViewerToolbarDisplay::colorMapChanged, viewer,
&JFJochViewerImage::setColorMap);
&JFJochDiffractionImage::setColorMap);
connect(viewer, &JFJochViewerImage::foregroundChanged,
connect(viewer, &JFJochDiffractionImage::foregroundChanged,
toolBarDisplay, &JFJochViewerToolbarDisplay::updateForeground);
connect(viewer, &JFJochViewerImage::roiBoxUpdated,
connect(viewer, &JFJochDiffractionImage::roiBoxUpdated,
reading_worker, &JFJochImageReadingWorker::SetROIBox);
connect(viewer, &JFJochViewerImage::roiCircleUpdated,
connect(viewer, &JFJochDiffractionImage::roiCircleUpdated,
reading_worker, &JFJochImageReadingWorker::SetROICircle);
connect(viewer, &JFJochViewerImage::roiBoxUpdated,
connect(viewer, &JFJochDiffractionImage::roiBoxUpdated,
side_panel, &JFJochViewerSidePanel::SetROIBox);
connect(viewer, &JFJochViewerImage::roiCircleUpdated,
connect(viewer, &JFJochDiffractionImage::roiCircleUpdated,
side_panel, &JFJochViewerSidePanel::SetROICircle);
connect(side_panel, &JFJochViewerSidePanel::ROIBoxConfigured,
@@ -174,10 +174,10 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
reading_worker, &JFJochImageReadingWorker::SetROICircle);
connect(side_panel, &JFJochViewerSidePanel::ROIBoxConfigured,
viewer, &JFJochViewerImage::SetROIBox);
viewer, &JFJochDiffractionImage::SetROIBox);
connect(side_panel, &JFJochViewerSidePanel::ROICircleConfigured,
viewer, &JFJochViewerImage::SetROICircle);
viewer, &JFJochDiffractionImage::SetROICircle);
connect(side_panel, &JFJochViewerSidePanel::AddROIToUserMask,
reading_worker, &JFJochImageReadingWorker::AddROIToUserMask);
@@ -240,31 +240,31 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
connect(processingWindow, &JFJochViewerProcessingWindow::settingsChanged,
reading_worker, &JFJochImageReadingWorker::UpdateSpotFindingSettings);
connect(reflectionWindow, &JFJochHelperWindow::zoom, viewer, &JFJochViewerImage::centerOnSpot);
connect(spotWindow, &JFJochHelperWindow::zoom, viewer, &JFJochViewerImage::centerOnSpot);
connect(reflectionWindow, &JFJochHelperWindow::zoom, viewer, &JFJochDiffractionImage::centerOnSpot);
connect(spotWindow, &JFJochHelperWindow::zoom, viewer, &JFJochDiffractionImage::centerOnSpot);
connect(side_panel, &JFJochViewerSidePanel::showSpots,
viewer, &JFJochViewerImage::showSpots);
viewer, &JFJochDiffractionImage::showSpots);
connect(side_panel, &JFJochViewerSidePanel::showPredictions,
viewer, &JFJochViewerImage::showPredictions);
viewer, &JFJochDiffractionImage::showPredictions);
connect(side_panel, &JFJochViewerSidePanel::autoResRings,
viewer, &JFJochViewerImage::setResolutionRingAuto);
viewer, &JFJochDiffractionImage::setResolutionRingAuto);
connect(side_panel, &JFJochViewerSidePanel::setFeatureColor,
viewer, &JFJochViewerImage::setFeatureColor);
viewer, &JFJochDiffractionImage::setFeatureColor);
connect(side_panel, &JFJochViewerSidePanel::setFeatureColor,
calibrationWindow, &JFJochCalibrationWindow::setFeatureColor);
connect(side_panel, &JFJochViewerSidePanel::setSpotColor,
viewer, &JFJochViewerImage::setSpotColor);
viewer, &JFJochDiffractionImage::setSpotColor);
connect(side_panel, &JFJochViewerSidePanel::showHighestPixels,
viewer, &JFJochViewerImage::showHighestPixels);
viewer, &JFJochDiffractionImage::showHighestPixels);
connect(side_panel, &JFJochViewerSidePanel::showSaturatedPixels,
viewer, &JFJochViewerImage::showSaturation);
viewer, &JFJochDiffractionImage::showSaturation);
connect(side_panel, &JFJochViewerSidePanel::setResRings,
viewer, &JFJochViewerImage::setResolutionRing);
connect(viewer, &JFJochViewerImage::writeStatusBar,
viewer, &JFJochDiffractionImage::setResolutionRing);
connect(viewer, &JFJochDiffractionImage::writeStatusBar,
statusbar, &JFJochViewerStatusBar::display);
connect(metadataWindow, &JFJochViewerMetadataWindow::datasetUpdated,
@@ -274,7 +274,7 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
side_panel, &JFJochViewerSidePanel::setResRings);
connect(side_panel, &JFJochViewerSidePanel::highlightIceRings,
viewer, &JFJochViewerImage::highlightIceRings);
viewer, &JFJochDiffractionImage::highlightIceRings);
connect(calibrationWindow, &JFJochCalibrationWindow::loadCalibration,
reading_worker, &JFJochImageReadingWorker::LoadCalibration);