[QGIS Commit] r12206 - trunk/qgis/src/core

[svn_qgis at osgeo.org]

Author: wonder
Date: 2009-11-20 07:39:51 -0500 (Fri, 20 Nov 2009)
New Revision: 12206

Modified:
   trunk/qgis/src/core/qgsvectorlayer.cpp
Log:
Don't label features which are not rendered.


Modified: trunk/qgis/src/core/qgsvectorlayer.cpp
===================================================================
--- trunk/qgis/src/core/qgsvectorlayer.cpp	2009-11-20 12:21:21 UTC (rev 12205)
+++ trunk/qgis/src/core/qgsvectorlayer.cpp	2009-11-20 12:39:51 UTC (rev 12206)
@@ -704,7 +704,7 @@
     else
       mRendererV2->renderFeature( fet, rendererContext );
 
-    if ( labeling )
+    if ( labeling && mRendererV2->symbolForFeature( fet ) != NULL )
       rendererContext.labelingEngine()->registerFeature( this, fet );
 
     if ( mEditable )
@@ -749,7 +749,7 @@
     }
     features[sym].append( fet );
 
-    if ( labeling )
+    if ( labeling && mRendererV2->symbolForFeature( fet ) != NULL )
       rendererContext.labelingEngine()->registerFeature( this, fet );
 
     if ( mEditable )
@@ -972,7 +972,7 @@
         //double scale = rendererContext.scaleFactor() /  markerScaleFactor;
         drawFeature( rendererContext, fet, &marker );
 
-        if ( labeling )
+        if ( labeling && mRenderer->willRenderFeature( &fet ) )
         {
           rendererContext.labelingEngine()->registerFeature( this, fet );
         }