fix phantom labels for (actually not) rendered feature (refs #13631)

jef-n · jef-n · commit bfd293337012 · 2015-10-23T19:19:31.000+02:00
(cherry picked from commit d6f66e & b36cd1f)
diff --git a/src/core/qgsvectorlayerrenderer.cpp b/src/core/qgsvectorlayerrenderer.cpp
@@ -152,7 +152,7 @@ bool QgsVectorLayerRenderer::render()
                                      .setFilterRect( requestExtent )
                                      .setSubsetOfAttributes( mAttrNames, mFields );
 
-  if ( !rendererFilter.isEmpty() )
+  if ( !rendererFilter.isEmpty() && rendererFilter != "TRUE" )
   {
     featureRequest.setFilterExpression( rendererFilter );
     featureRequest.setExpressionContext( mContext.expressionContext() );
@@ -303,28 +303,30 @@ void QgsVectorLayerRenderer::drawRendererV2( QgsFeatureIterator& fit )
       bool rendered = mRendererV2->renderFeature( fet, mContext, -1, sel, drawMarker );
 
       // labeling - register feature
-      Q_UNUSED( rendered );
-      if ( rendered && mContext.labelingEngine() )
+      if ( rendered )
       {
-        if ( mLabeling )
+        if ( mContext.labelingEngine() )
         {
-          mContext.labelingEngine()->registerFeature( mLayerID, fet, mContext );
-        }
-        if ( mDiagrams )
-        {
-          mContext.labelingEngine()->registerDiagramFeature( mLayerID, fet, mContext );
-        }
-      }
-      // new labeling engine
-      if ( rendered && mContext.labelingEngineV2() )
-      {
-        if ( mLabelProvider )
-        {
-          mLabelProvider->registerFeature( fet, mContext );
+          if ( mLabeling )
+          {
+            mContext.labelingEngine()->registerFeature( mLayerID, fet, mContext );
+          }
+          if ( mDiagrams )
+          {
+            mContext.labelingEngine()->registerDiagramFeature( mLayerID, fet, mContext );
+          }
         }
-        if ( mDiagramProvider )
+        // new labeling engine
+        if ( mContext.labelingEngineV2() )
         {
-          mDiagramProvider->registerFeature( fet, mContext );
+          if ( mLabelProvider )
+          {
+            mLabelProvider->registerFeature( fet, mContext );
+          }
+          if ( mDiagramProvider )
+          {
+            mDiagramProvider->registerFeature( fet, mContext );
+          }
         }
       }
     }
diff --git a/src/core/symbology-ng/qgsrulebasedrendererv2.cpp b/src/core/symbology-ng/qgsrulebasedrendererv2.cpp
@@ -435,7 +435,12 @@ bool QgsRuleBasedRendererV2::Rule::startRender( QgsRenderContext& context, const
   QString sf;
   // 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( ")" );
+  {
+    if ( subfilters.contains( "TRUE" ) )
+      sf = "TRUE";
+    else
+      sf = subfilters.join( ") OR (" ).prepend( "(" ).append( ")" );
+  }
 
   // Now join the subfilters with their parent (this) based on if
   // * The parent is an else rule
@@ -521,8 +526,8 @@ QgsRuleBasedRendererV2::Rule::RenderResult QgsRuleBasedRendererV2::Rule::renderF
     {
       //QgsDebugMsg(QString("add job at level %1").arg(normZLevel));
       renderQueue[normZLevel].jobs.append( new RenderJob( featToRender, mSymbol ) );
+      rendered = true;
     }
-    rendered = true;
   }
 
   bool willrendersomething = false;
@@ -548,7 +553,7 @@ QgsRuleBasedRendererV2::Rule::RenderResult QgsRuleBasedRendererV2::Rule::renderF
       rendered |= rule->renderFeature( featToRender, context, renderQueue ) == Rendered;
     }
   }
-  if ( !mIsActive )
+  if ( !mIsActive || ( mSymbol && !rendered ) )
     return Inactive;
   else if ( rendered )
     return Rendered;

Original file line number	Diff line number	Diff line change
`@@ -435,7 +435,12 @@ bool QgsRuleBasedRendererV2::Rule::startRender( QgsRenderContext& context, const`
`435`	`435`	`QString sf;`
`436`	`436`	`// If there are subfilters present (and it's not a single empty one), group them and join them with OR`
`437`	`437`	`if ( subfilters.length() > 1 \|\| subfilters.value( 0 ).trimmed().length() > 0 )`
`438`		`- sf = subfilters.join( ") OR (" ).prepend( "(" ).append( ")" );`
	`438`	`+ {`
	`439`	`+ if ( subfilters.contains( "TRUE" ) )`
	`440`	`+ sf = "TRUE";`
	`441`	`+ else`
	`442`	`+ sf = subfilters.join( ") OR (" ).prepend( "(" ).append( ")" );`
	`443`	`+ }`
`439`	`444`
`440`	`445`	`// Now join the subfilters with their parent (this) based on if`
`441`	`446`	`// * The parent is an else rule`
`@@ -521,8 +526,8 @@ QgsRuleBasedRendererV2::Rule::RenderResult QgsRuleBasedRendererV2::Rule::renderF`
`521`	`526`	`{`
`522`	`527`	`//QgsDebugMsg(QString("add job at level %1").arg(normZLevel));`
`523`	`528`	`renderQueue[normZLevel].jobs.append( new RenderJob( featToRender, mSymbol ) );`
	`529`	`+ rendered = true;`
`524`	`530`	`}`
`525`		`- rendered = true;`
`526`	`531`	`}`
`527`	`532`
`528`	`533`	`bool willrendersomething = false;`
`@@ -548,7 +553,7 @@ QgsRuleBasedRendererV2::Rule::RenderResult QgsRuleBasedRendererV2::Rule::renderF`
`548`	`553`	`rendered \|= rule->renderFeature( featToRender, context, renderQueue ) == Rendered;`
`549`	`554`	`}`
`550`	`555`	`}`
`551`		`- if ( !mIsActive )`
	`556`	`+ if ( !mIsActive \|\| ( mSymbol && !rendered ) )`
`552`	`557`	`return Inactive;`
`553`	`558`	`else if ( rendered )`
`554`	`559`	`return Rendered;`