@@ -295,12 +295,12 @@ void QgsMapRendererCustomPainterJob::doRender()
295
295
mLabelJob .img ->fill ( 0 );
296
296
painter.begin ( mLabelJob .img );
297
297
mLabelJob .context .setPainter ( &painter );
298
- drawLabeling ( mSettings , mLabelJob .context , mLabelingEngineV2 .get (), &painter );
298
+ drawLabeling ( mLabelJob .context , mLabelingEngineV2 .get (), &painter );
299
299
painter.end ();
300
300
}
301
301
else
302
302
{
303
- drawLabeling ( mSettings , mLabelJob .context , mLabelingEngineV2 .get (), mPainter );
303
+ drawLabeling ( mLabelJob .context , mLabelingEngineV2 .get (), mPainter );
304
304
}
305
305
306
306
mLabelJob .complete = true ;
@@ -318,8 +318,7 @@ void QgsMapRendererCustomPainterJob::doRender()
318
318
QgsDebugMsgLevel ( " Rendering completed in (seconds): " + QString ( " %1" ).arg ( renderTime.elapsed () / 1000.0 ), 2 );
319
319
}
320
320
321
-
322
- void QgsMapRendererJob::drawLabeling ( const QgsMapSettings &settings, QgsRenderContext &renderContext, QgsLabelingEngine *labelingEngine2, QPainter *painter )
321
+ void QgsMapRendererJob::drawLabeling ( QgsRenderContext &renderContext, QgsLabelingEngine *labelingEngine2, QPainter *painter )
323
322
{
324
323
QgsDebugMsgLevel ( QStringLiteral ( " Draw labeling start" ), 5 );
325
324
@@ -329,22 +328,22 @@ void QgsMapRendererJob::drawLabeling( const QgsMapSettings &settings, QgsRenderC
329
328
// Reset the composition mode before rendering the labels
330
329
painter->setCompositionMode ( QPainter::CompositionMode_SourceOver );
331
330
332
- // TODO: this is not ideal - we could override rendering stopped flag that has been set in meanwhile
333
- renderContext = QgsRenderContext::fromMapSettings ( settings );
334
331
renderContext.setPainter ( painter );
335
332
336
333
if ( labelingEngine2 )
337
334
{
338
- // set correct extent
339
- renderContext.setExtent ( settings.visibleExtent () );
340
- renderContext.setCoordinateTransform ( QgsCoordinateTransform () );
341
-
342
335
labelingEngine2->run ( renderContext );
343
336
}
344
337
345
338
QgsDebugMsg ( QStringLiteral ( " Draw labeling took (seconds): %1" ).arg ( t.elapsed () / 1000 . ) );
346
339
}
347
340
341
+ void QgsMapRendererJob::drawLabeling ( const QgsMapSettings &settings, QgsRenderContext &renderContext, QgsLabelingEngine *labelingEngine2, QPainter *painter )
342
+ {
343
+ Q_UNUSED ( settings );
344
+
345
+ drawLabeling ( renderContext, labelingEngine2, painter );
346
+ }
348
347
349
348
bool QgsMapRendererJob::needTemporaryImage ( QgsMapLayer *ml )
350
349
{
0 commit comments