Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix data defined legend size when using seperated symbols #31032

Merged
merged 1 commit into from
Aug 2, 2019
Merged

Fix data defined legend size when using seperated symbols #31032

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 25 additions & 14 deletions src/core/qgsdatadefinedsizelegend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down