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

nyalldawson · nyalldawson · commit 65a379be9b08 · 2016-10-28T07:58:58.000+10:00
Cuts render time by ~60%. Fix #15752. (cherry-picked from 5798a82)
diff --git a/src/core/qgsvectorlayerrenderer.cpp b/src/core/qgsvectorlayerrenderer.cpp
@@ -324,7 +324,7 @@ void QgsVectorLayerRenderer::drawRendererV2( QgsFeatureIterator& fit )
           }
         }
         // new labeling engine
-        if ( mContext.labelingEngineV2() )
+        if ( mContext.labelingEngineV2() && ( mLabelProvider || mDiagramProvider ) )
         {
           QScopedPointer<QgsGeometry> obstacleGeometry;
           QgsSymbolV2List symbols = mRendererV2->originalSymbolsForFeature( fet, mContext );

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