Fix data defined legend size when using seperated symbols

Fixes #26929
qgis · Aug 3, 2019 · 1893cd6 · 1893cd6
1 parent e8b6323
commit 1893cd6
Showing 1 changed file with 25 additions and 14 deletions.
diff --git a/src/core/qgsdatadefinedsizelegend.cpp b/src/core/qgsdatadefinedsizelegend.cpp
@@ -104,22 +104,33 @@ QgsLegendSymbolList QgsDataDefinedSizeLegend::legendSymbolList() const
     lst << title;
   }
 
-  if ( mType == LegendCollapsed )
+  switch ( mType )
   {
-    QgsLegendSymbolItem i;
-    i.setDataDefinedSizeLegendSettings( new QgsDataDefinedSizeLegend( *this ) );
-    lst << i;
-    return lst;
-  }
-  else if ( mType == LegendSeparated )
-  {
-    const auto constMSizeClasses = mSizeClasses;
-    for ( const SizeClass &cl : constMSizeClasses )
+    case LegendCollapsed:
+    {
+      QgsLegendSymbolItem i;
+      i.setDataDefinedSizeLegendSettings( new QgsDataDefinedSizeLegend( *this ) );
+      lst << i;
+      break;
+    }
+
+    case LegendSeparated:
     {
-      QgsLegendSymbolItem si( mSymbol.get(), cl.label, QString() );
-      QgsMarkerSymbol *s = static_cast<QgsMarkerSymbol *>( si.symbol() );
-      s->setSize( cl.size );
-      lst << si;
+      lst.reserve( mSizeClasses.size() );
+      for ( const SizeClass &cl : mSizeClasses )
+      {
+        QgsLegendSymbolItem si( mSymbol.get(), cl.label, QString() );
+        QgsMarkerSymbol *s = static_cast<QgsMarkerSymbol *>( si.symbol() );
+        double size = cl.size;
+        if ( mSizeScaleTransformer )
+        {
+          size = mSizeScaleTransformer->size( size );
+        }
+
+        s->setSize( size );
+        lst << si;
+      }
+      break;
     }
   }
   return lst;