sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-02 00:04:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #13999: feature count on rule based renderer is valid for ELSE statement

Browse Source
This commit is contained in:
Blottiere Paul 2018-03-27 14:09:20 +01:00
parent 0b5c2aeecc
commit 58b3e20054
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/core/symbology/qgsrulebasedrenderer.cpp
View File

@ -553,7 +553,9 @@ bool QgsRuleBasedRenderer::Rule::willRenderFeature( QgsFeature &feat, QgsRenderC
lst.removeOne( rule ); lst.removeOne( rule );
if ( lst.empty() ) if ( lst.empty() )
{
return true; return true;
}
} }
else if ( !rule->isElse( ) && rule->willRenderFeature( feat, context ) ) else if ( !rule->isElse( ) && rule->willRenderFeature( feat, context ) )
{ {
@ -587,7 +589,26 @@ QSet<QString> QgsRuleBasedRenderer::Rule::legendKeysForFeature( QgsFeature &feat
Q_FOREACH ( Rule *rule, mActiveChildren ) Q_FOREACH ( Rule *rule, mActiveChildren )
{ {
lst.unite( rule->legendKeysForFeature( feat, context ) ); bool validKey = false;
if ( rule->isElse() )
{
RuleList lst = rulesForFeature( feat, context, false );
lst.removeOne( rule );
if ( lst.empty() )
{
validKey = true;
}
}
else if ( !rule->isElse( ) && rule->willRenderFeature( feat, context ) )
{
validKey = true;
}
if ( validKey )
{
lst.unite( rule->legendKeysForFeature( feat, context ) );
}
} }
return lst; return lst;
} }