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

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-05-22 11:51:12 -0400 (Sat, 22 May 2010)
New Revision: 13548

Modified:
   trunk/qgis/src/core/qgsvectorlayer.cpp
Log:
remove progress indication from symbology-ng rendering:
sometimes featureCount() is expensive and moveover only applies when the canvas
covers the full layer extent, which is not always the case.



Modified: trunk/qgis/src/core/qgsvectorlayer.cpp
===================================================================
--- trunk/qgis/src/core/qgsvectorlayer.cpp	2010-05-22 15:45:49 UTC (rev 13547)
+++ trunk/qgis/src/core/qgsvectorlayer.cpp	2010-05-22 15:51:12 UTC (rev 13548)
@@ -706,7 +706,6 @@
   mRendererV2->startRender( rendererContext, this );
 
 #ifndef Q_WS_MAC
-  int totalFeatures = pendingFeatureCount();
   int featureCount = 0;
 #endif //Q_WS_MAC
 
@@ -724,12 +723,12 @@
       if ( mUpdateThreshold > 0 && 0 == featureCount % mUpdateThreshold )
       {
         emit screenUpdateRequested();
-        emit drawingProgress( featureCount, totalFeatures );
+        // emit drawingProgress( featureCount, totalFeatures );
         qApp->processEvents();
       }
       else if ( featureCount % 1000 == 0 )
       {
-        emit drawingProgress( featureCount, totalFeatures );
+        // emit drawingProgress( featureCount, totalFeatures );
         qApp->processEvents();
       }
 #endif //Q_WS_MAC
@@ -970,7 +969,7 @@
       mVertexMarkerOnlyForSelection = settings.value( "/qgis/digitizing/marker_only_for_selected", false ).toBool();
     }
 
-    int totalFeatures = pendingFeatureCount();
+    // int totalFeatures = pendingFeatureCount();
     int featureCount = 0;
     QgsFeature fet;
     QgsAttributeList attributes = mRenderer->classificationAttributes();
@@ -1003,16 +1002,16 @@
         if ( mUpdateThreshold > 0 && 0 == featureCount % mUpdateThreshold )
         {
           emit screenUpdateRequested();
-          emit drawingProgress( featureCount, totalFeatures );
+          // emit drawingProgress( featureCount, totalFeatures );
           qApp->processEvents();
         }
         else if ( featureCount % 1000 == 0 )
         {
-          emit drawingProgress( featureCount, totalFeatures );
+          // emit drawingProgress( featureCount, totalFeatures );
           qApp->processEvents();
         }
-#else
-        Q_UNUSED( totalFeatures );
+// #else
+//         Q_UNUSED( totalFeatures );
 #endif //Q_WS_MAC
 
         // check if feature is selected