Fix legend display of scaled sizes for QgsSingleSymbolRenderer

nyalldawson · nyalldawson · commit 90dd988d9d84 · 2017-02-14T13:48:11.000+10:00
diff --git a/src/core/symbology-ng/qgssinglesymbolrenderer.cpp b/src/core/symbology-ng/qgssinglesymbolrenderer.cpp
@@ -306,7 +306,7 @@ QgsLegendSymbolListV2 QgsSingleSymbolRenderer::legendSymbolItemsV2() const
   {
     const QgsMarkerSymbol * symbol = static_cast<const QgsMarkerSymbol *>( mSymbol.get() );
     QgsProperty sizeDD( symbol->dataDefinedSize() );
-    if ( sizeDD && sizeDD.isActive() && sizeDD.propertyType() == QgsProperty::ExpressionBasedProperty )
+    if ( sizeDD && sizeDD.isActive() )
     {
       if ( const QgsSizeScaleTransformer* sizeTransformer = dynamic_cast< const QgsSizeScaleTransformer* >( sizeDD.transformer() ) )
       {

Original file line number	Diff line number	Diff line change
`@@ -306,7 +306,7 @@ QgsLegendSymbolListV2 QgsSingleSymbolRenderer::legendSymbolItemsV2() const`
`306`	`306`	`{`
`307`	`307`	`const QgsMarkerSymbol * symbol = static_cast<const QgsMarkerSymbol *>( mSymbol.get() );`
`308`	`308`	`QgsProperty sizeDD( symbol->dataDefinedSize() );`
`309`		`- if ( sizeDD && sizeDD.isActive() && sizeDD.propertyType() == QgsProperty::ExpressionBasedProperty )`
	`309`	`+ if ( sizeDD && sizeDD.isActive() )`
`310`	`310`	`{`
`311`	`311`	`if ( const QgsSizeScaleTransformer* sizeTransformer = dynamic_cast< const QgsSizeScaleTransformer* >( sizeDD.transformer() ) )`
`312`	`312`	`{`