v1.0.0-rc.78

viewer/JFJochViewerWindow.cpp

@@ -56,9 +56,6 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
     v_splitter->addWidget(dataset_info);
 
     reading_worker = new JFJochImageReadingWorker();
-    reading_thread = new QThread(this);
-    reading_worker->moveToThread(reading_thread);
-    reading_thread->start();
 
     auto tableWindow = new JFJochViewerImageListWindow(this);
     auto metadataWindow = new JFJochViewerMetadataWindow(this);
@@ -80,16 +77,16 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
     }
 
     connect(this, &JFJochViewerWindow::LoadFileRequest,
-            reading_worker, &JFJochImageReadingWorker::LoadFile, Qt::QueuedConnection);
+            reading_worker, &JFJochImageReadingWorker::LoadFile);
 
     connect(this, &JFJochViewerWindow::LoadImageRequest,
-            reading_worker, &JFJochImageReadingWorker::LoadImage, Qt::QueuedConnection);
+            reading_worker, &JFJochImageReadingWorker::LoadImage);
 
     connect(menuBar, &JFJochViewerMenu::fileOpenSelected,
-        reading_worker, &JFJochImageReadingWorker::LoadFile, Qt::QueuedConnection);
+        reading_worker, &JFJochImageReadingWorker::LoadFile);
 
     connect(menuBar, &JFJochViewerMenu::fileCloseSelected,
-            reading_worker, &JFJochImageReadingWorker::CloseFile, Qt::QueuedConnection);
+            reading_worker, &JFJochImageReadingWorker::CloseFile);
 
     connect(menuBar, &JFJochViewerMenu::openImageListWindow,
             tableWindow, &JFJochViewerImageListWindow::open);
@@ -119,22 +116,18 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
             menuBar, &JFJochViewerMenu::spotListWindowClosing);
 
     connect(reading_worker, &JFJochImageReadingWorker::imageLoaded,
-            viewer,&JFJochViewerImage::loadImage,
-        Qt::QueuedConnection);
+            viewer,&JFJochViewerImage::loadImage);
 
     connect(reading_worker, &JFJochImageReadingWorker::imageLoaded,
-            side_panel, &JFJochViewerSidePanel::loadImage,
-            Qt::QueuedConnection);
+            side_panel, &JFJochViewerSidePanel::loadImage);
 
     connect(reading_worker, &JFJochImageReadingWorker::imageStatsUpdated,
-            side_panel, &JFJochViewerSidePanel::loadImage,
-            Qt::QueuedConnection);
+            side_panel, &JFJochViewerSidePanel::loadImage);
 
     connect(reading_worker, &JFJochImageReadingWorker::imageNumberChanged, toolBar,
-            &JFJochViewerToolbar::setImageNumber, Qt::QueuedConnection);
+            &JFJochViewerToolbar::setImageNumber);
 
-    connect(toolBar, &JFJochViewerToolbar::loadImage, reading_worker, &JFJochImageReadingWorker::LoadImage,
-            Qt::QueuedConnection);
+    connect(toolBar, &JFJochViewerToolbar::loadImage, reading_worker, &JFJochImageReadingWorker::LoadImage);
 
     connect(toolBar, &JFJochViewerToolbar::setForeground, viewer,
             &JFJochViewerImage::changeForeground);
