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

v1.0.0-rc.81

Browse Source
This commit is contained in:
leonarski_f
2025-09-21 19:27:51 +02:00
parent 3ded4cd3ce
commit 5d9d2de4a4
243 changed files with 3401 additions and 935 deletions
Download Patch File Download Diff File Expand all files Collapse all files
viewer/JFJochViewerWindow.cpp
+46 -11
View File
@@ -13,6 +13,7 @@
#include "windows/JFJochViewerImageListWindow.h"
#include "windows/JFJochViewerMetadataWindow.h"
#include "dbus/JFJochViewerAdaptor.h"
#include "windows/JFJochViewerProcessingWindow.h"
#include "windows/JFJochViewerSpotListWindow.h"
#include "windows/JFJochViewerReflectionListWindow.h"
@@ -28,7 +29,13 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
setStyleSheet(stylesheet);
setWindowTitle("Jungfraujoch image viewer");
resize(1200,1200);
resize(1200, 1200);
SpotFindingSettings spot_finding_settings = DiffractionExperiment::DefaultDataProcessingSettings();
IndexingSettings indexing_settings;
spot_finding_settings.high_resolution_limit = 0.5;
indexing_settings.IndexingThreads(1);
indexing_settings.Algorithm(IndexingAlgorithmEnum::Auto);
auto v_splitter = new QSplitter(this);
setCentralWidget(v_splitter);
@@ -55,12 +62,16 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
dataset_info->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
v_splitter->addWidget(dataset_info);
reading_worker = new JFJochImageReadingWorker();
reading_worker = new JFJochImageReadingWorker(spot_finding_settings, indexing_settings);
reading_thread = new QThread(this);
reading_worker->moveToThread(reading_thread);
reading_thread->start();
auto tableWindow = new JFJochViewerImageListWindow(this);
auto metadataWindow = new JFJochViewerMetadataWindow(this);
auto spotWindow = new JFJochViewerSpotListWindow(this);
auto reflectionWindow = new JFJochViewerReflectionListWindow(this);
auto processingWindow = new JFJochViewerProcessingWindow(spot_finding_settings, indexing_settings, this);
new JFJochViewerAdaptor(this);
@@ -83,7 +94,7 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
reading_worker, &JFJochImageReadingWorker::LoadImage);
connect(menuBar, &JFJochViewerMenu::fileOpenSelected,
reading_worker, &JFJochImageReadingWorker::LoadFile);
reading_worker, &JFJochImageReadingWorker::LoadFile);
connect(menuBar, &JFJochViewerMenu::fileCloseSelected,
reading_worker, &JFJochImageReadingWorker::CloseFile);
@@ -116,7 +127,7 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
menuBar, &JFJochViewerMenu::spotListWindowClosing);
connect(reading_worker, &JFJochImageReadingWorker::imageLoaded,
viewer,&JFJochViewerImage::loadImage);
viewer, &JFJochViewerImage::loadImage);
connect(reading_worker, &JFJochImageReadingWorker::imageLoaded,
side_panel, &JFJochViewerSidePanel::loadImage);
@@ -135,7 +146,7 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
connect(toolBar, &JFJochViewerToolbar::colorMapChanged, viewer,
&JFJochViewerImage::setColorMap);
connect(viewer,&JFJochViewerImage::foregroundChanged,
connect(viewer, &JFJochViewerImage::foregroundChanged,
toolBar, &JFJochViewerToolbar::updateForeground);
connect(viewer, &JFJochViewerImage::roiBoxUpdated,
@@ -153,17 +164,17 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
connect(dataset_info, &JFJochViewerDatasetInfo::imageSelected,
reading_worker, &JFJochImageReadingWorker::LoadImage);
connect (reading_worker, &JFJochImageReadingWorker::datasetLoaded,
tableWindow, &JFJochViewerImageListWindow::datasetLoaded);
connect(reading_worker, &JFJochImageReadingWorker::datasetLoaded,
tableWindow, &JFJochViewerImageListWindow::datasetLoaded);
connect(reading_worker, &JFJochImageReadingWorker::datasetLoaded,
spotWindow, &JFJochViewerSpotListWindow::datasetLoaded);
connect (reading_worker, &JFJochImageReadingWorker::datasetLoaded,
metadataWindow, &JFJochViewerMetadataWindow::datasetLoaded);
connect(reading_worker, &JFJochImageReadingWorker::datasetLoaded,
metadataWindow, &JFJochViewerMetadataWindow::datasetLoaded);
connect (reading_worker, &JFJochImageReadingWorker::imageLoaded,
tableWindow, &JFJochViewerImageListWindow::imageLoaded);
connect(reading_worker, &JFJochImageReadingWorker::imageLoaded,
tableWindow, &JFJochViewerImageListWindow::imageLoaded);
connect(reading_worker, &JFJochImageReadingWorker::imageLoaded,
spotWindow, &JFJochViewerSpotListWindow::imageLoaded);
@@ -177,6 +188,9 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
connect(side_panel, &JFJochViewerSidePanel::findSpots,
reading_worker, &JFJochImageReadingWorker::FindSpots);
connect(side_panel, &JFJochViewerSidePanel::analyze,
reading_worker, &JFJochImageReadingWorker::Analyze);
connect(side_panel, &JFJochViewerSidePanel::findBeamCenter,
reading_worker, &JFJochImageReadingWorker::FindCenter);
@@ -198,6 +212,17 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
connect(reflectionWindow, &JFJochViewerReflectionListWindow::reflectionSelected,
viewer, &JFJochViewerImage::centerOnSpot);
connect(menuBar, &JFJochViewerMenu::openProcessingWindow,
processingWindow, &JFJochViewerProcessingWindow::open);
connect(menuBar, &JFJochViewerMenu::closeProcessingWindow,
processingWindow, &JFJochViewerProcessingWindow::close);
connect(processingWindow, &JFJochViewerProcessingWindow::closing,
menuBar, &JFJochViewerMenu::processingWindowClosing);
connect(processingWindow, &JFJochViewerProcessingWindow::settingsChanged,
reading_worker, &JFJochImageReadingWorker::UpdateSpotFindingSettings);
connect(spotWindow, &JFJochViewerSpotListWindow::spotSelected,
viewer, &JFJochViewerImage::centerOnSpot);
@@ -224,6 +249,16 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
connect(metadataWindow, &JFJochViewerMetadataWindow::datasetUpdated,
reading_worker, &JFJochImageReadingWorker::UpdateDataset);
connect(reading_worker, &JFJochImageReadingWorker::setRings,
side_panel, &JFJochViewerSidePanel::setResRings);
connect(side_panel, &JFJochViewerSidePanel::highlightIceRings,
viewer, &JFJochViewerImage::highlightIceRings);
if (!file.isEmpty())
LoadFile(file, 0, 1);
}