improved thumbnails handling as they could be re-generated 2-3 times with no reason. Huge performance issue in a network-storage context, especially with large files

src/adaptors/UBSvgSubsetAdaptor.cpp

@@ -29,6 +29,7 @@
 
 #include "UBSvgSubsetAdaptor.h"
 
+#include <QObject>
 #include <QtCore>
 #include <QtXml>
 #include <QGraphicsTextItem>
@@ -239,6 +240,7 @@ QString UBSvgSubsetAdaptor::uniboardDocumentNamespaceUriFromVersion(int mFileVer
 
 UBGraphicsScene* UBSvgSubsetAdaptor::loadScene(UBDocumentProxy* proxy, const int pageIndex)
 {
+    UBApplication::showMessage(QObject::tr("Loading scene (%1/%2)").arg(pageIndex+1).arg(proxy->pageCount()));
     QString fileName = proxy->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.svg", pageIndex);
     qDebug() << fileName;
     QFile file(fileName);

src/adaptors/UBThumbnailAdaptor.cpp

@@ -54,6 +54,7 @@ void UBThumbnailAdaptor::generateMissingThumbnails(UBDocumentProxy* proxy)
 
     for (int iPageNo = 0; iPageNo < existingPageCount; ++iPageNo)
     {
+        UBApplication::showMessage(tr("check generateMissingThumbnails (%1/%2)").arg(iPageNo).arg(existingPageCount));
         QString thumbFileName = proxy->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.thumbnail.jpg", iPageNo);
 
         QFile thumbFile(thumbFileName);
@@ -83,8 +84,9 @@ void UBThumbnailAdaptor::generateMissingThumbnails(UBDocumentProxy* proxy)
     }
 }
 
-const QPixmap* UBThumbnailAdaptor::get(UBDocumentProxy* proxy, int pageIndex)
+QPixmap UBThumbnailAdaptor::get(UBDocumentProxy* proxy, int pageIndex)
 {
+    UBApplication::showMessage(tr("Loading thumbnail (%1/%2)").arg(pageIndex+1).arg(proxy->pageCount()));
     QString fileName = proxy->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.thumbnail.jpg", pageIndex);
 
     QFile file(fileName);
@@ -93,30 +95,21 @@ const QPixmap* UBThumbnailAdaptor::get(UBDocumentProxy* proxy, int pageIndex)
         generateMissingThumbnails(proxy);
     }
 
-    QPixmap* pix = new QPixmap();
+    QPixmap pix;
     if (file.exists())
     {
-        //Warning. Works only with modified Qt
+        pix.load(fileName, 0, Qt::AutoColor);
-#ifdef Q_OS_LINUX
-        pix->load(fileName, 0, Qt::AutoColor);
-#else
-        pix->load(fileName, 0, Qt::AutoColor);
-#endif
     }
     return pix;
 }
 
-void UBThumbnailAdaptor::load(UBDocumentProxy* proxy, QList<const QPixmap*>& list)
+void UBThumbnailAdaptor::load(UBDocumentProxy* proxy, QList<std::shared_ptr<QPixmap>>& list)
 {
-    generateMissingThumbnails(proxy);
-
-    foreach(const QPixmap* pm, list){
-        delete pm;
-        pm = NULL;
-    }
     list.clear();
     for(int i=0; i<proxy->pageCount(); i++)
-        list.append(get(proxy, i));
+    {
+        list.append(std::make_shared<QPixmap>(get(proxy, i)));
+    }
 }
 
 void UBThumbnailAdaptor::persistScene(UBDocumentProxy* proxy, UBGraphicsScene* pScene, int pageIndex, bool overrideModified)

src/adaptors/UBThumbnailAdaptor.h

@@ -45,8 +45,8 @@ public:
 
     static void persistScene(UBDocumentProxy* proxy, UBGraphicsScene* pScene, int pageIndex, bool overrideModified = false);
 
-    static const QPixmap* get(UBDocumentProxy* proxy, int index);
+    static QPixmap get(UBDocumentProxy* proxy, int index);
-    static void load(UBDocumentProxy* proxy, QList<const QPixmap*>& list);
+    static void load(UBDocumentProxy* proxy, QList<std::shared_ptr<QPixmap>>& list);
 
 private:
     static void generateMissingThumbnails(UBDocumentProxy* proxy);

src/core/UBApplicationController.cpp

