Merge branch 'master' of github.com:Sankore/Sankore-3.1

src/board/UBLibraryController.cpp

@@ -724,7 +724,7 @@ UBLibElement* UBLibElement::trashElement()
     if (trashElement)
         return trashElement;
 
-    trashElement = new UBLibElement(eUBLibElementType_Folder, UBSettings::trashLibraryPaletteDirPath(), QObject::tr("Trash", "Pictures category element"));
+	trashElement = new UBLibElement(eUBLibElementType_Folder, QUrl::fromLocalFile(UBSettings::trashLibraryPaletteDirPath()), QObject::tr("Trash", "Pictures category element"));
     QImage *categoryImage = new QImage(":images/libpalette/TrashCategory.svg");
     trashElement->setThumbnail(categoryImage);
     trashElement->setMoveable(false);

src/domain/UBGraphicsScene.cpp

@@ -10,6 +10,7 @@
 #include <QtGui>
 #include <QtWebKit>
 #include <QtSvg>
+#include <QGraphicsView>
 
 #include "frameworks/UBGeometryUtils.h"
 #include "frameworks/UBPlatformUtils.h"

src/pdf/XPDFRenderer.cpp

@@ -5,13 +5,6 @@
 
 #include <frameworks/UBPlatformUtils.h>
 
-#include <splash/SplashBitmap.h>
-#include <xpdf/Object.h>
-#include <xpdf/GlobalParams.h>
-#include <xpdf/SplashOutputDev.h>
-#include <xpdf/PDFDoc.h>
-
-
 #include "core/memcheck.h"
 
 QAtomicInt XPDFRenderer::sInstancesCount = 0;
@@ -30,7 +23,13 @@ XPDFRenderer::XPDFRenderer(const QString &filename)
 
     mDocument = new PDFDoc(new GString(filename.toUtf8().data()), 0, 0, 0); // the filename GString is deleted on PDFDoc desctruction
     sInstancesCount.ref();
-
+    bThumbGenerated = false;
+    bPagesGenerated = false;
+    mPagesMap.clear();
+    mThumbs.clear();
+    mThumbMap.clear();
+    mScaleX = 0.0;
+    mScaleY = 0.0;
 }
 
 XPDFRenderer::~XPDFRenderer()
@@ -121,47 +120,108 @@ int XPDFRenderer::pageRotation(int pageNumber) const
         return 0;
 }
 
