use big boy threads

addresses #28

Author: luebking

ImageViewer.cpp

@@ -30,6 +30,7 @@
 #include <QMovie>
 #include <QPainter>
 #include <QScrollBar>
+#include <QThread>
 #include <QTimer>
 #include <QWheelEvent>
 
@@ -602,6 +603,13 @@ void ImageViewer::setImage(const QImage &image) {
 }
 
 void ImageViewer::reload() {
+    static bool s_busy = false;
+    static bool s_abort = false;
+    if (s_busy) {
+        s_abort = true;
+        QMetaObject::invokeMethod(this, "reload", Qt::QueuedConnection);
+        return;
+    }
     if (Settings::showImageName) {
         if (fullImagePath.left(1) == ":") {
             setInfo("No Image");
@@ -666,23 +674,48 @@ void ImageViewer::reload() {
         viewerImage = origImage = m_preloadedImage;
         m_preloadedImage = QImage();
         m_preloadedPath.clear();
-    } else if (imageReader.size().isValid() && imageReader.read(&origImage)) {
-        if (Settings::exifRotationEnabled) {
-            m_exifTransformation = Metadata::transformation(fullImagePath);
-            origImage = origImage.transformed(Metadata::transformation(fullImagePath), Qt::SmoothTransformation);
+    } else if (imageReader.size().isValid()) {
+        bool imageOk = false;
+        if (batchMode || Settings::slideShowActive) {
+            imageReader.read(&origImage);
+        } else {
+            QThread *thread = QThread::create([&](){imageOk = imageReader.read(&origImage);});
+            thread->start();
+            s_busy = true;
+            while (!thread->wait(30)) {
+                QApplication::processEvents();
+                if (s_abort) {
+                    thread->terminate();
+                    thread->wait();
+                    break;
+                }
+            }
+            s_busy = false;
+            thread->deleteLater();
+            if (s_abort) {
+                s_abort = false;
+                return;
+            }
         }
-        viewerImage = origImage;
 
-        if (Settings::colorsActive || Settings::keepTransform) {
-            colorize();
-        }
-        if (myMirrorLayout) {
-            mirror();
-        }
-    } else {
-        viewerImage = QIcon::fromTheme("image-missing",
+        if (imageOk) {
+            if (Settings::exifRotationEnabled) {
+                m_exifTransformation = Metadata::transformation(fullImagePath);
+                origImage = origImage.transformed(Metadata::transformation(fullImagePath), Qt::SmoothTransformation);
+            }
+            viewerImage = origImage;
+
+            if (Settings::colorsActive || Settings::keepTransform) {
+                colorize();
+            }
+            if (myMirrorLayout) {
+                mirror();
+            }
+        } else {
+            viewerImage = QIcon::fromTheme("image-missing",
                                         QIcon(":/images/error_image.png")).pixmap(BAD_IMAGE_SIZE, BAD_IMAGE_SIZE).toImage();
-        setInfo(QFileInfo(imageReader.fileName()).fileName() + ": " + imageReader.errorString());
+            setInfo(QFileInfo(imageReader.fileName()).fileName() + ": " + imageReader.errorString());
+        }
     }
 
     setImage(viewerImage);

ImageViewer.h

@@ -61,7 +61,6 @@ Q_OBJECT
     void loadImage(QString imageFileName, const QImage &preview = QImage());
     void preload(QString imageFileName);
     void refresh();
-    void reload();
     void resizeImage(QPoint focus = QPoint(-1, -1));
     void scaleImage(QSize newSize);
     void setBackgroundColor();
@@ -81,13 +80,13 @@ Q_OBJECT
     void toolsUpdated();
 
 public slots:
-
+    void applyCropAndRotation();
     void monitorCursorState();
     void saveImage();
     void saveImageAs();
     void copyImage();
     void pasteImage();
-    void applyCropAndRotation();
+    void reload();
 
 private slots:
 

Phototonic.cpp

@@ -42,7 +42,7 @@
 #include <QStandardPaths>
 #include <QStandardItemModel>
 #include <QStatusBar>
-#include <QThreadPool>
+#include <QThread>
 #include <QToolBar>
 #include <QToolButton>
 #include <QToolTip>
@@ -273,7 +273,10 @@ void Phototonic::createImageViewer() {
     connect(copyImageAction, SIGNAL(triggered()), imageViewer, SLOT(copyImage()));
     connect(pasteImageAction, SIGNAL(triggered()), imageViewer, SLOT(pasteImage()));
     connect(imageViewer, &ImageViewer::toolsUpdated, [=](){ rotateToolAction->setChecked(Settings::mouseRotateEnabled); });
-    connect(imageViewer, &ImageViewer::gotFocus, [=](){ thumbsViewer->setCurrentIndex(imageViewer->fullImagePath); });
+    connect(imageViewer, &ImageViewer::gotFocus, [=](){
+        if (thumbsViewer->selectionModel()->selectedIndexes().size() < 1)
+            thumbsViewer->setCurrentIndex(imageViewer->fullImagePath);
+    });
     QMenu *contextMenu = new QMenu(imageViewer);
 
     // Widget actions
@@ -1892,6 +1895,10 @@ void Phototonic::loadCurrentImage(int currentRow) {
 }
 
 void Phototonic::deleteImages(bool trash) { // Deleting selected thumbnails
+    if (thumbsViewer->isBusy()) { // defer, don't alter while the thumbsviewer is loading stuff
+        QTimer::singleShot(100, this, [=](){deleteImages(trash);});
+        return;
+    }
     ASSERT_IMAGES_SELECTED
 
     QStringList deathRow;
@@ -1914,10 +1921,6 @@ void Phototonic::deleteImages(bool trash) { // Deleting selected thumbnails
         }
     }
 
-    // wait until thumbnail loading is done
-    while (QThreadPool::globalInstance()->activeThreadCount())
-        QThreadPool::globalInstance()->waitForDone(-1);
-
     // To only show progress dialog if deleting actually takes time
     QElapsedTimer timer;
     timer.start();
@@ -1999,10 +2002,15 @@ void Phototonic::deleteFromViewer(bool trash) {
         return;
     }
 
-    if (Settings::slideShowActive) {
+    if (Settings::slideShowActive) { // needs to happen now
         toggleSlideShow();
     }
-    imageViewer->setCursorHiding(false);
+    imageViewer->setCursorHiding(false); // tells that sth. is happening
+
+    if (thumbsViewer->isBusy()) { // defer, don't alter while the thumbsviewer is loading stuff
+        QTimer::singleShot(100, this, [=](){deleteFromViewer(trash);});
+        return;
+    }
 
     const QString fullPath = imageViewer->fullImagePath;
     const QString fileName = QFileInfo(fullPath).fileName();
@@ -2021,8 +2029,8 @@ void Phototonic::deleteFromViewer(bool trash) {
             return;
         }
     }
-    while (QThreadPool::globalInstance()->activeThreadCount())
-        QThreadPool::globalInstance()->waitForDone(-1);
+    while (thumbsViewer->isBusy())
+        QThread::sleep(30);
 
     QString trashError;
     if (trash ? (Trash::moveToTrash(fullPath, trashError) == Trash::Success) :

ThumbsViewer.cpp

@@ -33,7 +33,7 @@
 #include <QScrollBar>
 #include <QStandardItemModel>
 #include <QStandardPaths>
-#include <QThreadPool>
+#include <QThread>
 #include <QTimer>
 #include <QTreeWidget>
 #include <cmath>
@@ -363,8 +363,7 @@ void ThumbsViewer::loadFileList() {
 }
 
 void ThumbsViewer::reLoad() {
-    if (m_busy || QThreadPool::globalInstance()->activeThreadCount()) {
-        QThreadPool::globalInstance()->clear();
+    if (m_busy) {
         abort();
         QTimer::singleShot(50, this, [=]() { reLoad(); });
         return;
@@ -380,8 +379,6 @@ void ThumbsViewer::reLoad() {
     disconnect(verticalScrollBar(), SIGNAL(valueChanged(int)), scrollDelay, SLOT(start()));
     m_busy = true;
 
-    QThreadPool::globalInstance()->waitForDone(-1);
-
     histFiles.clear(); // these can grow out of control and currently sort O(n^2)
     histograms.clear();
     m_histSorted = false;
@@ -669,8 +666,7 @@ void ThumbsViewer::refreshThumbs() {
 
 void ThumbsViewer::loadDuplicates()
 {
-    if (m_busy || QThreadPool::globalInstance()->activeThreadCount()) {
-        QThreadPool::globalInstance()->clear();
+    if (m_busy) {
         abort();
         QTimer::singleShot(50, this, [=]() { loadDuplicates(); });
         return;
@@ -1132,8 +1128,7 @@ void ThumbsViewer::loadThumbsRange() {
             continue;
 
         if (!loadThumb(currThumb, true)) {
-            QThreadPool::globalInstance()->start([=](){loadThumb(currThumb);});
-//            qDebug() << "slow image read"; loadThumb(currThumb);
+            loadThumb(currThumb);
         }
 
         if (timer.elapsed() > 30) {
@@ -1294,6 +1289,17 @@ bool ThumbsViewer::loadThumb(int currThumb, bool fastOnly) {
     if (fastOnly && shouldStoreThumbnail)
         return false;
 
+    auto readThreaded = [&]() {
+        bool wentOk = false;
+        QThread *thread = QThread::create([&](){wentOk = thumbReader.read(&thumb);});
+        thread->start();
+        while (!thread->wait(30)) {
+            QApplication::processEvents();
+        }
+        thread->deleteLater();
+        return wentOk;
+    };
+
     QSize thumbSizeQ(thumbSize,thumbSize);
     if (currentThumbSize.isValid()) {
         bool scaleMe =  Settings::upscalePreview ||
@@ -1304,7 +1310,7 @@ bool ThumbsViewer::loadThumb(int currThumb, bool fastOnly) {
         }
 
         thumbReader.setScaledSize(currentThumbSize);
-        imageReadOk = thumbReader.read(&thumb);
+        imageReadOk = readThreaded();
 
         if (imageReadOk && !shouldStoreThumbnail) {
             int w = thumb.text("Thumb::Image::Width").toInt();
@@ -1319,7 +1325,7 @@ bool ThumbsViewer::loadThumb(int currThumb, bool fastOnly) {
         if (!imageReadOk && !shouldStoreThumbnail) { // tried thumbnail but somehow failed, sanitize it
             shouldStoreThumbnail = true;
             thumbReader.setFileName(imageFileName);
-            imageReadOk = thumbReader.read(&thumb);
+            imageReadOk = readThreaded();
         }
     }
 
@@ -1391,7 +1397,13 @@ QStandardItem * ThumbsViewer::addThumb(const QString &imageFullPath) {
         }
 
         thumbReader.setScaledSize(currThumbSize);
-        QImage thumb = thumbReader.read();
+        QImage thumb;
+        QThread *thread = QThread::create([&](){thumbReader.read(&thumb);});
+        thread->start();
+        while (!thread->wait(30)) {
+            QApplication::processEvents();
+        }
+        thread->deleteLater();
 
         if (Settings::exifThumbRotationEnabled) {
             thumb = thumb.transformed(Metadata::transformation(imageFullPath), Qt::SmoothTransformation);

ThumbsViewer.h

@@ -141,6 +141,7 @@ Q_OBJECT
     int lastVisibleThumb();
     QImage renderHistogram(const QString &imagePath, bool logarithmic = false);
     QString locateThumbnail(const QString &path) const;
+    bool isBusy() { return m_busy; }
 
     ImageTags *imageTags;
     QDir thumbsDir;