Reuse existing labeling results if cached labels were redrawn

qgis · Feb 7, 2017 · 2b3805e · 2b3805e
1 parent 33eb4bc
commit 2b3805e
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 3 deletions.
diff --git a/python/core/qgsmaprendererjob.sip b/python/core/qgsmaprendererjob.sip
@@ -24,6 +24,8 @@ class QgsMapRendererJob : QObject
     //! Tell whether the rendering job is currently running in background.
     virtual bool isActive() const = 0;
 
+    virtual bool usedCachedLabels() const = 0;
+
     //! Get pointer to internal labeling engine (in order to get access to the results)
     virtual QgsLabelingResults* takeLabelingResults() = 0 /Transfer/;
 

diff --git a/python/core/qgsmaprendererparalleljob.sip b/python/core/qgsmaprendererparalleljob.sip
@@ -20,6 +20,7 @@ class QgsMapRendererParallelJob : QgsMapRendererQImageJob
     virtual void cancel();
     virtual void waitForFinished();
     virtual bool isActive() const;
+    virtual bool usedCachedLabels() const;
 
     virtual QgsLabelingResults* takeLabelingResults() /Transfer/;
 

diff --git a/python/core/qgsmaprenderersequentialjob.sip b/python/core/qgsmaprenderersequentialjob.sip
@@ -21,6 +21,7 @@ class QgsMapRendererSequentialJob : QgsMapRendererQImageJob
     virtual void cancel();
     virtual void waitForFinished();
     virtual bool isActive() const;
+    virtual bool usedCachedLabels() const;
 
     virtual QgsLabelingResults* takeLabelingResults() /Transfer/;
 

diff --git a/src/core/qgsmaprenderercustompainterjob.cpp b/src/core/qgsmaprenderercustompainterjob.cpp
@@ -156,6 +156,10 @@ bool QgsMapRendererCustomPainterJob::isActive() const
   return mActive;
 }
 
+bool QgsMapRendererCustomPainterJob::usedCachedLabels() const
+{
+  return mLabelJob.cached;
+}
 
 QgsLabelingResults* QgsMapRendererCustomPainterJob::takeLabelingResults()
 {

diff --git a/src/core/qgsmaprenderercustompainterjob.h b/src/core/qgsmaprenderercustompainterjob.h
@@ -41,6 +41,7 @@ class CORE_EXPORT QgsMapRendererCustomPainterJob : public QgsMapRendererJob
     virtual void cancel() override;
     virtual void waitForFinished() override;
     virtual bool isActive() const override;
+    virtual bool usedCachedLabels() const override;
     virtual QgsLabelingResults* takeLabelingResults() override;
 
     //! @note not available in python bindings

diff --git a/src/core/qgsmaprendererjob.h b/src/core/qgsmaprendererjob.h
@@ -125,7 +125,20 @@ class CORE_EXPORT QgsMapRendererJob : public QObject
     //! Tell whether the rendering job is currently running in background.
     virtual bool isActive() const = 0;
 
-    //! Get pointer to internal labeling engine (in order to get access to the results)
+    /**
+     * Returns true if the render job was able to use a cached labeling solution.
+     * If so, any previously stored labeling results (see takeLabelingResults())
+     * should be retained.
+     * @see takeLabelingResults()
+     * @note added in QGIS 3.0
+     */
+    virtual bool usedCachedLabels() const = 0;
+
+    /**
+     * Get pointer to internal labeling engine (in order to get access to the results).
+     * This should not be used if cached labeling was redrawn - see usedCachedLabels().
+     * @see usedCachedLabels()
+     */
     virtual QgsLabelingResults* takeLabelingResults() = 0;
 
     //! @note Added in QGIS 3.0

diff --git a/src/core/qgsmaprendererparalleljob.cpp b/src/core/qgsmaprendererparalleljob.cpp
@@ -153,6 +153,11 @@ bool QgsMapRendererParallelJob::isActive() const
   return mStatus != Idle;
 }
 
+bool QgsMapRendererParallelJob::usedCachedLabels() const
+{
+  return mLabelJob.cached;
+}
+
 QgsLabelingResults* QgsMapRendererParallelJob::takeLabelingResults()
 {
   if ( mLabelingEngineV2 )

diff --git a/src/core/qgsmaprendererparalleljob.h b/src/core/qgsmaprendererparalleljob.h
@@ -39,6 +39,7 @@ class CORE_EXPORT QgsMapRendererParallelJob : public QgsMapRendererQImageJob
     virtual void waitForFinished() override;
     virtual bool isActive() const override;
 
+    virtual bool usedCachedLabels() const override;
     virtual QgsLabelingResults* takeLabelingResults() override;
 
     // from QgsMapRendererJobWithPreview

diff --git a/src/core/qgsmaprenderersequentialjob.cpp b/src/core/qgsmaprenderersequentialjob.cpp
@@ -98,6 +98,11 @@ bool QgsMapRendererSequentialJob::isActive() const
   return nullptr != mInternalJob;
 }
 
+bool QgsMapRendererSequentialJob::usedCachedLabels() const
+{
+  return mUsedCachedLabels;
+}
+
 QgsLabelingResults* QgsMapRendererSequentialJob::takeLabelingResults()
 {
   QgsLabelingResults* tmp = mLabelingResults;
@@ -125,6 +130,7 @@ void QgsMapRendererSequentialJob::internalFinished()
   mPainter = nullptr;
 
   mLabelingResults = mInternalJob->takeLabelingResults();
+  mUsedCachedLabels = mInternalJob->usedCachedLabels();
 
   mErrors = mInternalJob->errors();
 

diff --git a/src/core/qgsmaprenderersequentialjob.h b/src/core/qgsmaprenderersequentialjob.h
@@ -41,6 +41,7 @@ class CORE_EXPORT QgsMapRendererSequentialJob : public QgsMapRendererQImageJob
     virtual void waitForFinished() override;
     virtual bool isActive() const override;
 
+    virtual bool usedCachedLabels() const override;
     virtual QgsLabelingResults* takeLabelingResults() override;
 
     // from QgsMapRendererJobWithPreview
@@ -56,6 +57,7 @@ class CORE_EXPORT QgsMapRendererSequentialJob : public QgsMapRendererQImageJob
     QImage mImage;
     QPainter* mPainter;
     QgsLabelingResults* mLabelingResults;
+    bool mUsedCachedLabels = false;
 
 };
 

diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
@@ -546,8 +546,11 @@ void QgsMapCanvas::rendererJobFinished()
   {
     // take labeling results before emitting renderComplete, so labeling map tools
     // connected to signal work with correct results
-    delete mLabelingResults;
-    mLabelingResults = mJob->takeLabelingResults();
+    if ( !mJob->usedCachedLabels() )
+    {
+      delete mLabelingResults;
+      mLabelingResults = mJob->takeLabelingResults();
+    }
 
     QImage img = mJob->renderedImage();