@@ -354,7 +354,7 @@ void UBApplicationController::showBoard()
         int selectedSceneIndex = UBApplication::documentController->getSelectedItemIndex();
         if (selectedSceneIndex != -1)
         {
-            UBApplication::boardController->setActiveDocumentScene(UBApplication::documentController->selectedDocument(), selectedSceneIndex, true);
+            UBApplication::boardController->setActiveDocumentScene(UBApplication::documentController->selectedDocument(), selectedSceneIndex);
         }
     }
 

src/core/UBPersistenceManager.cpp

@@ -809,7 +809,7 @@ void UBPersistenceManager::copyDocumentScene(UBDocumentProxy *from, int fromInde
 
     Q_ASSERT(QFileInfo(thumbTmp).exists());
     Q_ASSERT(QFileInfo(thumbTo).exists());
-    const QPixmap *pix = new QPixmap(thumbTmp);
+    auto pix = std::make_shared<QPixmap>(thumbTmp);
     UBDocumentController *ctrl = UBApplication::documentController;
     ctrl->addPixmapAt(pix, toIndex);
     ctrl->TreeViewSelectionChanged(ctrl->firstSelectedTreeIndex(), QModelIndex());
@@ -820,10 +820,13 @@ void UBPersistenceManager::copyDocumentScene(UBDocumentProxy *from, int fromInde
 
 UBGraphicsScene* UBPersistenceManager::createDocumentSceneAt(UBDocumentProxy* proxy, int index, bool useUndoRedoStack)
 {
-    int count = sceneCount(proxy);
+    int count = proxy->pageCount();
 
     for(int i = count - 1; i >= index; i--)
+    {
+        UBApplication::showMessage(tr("renaming pages (%1/%2)").arg(i).arg(count));
         renamePage(proxy, i , i + 1);
+    }
 
     mSceneCache.shiftUpScenes(proxy, index, count -1);
 

src/core/UBSceneCache.cpp

@@ -222,6 +222,7 @@ void UBSceneCache::shiftUpScenes(UBDocumentProxy* proxy, int startIncIndex, int
 {
     for(int i = endIncIndex; i >= startIncIndex; i--)
     {
+        UBApplication::showMessage(QObject::tr("moving cached scenes (%1/%2)").arg(i).arg(endIncIndex));
         internalMoveScene(proxy, i, i + 1);
     }
 }

src/document/UBDocumentContainer.cpp

@@ -40,10 +40,7 @@ UBDocumentContainer::UBDocumentContainer(QObject * parent)
 
 UBDocumentContainer::~UBDocumentContainer()
 {
-    foreach(const QPixmap* pm, mDocumentThumbs){
+
-        delete pm;
-        pm = NULL;
-    }
 }
 
 void UBDocumentContainer::setDocument(UBDocumentProxy* document, bool forceReload)
@@ -52,6 +49,8 @@ void UBDocumentContainer::setDocument(UBDocumentProxy* document, bool forceReloa
     {
         mCurrentDocument = document;
 
+        //qDebug() << documentThumbs();
+        clearThumbPage();
         reloadThumbnails();
         emit documentSet(mCurrentDocument);
     }
@@ -103,15 +102,14 @@ void UBDocumentContainer::addPage(int index)
 }
 
 
-void UBDocumentContainer::addPixmapAt(const QPixmap *pix, int index)
+void UBDocumentContainer::addPixmapAt(std::shared_ptr<QPixmap> pix, int index)
 {
-    mDocumentThumbs.insert(index, pix);
+    documentThumbs().insert(index, pix);
 }
 
 
 void UBDocumentContainer::clearThumbPage()
 {
-    qDeleteAll(mDocumentThumbs);
     mDocumentThumbs.clear();
 }
 
@@ -126,7 +124,6 @@ void UBDocumentContainer::initThumbPage()
 void UBDocumentContainer::updatePage(int index)
 {
     updateThumbPage(index);
-    emit documentThumbnailsUpdated(this);
 }
 
 void UBDocumentContainer::deleteThumbPage(int index)
@@ -138,8 +135,9 @@ void UBDocumentContainer::updateThumbPage(int index)
 {
     if (mDocumentThumbs.size() > index)
     {
-        mDocumentThumbs[index] = UBThumbnailAdaptor::get(mCurrentDocument, index);
+        QPixmap pixmap = UBThumbnailAdaptor::get(mCurrentDocument, index);
-        emit documentPageUpdated(index);
+        mDocumentThumbs[index] = std::make_shared<QPixmap>(pixmap);
+        emit documentPageUpdated(index); //refresh specific thumbnail in board
     }
     else
     {
@@ -149,15 +147,24 @@ void UBDocumentContainer::updateThumbPage(int index)
 
 void UBDocumentContainer::insertThumbPage(int index)
 {
-    mDocumentThumbs.insert(index, UBThumbnailAdaptor::get(mCurrentDocument, index));
+    QPixmap newPixmap = UBThumbnailAdaptor::get(mCurrentDocument, index);
+    if (index < documentThumbs().size())
+    {
+        *documentThumbs().at(index) = newPixmap;
     }
-
+    else
-void UBDocumentContainer::reloadThumbnails()
     {
-    if (mCurrentDocument)
+        documentThumbs().insert(index, std::make_shared<QPixmap>(newPixmap));
+    }
+}
+
+void UBDocumentContainer::insertExistingThumbPage(int index, std::shared_ptr<QPixmap> thumbnailPixmap)
 {
-        UBThumbnailAdaptor::load(mCurrentDocument, mDocumentThumbs);
+    documentThumbs().insert(index, thumbnailPixmap);
 }
+
+void UBDocumentContainer::reloadThumbnails()
+{
     emit documentThumbnailsUpdated(this);
 }
 
@@ -173,6 +180,5 @@ int UBDocumentContainer::sceneIndexFromPage(int page)
 
 void UBDocumentContainer::addEmptyThumbPage()
 {
-    const QPixmap* pThumb = new QPixmap();
+    mDocumentThumbs.append(std::shared_ptr<QPixmap>());
-    mDocumentThumbs.append(pThumb);
 }

src/document/UBDocumentContainer.h

@@ -45,8 +45,9 @@ class UBDocumentContainer : public QObject
         void pureSetDocument(UBDocumentProxy *document) {mCurrentDocument = document;}
 
         UBDocumentProxy* selectedDocument(){return mCurrentDocument;}
+        QList<std::shared_ptr<QPixmap>>& documentThumbs() { return mDocumentThumbs; }
         int pageCount() const{return mCurrentDocument->pageCount();}
-        const QPixmap* pageAt(int index)
+        std::shared_ptr<QPixmap> pageAt(int index)
         {
             if (index < mDocumentThumbs.size())
                 return mDocumentThumbs[index];
@@ -65,16 +66,17 @@ class UBDocumentContainer : public QObject
         void clearThumbPage();
         void initThumbPage();
         void addPage(int index);
-        void addPixmapAt(const QPixmap *pix, int index);
+        void addPixmapAt(std::shared_ptr<QPixmap> pix, int index);
         void updatePage(int index);
         void addEmptyThumbPage();
-        void reloadThumbnails();
+        virtual void reloadThumbnails();
 
         void insertThumbPage(int index);
+        void insertExistingThumbPage(int index, std::shared_ptr<QPixmap> thumbnailPixmap);
 
     private:
         UBDocumentProxy* mCurrentDocument;
-        QList<const QPixmap*>  mDocumentThumbs;
+        QList<std::shared_ptr<QPixmap>>  mDocumentThumbs;
 
 
     protected:

src/document/UBDocumentController.cpp

@@ -1555,7 +1555,7 @@ void UBDocumentTreeView::dropEvent(QDropEvent *event)
 
                 Q_ASSERT(QFileInfo(thumbTmp).exists());
                 Q_ASSERT(QFileInfo(thumbTo).exists());
-                const QPixmap *pix = new QPixmap(thumbTmp);
+                auto pix = std::make_shared<QPixmap>(thumbTmp);
                 UBDocumentController *ctrl = UBApplication::documentController;
                 ctrl->addPixmapAt(pix, toIndex);
             }
@@ -2238,7 +2238,6 @@ void UBDocumentController::sortDocuments(int kind, int order)
     }
 }
 
-
 void UBDocumentController::onSortOrderChanged(bool order)
 {
     int kindIndex = mDocumentUI->sortKind->currentIndex();
@@ -2297,9 +2296,6 @@ void UBDocumentController::show()
 {
     selectDocument(mBoardController->selectedDocument());
 
-    //to be sure thumbnails will be up-to-date
-    reloadThumbnails();
-
     updateActions();
 
     if(!mToolsPalette)
@@ -3061,6 +3057,11 @@ void UBDocumentController::moveSceneToIndex(UBDocumentProxy* proxy, int source,
     }
 }
 
+void UBDocumentController::updateThumbnailPixmap(int index, const QPixmap& newThumbnail)
+{
+    mDocumentUI->thumbnailWidget->updateThumbnailPixmap(index, newThumbnail);
+}
+
 
 void UBDocumentController::thumbnailViewResized()
 {
@@ -3182,7 +3183,7 @@ void UBDocumentController::addToDocument()
         UBMetadataDcSubsetAdaptor::persist(mBoardController->selectedDocument());
         mBoardController->reloadThumbnails();
 
-        emit UBApplication::boardController->documentThumbnailsUpdated(this);
+        emit mBoardController->documentThumbnailsUpdated(this);
         UBApplication::applicationController->showBoard();
 
         mBoardController->setActiveDocumentScene(newActiveSceneIndex);
@@ -3583,7 +3584,7 @@ void UBDocumentController::deletePages(QList<QGraphicsItem *> itemsToDelete)
             }
         }
         UBDocumentContainer::deletePages(sceneIndexes);
-        emit UBApplication::boardController->documentThumbnailsUpdated(this);
+        emit mBoardController->documentThumbnailsUpdated(this);
 
         proxy->setMetaData(UBSettings::documentUpdatedAt, UBStringUtils::toUtcIsoDateTime(QDateTime::currentDateTime()));
         UBMetadataDcSubsetAdaptor::persist(proxy);
@@ -3724,7 +3725,7 @@ bool UBDocumentController::firstAndOnlySceneSelected() const
     return false;
 }
 
-void UBDocumentController:: refreshDocumentThumbnailsView(UBDocumentContainer*)
+void UBDocumentController:: refreshDocumentThumbnailsView(UBDocumentContainer* source)
 {
     UBDocumentTreeModel *docModel = UBPersistenceManager::persistenceManager()->mDocumentTreeStructureModel;
     UBDocumentProxy *currentDocumentProxy = selectedDocument();
@@ -3740,11 +3741,9 @@ void UBDocumentController:: refreshDocumentThumbnailsView(UBDocumentContainer*)
         return;
     }
 
-    QList<const QPixmap*> thumbs;
-
     if (currentDocumentProxy)
     {
-        UBThumbnailAdaptor::load(currentDocumentProxy, thumbs);
+        UBThumbnailAdaptor::load(currentDocumentProxy, documentThumbs());
     }
 
     QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
@@ -3760,7 +3759,9 @@ void UBDocumentController:: refreshDocumentThumbnailsView(UBDocumentContainer*)
     {
         for (int i = 0; i < currentDocumentProxy->pageCount(); i++)
         {
-            const QPixmap* pix = thumbs.at(i);
+            UBApplication::showMessage(tr("Refreshing Document Thumbnails View (%1/%2)").arg(i+1).arg(source->selectedDocument()->pageCount()));
+
+            auto pix = documentThumbs().at(i);
             QGraphicsPixmapItem *pixmapItem = new UBSceneThumbnailPixmap(*pix, currentDocumentProxy, i); // deleted by the tree widget
 
             if (currentDocumentProxy == mBoardController->selectedDocument() && mBoardController->activeSceneIndex() == i)
@@ -3792,9 +3793,9 @@ void UBDocumentController:: refreshDocumentThumbnailsView(UBDocumentContainer*)
     if (selection)
     {
         disconnect(mDocumentUI->thumbnailWidget->scene(), SIGNAL(selectionChanged()), this, SLOT(pageSelectionChanged()));
-        UBSceneThumbnailPixmap *currentScene = dynamic_cast<UBSceneThumbnailPixmap*>(selection);
+        UBSceneThumbnailPixmap *currentSceneThumbnailPixmap = dynamic_cast<UBSceneThumbnailPixmap*>(selection);
-        if (currentScene)
+        if (currentSceneThumbnailPixmap)
-            mDocumentUI->thumbnailWidget->hightlightItem(currentScene->sceneIndex());
+            mDocumentUI->thumbnailWidget->hightlightItem(currentSceneThumbnailPixmap->sceneIndex());
         connect(mDocumentUI->thumbnailWidget->scene(), SIGNAL(selectionChanged()), this, SLOT(pageSelectionChanged()));
     }
 

src/document/UBDocumentController.h

@@ -501,6 +501,8 @@ class UBDocumentController : public UBDocumentContainer
         void collapseAll();
         void expandAll();
 
+        void updateThumbnailPixmap(int index, const QPixmap& newThumbnail);
+
 protected:
         virtual void setupViews();
         virtual void setupToolbar();

src/gui/UBDocumentNavigator.cpp

@@ -132,13 +132,32 @@ void UBDocumentNavigator::generateThumbnails(UBDocumentContainer* source)
     }
 
     for(int i = 0; i < source->selectedDocument()->pageCount(); i++)
+    {
+        UBApplication::showMessage(tr("generating thumbnails for board (%1/%2)").arg(i+1).arg(source->selectedDocument()->pageCount()));
+
+        bool found = false;
+        if (UBApplication::documentController)
+        {
+            if (UBApplication::documentController->selectedDocument() == source->selectedDocument())
+            {
+                if (UBApplication::documentController->pageAt(i))
+                {
+                    found = true;
+                    //thumbnail has already been loaded on the documentController so we don't need to do it again
+                    source->insertExistingThumbPage(i, UBApplication::documentController->pageAt(i));
+                }
+            }
+        }
+
+        if (!found)
         {
             //claudio This is a very bad hack and shows a architectural problem
             // source->selectedDocument()->pageCount()  !=   source->pageCount()
             if(i>=source->pageCount() || !source->pageAt(i))
                 source->insertThumbPage(i);
+        }
 
-        const QPixmap* pix = source->pageAt(i);
+        auto pix = source->pageAt(i);
         Q_ASSERT(!pix->isNull());
         int pageIndex = UBDocumentContainer::pageFromSceneIndex(i);
 
@@ -193,12 +212,12 @@ void UBDocumentNavigator::onScrollToSelectedPage(int index)
  */
 void UBDocumentNavigator::updateSpecificThumbnail(int iPage)
 {
-    const QPixmap* pix = UBApplication::boardController->pageAt(iPage);
+    auto pix = UBApplication::boardController->pageAt(iPage);
     UBSceneThumbnailNavigPixmap* newItem = new UBSceneThumbnailNavigPixmap(*pix, UBApplication::boardController->selectedDocument(), iPage);
 
     // Get the old thumbnail
     UBSceneThumbnailNavigPixmap* oldItem = mThumbsWithLabels.at(iPage).getThumbnail();
-    if(NULL != oldItem)
+    if(oldItem)
     {
         mScene->removeItem(oldItem);
         mScene->addItem(newItem);
@@ -209,6 +228,18 @@ void UBDocumentNavigator::updateSpecificThumbnail(int iPage)
         oldItem = NULL;
     }
 
+    ensureVisible(0, 0, 10, 10);
+
+    refreshScene();
+
+    if (UBApplication::documentController)
+    {
+        if (UBApplication::documentController->selectedDocument() == UBApplication::boardController->selectedDocument())
+        {
+            //update the pixmap in document mode
+            UBApplication::documentController->updateThumbnailPixmap(iPage, *pix);
+        }
+    }
 }
 
 /**

src/gui/UBDocumentThumbnailWidget.cpp

@@ -297,6 +297,18 @@ bool UBDocumentThumbnailWidget::dragEnabled() const
     return mDragEnabled;
 }
 
+void UBDocumentThumbnailWidget::updateThumbnailPixmap(int index, const QPixmap& newThumbnail)
+{
+    if (index >= 0 && index < mGraphicItems.length())
+    {
+        UBSceneThumbnailPixmap *thumbnail = dynamic_cast<UBSceneThumbnailPixmap*>(mGraphicItems.at(index));
+        if (thumbnail)
+        {
+            thumbnail->setPixmap(newThumbnail);
+        }
+    }
+}
+
 void UBDocumentThumbnailWidget::hightlightItem(int index)
 {
     if (0 <= index && index < mLabelsItems.length())

src/gui/UBDocumentThumbnailWidget.h

@@ -48,9 +48,8 @@ class UBDocumentThumbnailWidget: public UBThumbnailWidget
         void hightlightItem(int index);
 
     public slots:
-        virtual void setGraphicsItems(const QList<QGraphicsItem*>& pGraphicsItems,
+            void updateThumbnailPixmap(int index, const QPixmap& newThumbnail);
-            const QList<QUrl>& pItemPaths, const QStringList pLabels = QStringList(),
+            virtual void setGraphicsItems(const QList<QGraphicsItem*>& pGraphicsItems, const QList<QUrl>& pItemPaths, const QStringList pLabels = QStringList(), const QString& pMimeType = QString(""));
-            const QString& pMimeType = QString(""));
 
     signals:
         void sceneDropped(UBDocumentProxy* proxy, int source, int target);