@@ -146,60 +139,46 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
             toolBar, &JFJochViewerToolbar::updateForeground);
 
     connect(viewer, &JFJochViewerImage::roiBoxUpdated,
-            reading_worker, &JFJochImageReadingWorker::SetROIBox,
-            Qt::QueuedConnection);
+            reading_worker, &JFJochImageReadingWorker::SetROIBox);
 
     connect(viewer, &JFJochViewerImage::roiCircleUpdated,
-            reading_worker, &JFJochImageReadingWorker::SetROICircle,
-            Qt::QueuedConnection);
+            reading_worker, &JFJochImageReadingWorker::SetROICircle);
 
     connect(reading_worker, &JFJochImageReadingWorker::datasetLoaded,
-            dataset_info, &JFJochViewerDatasetInfo::datasetLoaded,
-            Qt::QueuedConnection);
+            dataset_info, &JFJochViewerDatasetInfo::datasetLoaded);
 
     connect(reading_worker, &JFJochImageReadingWorker::imageLoaded,
-            dataset_info, &JFJochViewerDatasetInfo::imageLoaded,
-            Qt::QueuedConnection);
+            dataset_info, &JFJochViewerDatasetInfo::imageLoaded);
 
     connect(dataset_info, &JFJochViewerDatasetInfo::imageSelected,
-            reading_worker, &JFJochImageReadingWorker::LoadImage,
-            Qt::QueuedConnection);
+            reading_worker, &JFJochImageReadingWorker::LoadImage);
 
     connect (reading_worker, &JFJochImageReadingWorker::datasetLoaded,
-             tableWindow, &JFJochViewerImageListWindow::datasetLoaded,
-             Qt::QueuedConnection);
+             tableWindow, &JFJochViewerImageListWindow::datasetLoaded);
 
     connect(reading_worker, &JFJochImageReadingWorker::datasetLoaded,
-            spotWindow, &JFJochViewerSpotListWindow::datasetLoaded,
-            Qt::QueuedConnection);
+            spotWindow, &JFJochViewerSpotListWindow::datasetLoaded);
 
     connect (reading_worker, &JFJochImageReadingWorker::datasetLoaded,
-             metadataWindow, &JFJochViewerMetadataWindow::datasetLoaded,
-             Qt::QueuedConnection);
+             metadataWindow, &JFJochViewerMetadataWindow::datasetLoaded);
 
     connect (reading_worker, &JFJochImageReadingWorker::imageLoaded,
-             tableWindow, &JFJochViewerImageListWindow::imageLoaded,
-             Qt::QueuedConnection);
+             tableWindow, &JFJochViewerImageListWindow::imageLoaded);
 
     connect(reading_worker, &JFJochImageReadingWorker::imageLoaded,
-            spotWindow, &JFJochViewerSpotListWindow::imageLoaded,
-            Qt::QueuedConnection);
+            spotWindow, &JFJochViewerSpotListWindow::imageLoaded);
 
     connect(tableWindow, &JFJochViewerImageListWindow::imageSelected,
-            reading_worker, &JFJochImageReadingWorker::LoadImage,
-            Qt::QueuedConnection);
+            reading_worker, &JFJochImageReadingWorker::LoadImage);
 
     connect(reading_worker, &JFJochImageReadingWorker::setToolbarMode,
-            toolBar, &JFJochViewerToolbar::setAutoloadMode,
-            Qt::QueuedConnection);
+            toolBar, &JFJochViewerToolbar::setAutoloadMode);
 
     connect(side_panel, &JFJochViewerSidePanel::findSpots,
-            reading_worker, &JFJochImageReadingWorker::FindSpots,
-            Qt::QueuedConnection);
+            reading_worker, &JFJochImageReadingWorker::FindSpots);
 
     connect(side_panel, &JFJochViewerSidePanel::findBeamCenter,
-            reading_worker, &JFJochImageReadingWorker::FindCenter,
-            Qt::QueuedConnection);
+            reading_worker, &JFJochImageReadingWorker::FindCenter);
 
     connect(menuBar, &JFJochViewerMenu::openReflectionListWindow,
             reflectionWindow, &JFJochViewerReflectionListWindow::open);
@@ -211,12 +190,10 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
             menuBar, &JFJochViewerMenu::reflectionListWindowClosing);
 
     connect(reading_worker, &JFJochImageReadingWorker::datasetLoaded,
-            reflectionWindow, &JFJochViewerReflectionListWindow::datasetLoaded,
-            Qt::QueuedConnection);
+            reflectionWindow, &JFJochViewerReflectionListWindow::datasetLoaded);
 
     connect(reading_worker, &JFJochImageReadingWorker::imageLoaded,
-            reflectionWindow, &JFJochViewerReflectionListWindow::imageLoaded,
-            Qt::QueuedConnection);
+            reflectionWindow, &JFJochViewerReflectionListWindow::imageLoaded);
 
     connect(reflectionWindow, &JFJochViewerReflectionListWindow::reflectionSelected,
             viewer, &JFJochViewerImage::centerOnSpot);