Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Map renderer sends signal on layers finished but before labeling
  • Loading branch information
m-kuhn committed Sep 7, 2016
1 parent 45373d0 commit 02ae886
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 0 deletions.
8 changes: 8 additions & 0 deletions python/core/qgsmaprendererjob.sip
Expand Up @@ -98,6 +98,14 @@ class QgsMapRendererJob : QObject
const QgsMapSettings& mapSettings() const;

signals:
/**
* Emitted when the layers are rendered.
* Rendering labels is not yet done. If the fully rendered layer including labels is reuquired use

This comment has been minimized.

Copy link
@DelazJ

DelazJ Sep 7, 2016

Contributor

@m-kuhn typo on required

This comment has been minimized.

Copy link
@m-kuhn

m-kuhn Sep 7, 2016

Author Member

Thanks, fixed

* finished() instead.
*
* @note Added in QGIS 3.0
*/
void renderingLayersFinished();

//! emitted when asynchronous rendering is finished (or canceled).
void finished();
Expand Down
8 changes: 8 additions & 0 deletions src/core/qgsmaprendererjob.h
Expand Up @@ -140,6 +140,14 @@ class CORE_EXPORT QgsMapRendererJob : public QObject
const QgsMapSettings& mapSettings() const;

signals:
/**
* Emitted when the layers are rendered.
* Rendering labels is not yet done. If the fully rendered layer including labels is reuquired use
* finished() instead.
*
* @note Added in QGIS 3.0
*/
void renderingLayersFinished();

//! emitted when asynchronous rendering is finished (or canceled).
void finished();
Expand Down
1 change: 1 addition & 0 deletions src/core/qgsmaprendererparalleljob.cpp
Expand Up @@ -196,6 +196,7 @@ void QgsMapRendererParallelJob::renderLayersFinished()
// now start rendering of labeling!
mLabelingFuture = QtConcurrent::run( renderLabelsStatic, this );
mLabelingFutureWatcher.setFuture( mLabelingFuture );
emit renderingLayersFinished();
}
else
{
Expand Down

0 comments on commit 02ae886

Please sign in to comment.