remove progress indication from symbology-ng rendering:

jef · jef · commit f4f76e4837ae · 2010-05-22T15:51:12.000Z
sometimes featureCount() is expensive and moveover only applies when the canvas covers the full layer extent, which is not always the case. git-svn-id: http://svn.osgeo.org/qgis/trunk@13548 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -706,7 +706,6 @@ void QgsVectorLayer::drawRendererV2( QgsRenderContext& rendererContext, bool lab
   mRendererV2->startRender( rendererContext, this );
 
 #ifndef Q_WS_MAC
-  int totalFeatures = pendingFeatureCount();
   int featureCount = 0;
 #endif //Q_WS_MAC
 
@@ -724,12 +723,12 @@ void QgsVectorLayer::drawRendererV2( QgsRenderContext& rendererContext, bool lab
       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 @@ bool QgsVectorLayer::draw( QgsRenderContext& rendererContext )
       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 @@ bool QgsVectorLayer::draw( QgsRenderContext& rendererContext )
         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

Original file line number	Diff line number	Diff line change
`@@ -706,7 +706,6 @@ void QgsVectorLayer::drawRendererV2( QgsRenderContext& rendererContext, bool lab`
`706`	`706`	`mRendererV2->startRender( rendererContext, this );`
`707`	`707`
`708`	`708`	`#ifndef Q_WS_MAC`
`709`		`- int totalFeatures = pendingFeatureCount();`
`710`	`709`	`int featureCount = 0;`
`711`	`710`	`#endif //Q_WS_MAC`
`712`	`711`
`@@ -724,12 +723,12 @@ void QgsVectorLayer::drawRendererV2( QgsRenderContext& rendererContext, bool lab`
`724`	`723`	`if ( mUpdateThreshold > 0 && 0 == featureCount % mUpdateThreshold )`
`725`	`724`	`{`
`726`	`725`	`emit screenUpdateRequested();`
`727`		`- emit drawingProgress( featureCount, totalFeatures );`
	`726`	`+ // emit drawingProgress( featureCount, totalFeatures );`
`728`	`727`	`qApp->processEvents();`
`729`	`728`	`}`
`730`	`729`	`else if ( featureCount % 1000 == 0 )`
`731`	`730`	`{`
`732`		`- emit drawingProgress( featureCount, totalFeatures );`
	`731`	`+ // emit drawingProgress( featureCount, totalFeatures );`
`733`	`732`	`qApp->processEvents();`
`734`	`733`	`}`
`735`	`734`	`#endif //Q_WS_MAC`
`@@ -970,7 +969,7 @@ bool QgsVectorLayer::draw( QgsRenderContext& rendererContext )`
`970`	`969`	`mVertexMarkerOnlyForSelection = settings.value( "/qgis/digitizing/marker_only_for_selected", false ).toBool();`
`971`	`970`	`}`
`972`	`971`
`973`		`- int totalFeatures = pendingFeatureCount();`
	`972`	`+ // int totalFeatures = pendingFeatureCount();`
`974`	`973`	`int featureCount = 0;`
`975`	`974`	`QgsFeature fet;`
`976`	`975`	`QgsAttributeList attributes = mRenderer->classificationAttributes();`
`@@ -1003,16 +1002,16 @@ bool QgsVectorLayer::draw( QgsRenderContext& rendererContext )`
`1003`	`1002`	`if ( mUpdateThreshold > 0 && 0 == featureCount % mUpdateThreshold )`
`1004`	`1003`	`{`
`1005`	`1004`	`emit screenUpdateRequested();`
`1006`		`- emit drawingProgress( featureCount, totalFeatures );`
	`1005`	`+ // emit drawingProgress( featureCount, totalFeatures );`
`1007`	`1006`	`qApp->processEvents();`
`1008`	`1007`	`}`
`1009`	`1008`	`else if ( featureCount % 1000 == 0 )`
`1010`	`1009`	`{`
`1011`		`- emit drawingProgress( featureCount, totalFeatures );`
	`1010`	`+ // emit drawingProgress( featureCount, totalFeatures );`
`1012`	`1011`	`qApp->processEvents();`
`1013`	`1012`	`}`
`1014`		`-#else`
`1015`		`- Q_UNUSED( totalFeatures );`
	`1013`	`+// #else`
	`1014`	`+// Q_UNUSED( totalFeatures );`
`1016`	`1015`	`#endif //Q_WS_MAC`
`1017`	`1016`
`1018`	`1017`	`// check if feature is selected`