-
 void XPDFRenderer::render(QPainter *p, int pageNumber, const QRectF &bounds)
 {
+    if (isValid())
+    {
+        qreal xscale = p->worldTransform().m11();
+        qreal yscale = p->worldTransform().m22();
+        bool bZoomChanged = false;
+
+        if(mScaleX != xscale || mScaleY != yscale)
+        {
+            mScaleX = xscale;
+            mScaleY = yscale;
+            bZoomChanged = true;
+        }
+
+        // First verify if the thumbnails and the pages are generated
+        if(!bThumbGenerated)
+        {
+
+            if(!mThumbMap[pageNumber - 1])
+            {
+                // Generate the thumbnail
+                mThumbs << *createPDFImage(pageNumber, xscale, yscale, bounds);
+                mThumbMap[pageNumber - 1] = true;
+                if(pageNumber == mDocument->getNumPages())
+                {
+                    bThumbGenerated = true;
+                }
+            }
+        }
+        else if(!bPagesGenerated || bZoomChanged)
+        {
+            if(!mPagesMap[pageNumber - 1] || bZoomChanged)
+            {
+                // Generate the page
+                mNumPageToPageMap[pageNumber] = *createPDFImage(pageNumber, xscale, yscale, bounds);
+                mPagesMap[pageNumber - 1] = true;
+                if(mPagesMap.size() == mDocument->getNumPages())
+                {
+                    bPagesGenerated = true;
+                }
+            }
+        }
+
+        // Warning: verify pagenumber
+        QImage pdfImage;
+
+        if(!bThumbGenerated)
+        {
+            pdfImage = mThumbs.at(pageNumber - 1);
+        }
+        else
+        {
+            pdfImage = mNumPageToPageMap[pageNumber];
+        }
+
+        pdfImage.rect();
+
+        QTransform savedTransform = p->worldTransform();
+        p->resetTransform();
+        p->drawImage(QPointF(savedTransform.dx() + mSliceX, savedTransform.dy() + mSliceY), pdfImage);
+        p->setWorldTransform(savedTransform);
+    }
+}
+
+QImage* XPDFRenderer::createPDFImage(int pageNumber, const qreal xscale, const qreal yscale, const QRectF &bounds)
+{
+    QImage* img = new QImage();
     if (isValid())
     {
         SplashColor paperColor = {0xFF, 0xFF, 0xFF}; // white
-        SplashOutputDev splash(splashModeRGB8, 1, gFalse, paperColor);
-        splash.startDoc(mDocument->getXRef());
+        mSplash = new SplashOutputDev(splashModeRGB8, 1, gFalse, paperColor);
+        mSplash->startDoc(mDocument->getXRef());
         int hResolution = 72;
         int vResolution = 72;
         int rotation = 0; // in degrees (get it from the worldTransform if we want to support rotation)
         GBool useMediaBox = gFalse;
         GBool crop = gTrue;
         GBool printing = gFalse;
-        const qreal xScale = p->worldTransform().m11();
-        const qreal yScale = p->worldTransform().m22();
-        qreal sliceX = 0.;
-        qreal sliceY = 0.;
+        const qreal xScale = xscale;
+        const qreal yScale = yscale;
+        mSliceX = 0.;
+        mSliceY = 0.;
 
         if (bounds.isNull())
         {
-            mDocument->displayPage(&splash, pageNumber, hResolution * xScale, vResolution * yScale,
+            mDocument->displayPage(mSplash, pageNumber, hResolution * xScale, vResolution * yScale,
                                    rotation, useMediaBox, crop, printing);
         }
         else
         {
-            sliceX = bounds.x() * xScale;
-            sliceY = bounds.y() * yScale;
+            mSliceX = bounds.x() * xScale;
+            mSliceY = bounds.y() * yScale;
             qreal sliceW = bounds.width() * xScale;
             qreal sliceH = bounds.height() * yScale;
 
-            mDocument->displayPageSlice(&splash, pageNumber, hResolution * xScale, vResolution * yScale,
-                                        rotation, useMediaBox, crop, printing, sliceX, sliceY, sliceW, sliceH);
+            mDocument->displayPageSlice(mSplash, pageNumber, hResolution * xScale, vResolution * yScale,
+                                        rotation, useMediaBox, crop, printing, mSliceX, mSliceY, sliceW, sliceH);
         }
 
-        SplashBitmap *bitmap = splash.getBitmap();
-        QImage pdfImage(bitmap->getDataPtr(), bitmap->getWidth(), bitmap->getHeight(), bitmap->getWidth() * 3, QImage::Format_RGB888);
-
-        QTransform savedTransform = p->worldTransform();
-        p->resetTransform();
-        p->drawImage(QPointF(savedTransform.dx() + sliceX, savedTransform.dy() + sliceY), pdfImage);
-        p->setWorldTransform(savedTransform);
+        mpSplashBitmap = mSplash->getBitmap();
+        img = new QImage(mpSplashBitmap->getDataPtr(), mpSplashBitmap->getWidth(), mpSplashBitmap->getHeight(), mpSplashBitmap->getWidth() * 3, QImage::Format_RGB888);
     }
+    return img;
 }

src/pdf/XPDFRenderer.h

@@ -1,8 +1,13 @@
 
 #ifndef XPDFRENDERER_H
 #define XPDFRENDERER_H
-
+#include <QImage>
 #include "PDFRenderer.h"
+#include <splash/SplashBitmap.h>
+#include <xpdf/Object.h>
+#include <xpdf/GlobalParams.h>
+#include <xpdf/SplashOutputDev.h>
+#include <xpdf/PDFDoc.h>
 
 class PDFDoc;
 
@@ -29,10 +34,23 @@ class XPDFRenderer : public PDFRenderer
 
     private:
         void init();
+        QImage* createPDFImage(int pageNumber, const qreal xscale = 0.5, const qreal yscale = 0.5, const QRectF &bounds = QRectF());
 
         PDFDoc *mDocument;
-
+        QList<QImage> mThumbs;
+        QMap<int, bool> mPagesMap;
+        QMap<int, bool> mThumbMap;
+        QMap<int, QImage> mNumPageToPageMap;
         static QAtomicInt sInstancesCount;
+        qreal mSliceX;
+        qreal mSliceY;
+        int bPD;
+        bool bThumbGenerated;
+        bool bPagesGenerated;
+        SplashBitmap* mpSplashBitmap;
+        SplashOutputDev* mSplash;
+        qreal mScaleX;
+        qreal mScaleY;
 };
 
 #endif // XPDFRENDERER_H