rule based renderer: keep skip else rule if an inactive rule matches, but still return if the feature was actually rendered so that only rendered features are labeled (fixes #13631)

jef-n · jef-n · commit ea0ce4ec1ede · 2015-10-21T21:45:39.000+02:00
diff --git a/src/core/symbology-ng/qgsrulebasedrendererv2.cpp b/src/core/symbology-ng/qgsrulebasedrendererv2.cpp
@@ -536,7 +536,7 @@ QgsRuleBasedRendererV2::Rule::RenderResult QgsRuleBasedRendererV2::Rule::renderF
       RenderResult res = rule->renderFeature( featToRender, context, renderQueue );
       // consider inactive items as "rendered" so the else rule will ignore them
       willrendersomething |= ( res == Rendered || res == Inactive );
-      rendered |= willrendersomething;
+      rendered |= ( res == Rendered );
     }
   }
 
@@ -545,7 +545,7 @@ QgsRuleBasedRendererV2::Rule::RenderResult QgsRuleBasedRendererV2::Rule::renderF
   {
     Q_FOREACH ( Rule* rule, mElseRules )
     {
-      rendered |= rule->renderFeature( featToRender, context, renderQueue ) != Filtered;
+      rendered |= rule->renderFeature( featToRender, context, renderQueue ) == Rendered;
     }
   }
   if ( !mIsActive )
@@ -821,7 +821,7 @@ bool QgsRuleBasedRendererV2::renderFeature( QgsFeature& feature,
   mCurrentFeatures.append( FeatureToRender( feature, flags ) );
 
   // check each active rule
-  return mRootRule->renderFeature( mCurrentFeatures.last(), context, mRenderQueue );
+  return mRootRule->renderFeature( mCurrentFeatures.last(), context, mRenderQueue ) == Rule::Rendered;
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -536,7 +536,7 @@ QgsRuleBasedRendererV2::Rule::RenderResult QgsRuleBasedRendererV2::Rule::renderF`
`536`	`536`	`RenderResult res = rule->renderFeature( featToRender, context, renderQueue );`
`537`	`537`	`// consider inactive items as "rendered" so the else rule will ignore them`
`538`	`538`	`willrendersomething \|= ( res == Rendered \|\| res == Inactive );`
`539`		`- rendered \|= willrendersomething;`
	`539`	`+ rendered \|= ( res == Rendered );`
`540`	`540`	`}`
`541`	`541`	`}`
`542`	`542`
`@@ -545,7 +545,7 @@ QgsRuleBasedRendererV2::Rule::RenderResult QgsRuleBasedRendererV2::Rule::renderF`
`545`	`545`	`{`
`546`	`546`	`Q_FOREACH ( Rule* rule, mElseRules )`
`547`	`547`	`{`
`548`		`- rendered \|= rule->renderFeature( featToRender, context, renderQueue ) != Filtered;`
	`548`	`+ rendered \|= rule->renderFeature( featToRender, context, renderQueue ) == Rendered;`
`549`	`549`	`}`
`550`	`550`	`}`
`551`	`551`	`if ( !mIsActive )`
`@@ -821,7 +821,7 @@ bool QgsRuleBasedRendererV2::renderFeature( QgsFeature& feature,`
`821`	`821`	`mCurrentFeatures.append( FeatureToRender( feature, flags ) );`
`822`	`822`
`823`	`823`	`// check each active rule`
`824`		`- return mRootRule->renderFeature( mCurrentFeatures.last(), context, mRenderQueue );`
	`824`	`+ return mRootRule->renderFeature( mCurrentFeatures.last(), context, mRenderQueue ) == Rule::Rendered;`
`825`	`825`	`}`
`826`	`826`
`827`	`827`