Speed up point layer rendering - don't calculate unused label obstacles

nyalldawson · nyalldawson · commit 5798a82c8011 · 2016-10-26T17:20:57.000+10:00
Cuts render time by ~60%. Fix #15752.
diff --git a/src/core/qgsvectorlayerrenderer.cpp b/src/core/qgsvectorlayerrenderer.cpp
@@ -326,7 +326,7 @@ void QgsVectorLayerRenderer::drawRenderer( QgsFeatureIterator& fit )
           }
         }
         // new labeling engine
-        if ( mContext.labelingEngineV2() )
+        if ( mContext.labelingEngineV2() && ( mLabelProvider || mDiagramProvider ) )
         {
           QScopedPointer<QgsGeometry> obstacleGeometry;
           QgsSymbolList symbols = mRenderer->originalSymbolsForFeature( fet, mContext );

Original file line number	Diff line number	Diff line change
`@@ -326,7 +326,7 @@ void QgsVectorLayerRenderer::drawRenderer( QgsFeatureIterator& fit )`
`326`	`326`	`}`
`327`	`327`	`}`
`328`	`328`	`// new labeling engine`
`329`		`- if ( mContext.labelingEngineV2() )`
	`329`	`+ if ( mContext.labelingEngineV2() && ( mLabelProvider \|\| mDiagramProvider ) )`
`330`	`330`	`{`
`331`	`331`	`QScopedPointer<QgsGeometry> obstacleGeometry;`
`332`	`332`	`QgsSymbolList symbols = mRenderer->originalSymbolsForFeature( fet, mContext );`