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

Rule based renderer: empty rule matches all

Browse Source 
Fix #13218
This commit is contained in:
Matthias Kuhn 2015-08-15 09:26:50 +02:00
parent 67a7d1397f
commit abf2398880
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/qgsvectorlayerrenderer.cpp
View File

@ -145,7 +145,7 @@ bool QgsVectorLayerRenderer::render()
.setFilterRect( requestExtent )
.setSubsetOfAttributes( mAttrNames, mFields );
if ( !rendererFilter.isNull() )
if ( !rendererFilter.isEmpty() )
{
featureRequest.setFilterExpression( rendererFilter );
}

19
src/core/symbology-ng/qgsrulebasedrendererv2.cpp
View File

@ -427,24 +427,33 @@ bool QgsRuleBasedRendererV2::Rule::startRender( QgsRenderContext& context, const
}
}
// subfilters (on the same level) are joined with OR and finally joined with AND with their parent (this) filter
// subfilters (on the same level) are joined with OR
// Finally they are joined with their parent (this) with AND
QString sf;
if ( subfilters.length() )
// If there are subfilters present (and it's not a single empty one), group them and join them with OR
if ( subfilters.length() > 1 || subfilters.value( 0 ).trimmed().length() > 0 )
sf = subfilters.join( ") OR (" ).prepend( "(" ).append( ")" );
// Now join the subfilters with their parent (this) based on if
// * The parent is an else rule
// * The existence of parent filter and subfilters
if ( isElse() )
{
if ( !sf.length() )
if ( !sf.trimmed().length() )
filter = "TRUE";
else
filter = sf;
}
else if ( mFilterExp.length() && sf.length() )
else if ( mFilterExp.trimmed().length() && sf.trimmed().length() )
filter = QString( "(%1) AND (%2)" ).arg( mFilterExp ).arg( sf );
else if ( mFilterExp.length() )
else if ( mFilterExp.trimmed().length() )
filter = mFilterExp;
else
filter = sf;
filter = filter.trimmed();
return true;
}