v1.0.0-rc.82

viewer/JFJochViewerWindow.cpp

@@ -10,6 +10,7 @@
 #include "JFJochViewerImage.h"
 #include "JFJochViewerSidePanel.h"
 #include "JFJochViewerStatusBar.h"
+#include "../common/CUDAWrapper.h"
 #include "windows/JFJochViewerImageListWindow.h"
 #include "windows/JFJochViewerMetadataWindow.h"
 #include "dbus/JFJochViewerAdaptor.h"
@@ -32,10 +33,20 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
     resize(1200, 1200);
 
     SpotFindingSettings spot_finding_settings = DiffractionExperiment::DefaultDataProcessingSettings();
-    IndexingSettings indexing_settings;
+
     spot_finding_settings.high_resolution_limit = 0.5;
+    spot_finding_settings.indexing = false;
+
+    IndexingSettings indexing_settings;
     indexing_settings.IndexingThreads(1);
     indexing_settings.Algorithm(IndexingAlgorithmEnum::Auto);
+    if (get_gpu_count() == 0) {
+        indexing_settings.Algorithm(IndexingAlgorithmEnum::FFTW);
+        indexing_settings.FFT_NumVectors(8 * 1024);
+    }
+    DiffractionExperiment experiment;
+    experiment.ImportIndexingSettings(indexing_settings);
+    experiment.DetectIceRings(true);
 
     auto v_splitter = new QSplitter(this);
     setCentralWidget(v_splitter);
@@ -62,7 +73,7 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
     dataset_info->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
     v_splitter->addWidget(dataset_info);
 
-    reading_worker = new JFJochImageReadingWorker(spot_finding_settings, indexing_settings);
+    reading_worker = new JFJochImageReadingWorker(spot_finding_settings, experiment);
     reading_thread = new QThread(this);
     reading_worker->moveToThread(reading_thread);
     reading_thread->start();
@@ -185,9 +196,6 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
     connect(reading_worker, &JFJochImageReadingWorker::setToolbarMode,
             toolBar, &JFJochViewerToolbar::setAutoloadMode);
 
-    connect(side_panel, &JFJochViewerSidePanel::findSpots,
-            reading_worker, &JFJochImageReadingWorker::FindSpots);
-
     connect(side_panel, &JFJochViewerSidePanel::analyze,
             reading_worker, &JFJochImageReadingWorker::Analyze);
 
@@ -255,10 +263,6 @@ JFJochViewerWindow::JFJochViewerWindow(QWidget *parent, bool dbus, const QString
     connect(side_panel, &JFJochViewerSidePanel::highlightIceRings,
             viewer, &JFJochViewerImage::highlightIceRings);
 
-
-
-
-
     if (!file.isEmpty())
         LoadFile(file, 0, 1);
 }