sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7220 from elpaso/bugfix-19096-DD-symbol-preview

Browse Source 
[bugfix] Clear all DD props before creating symbol preview
This commit is contained in:
Alessandro Pasotti 2018-06-12 11:51:06 +02:00 committed by GitHub
commit dc651b6314
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/core/symbology/qgssymbollayerutils.cpp
View File

@ -653,7 +653,6 @@ QIcon QgsSymbolLayerUtils::symbolPreviewIcon( QgsSymbol *symbol, QSize size, int
QPixmap QgsSymbolLayerUtils::symbolPreviewPixmap( QgsSymbol *symbol, QSize size, int padding, QgsRenderContext *customContext )
{
Q_ASSERT( symbol );
QPixmap pixmap( size );
pixmap.fill( Qt::transparent );
QPainter painter;
@ -672,7 +671,25 @@ QPixmap QgsSymbolLayerUtils::symbolPreviewPixmap( QgsSymbol *symbol, QSize size,
painter.translate( padding, padding );
}
symbol->drawPreviewIcon( &painter, size, customContext );
// If the context has no feature and there are DD properties,
// use a clone and clear all DDs: see issue #19096
// Applying a data defined size to a categorized layer hides its category symbol in the layers panel and legend
if ( symbol->hasDataDefinedProperties() &&
!( customContext
&& customContext->expressionContext().hasFeature( ) ) )
{
std::unique_ptr<QgsSymbol> symbol_noDD( symbol->clone( ) );
const QgsSymbolLayerList layers( symbol_noDD->symbolLayers() );
for ( const auto &layer : layers )
{
layer->dataDefinedProperties().clear();
}
symbol_noDD->drawPreviewIcon( &painter, size, customContext );
}
else
{
symbol->drawPreviewIcon( &painter, size, customContext );
}
painter.end();
return pixmap;