Change point displacement renderer to work with new vector api

mhugent · mhugent · commit 212aea7c445d · 2013-04-10T09:01:44.000+02:00
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -370,8 +370,6 @@ void QgsVectorLayer::drawRendererV2( QgsFeatureIterator &fit, QgsRenderContext&
   QSettings settings;
   bool vertexMarkerOnlyForSelection = settings.value( "/qgis/digitizing/marker_only_for_selected", false ).toBool();
 
-  mRendererV2->startRender( rendererContext, this );
-
 #ifndef Q_WS_MAC
   int featureCount = 0;
 #endif //Q_WS_MAC
@@ -465,9 +463,6 @@ void QgsVectorLayer::drawRendererV2Levels( QgsFeatureIterator &fit, QgsRenderCon
   QSettings settings;
   bool vertexMarkerOnlyForSelection = settings.value( "/qgis/digitizing/marker_only_for_selected", false ).toBool();
 
-  // startRender must be called before symbolForFeature() calls to make sure renderer is ready
-  mRendererV2->startRender( rendererContext, this );
-
   QgsSingleSymbolRendererV2* selRenderer = NULL;
   if ( !mSelectedFeatureIds.isEmpty() )
   {
@@ -653,6 +648,9 @@ bool QgsVectorLayer::draw( QgsRenderContext& rendererContext )
   //register label and diagram layer to the labeling engine
   prepareLabelingAndDiagrams( rendererContext, attributes, labeling );
 
+  //do startRender before getFeatures to give renderers the possibility of querying features in the startRender method
+  mRendererV2->startRender( rendererContext, this );
+
   QgsFeatureIterator fit = getFeatures( QgsFeatureRequest()
                                         .setFilterRect( rendererContext.extent() )
                                         .setSubsetOfAttributes( attributes ) );
diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h
@@ -347,12 +347,12 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
      */
     void setRendererV2( QgsFeatureRendererV2* r );
 
-    /** Draw layer with renderer V2.
+    /** Draw layer with renderer V2. QgsFeatureRenderer::startRender() needs to be called before using this method
      * @note added in 1.4
      */
     void drawRendererV2( QgsFeatureIterator &fit, QgsRenderContext& rendererContext, bool labeling );
 
-    /** Draw layer with renderer V2 using symbol levels.
+    /** Draw layer with renderer V2 using symbol levels. QgsFeatureRenderer::startRender() needs to be called before using this method
      * @note added in 1.4
      */
     void drawRendererV2Levels( QgsFeatureIterator &fit, QgsRenderContext& rendererContext, bool labeling );
diff --git a/src/core/symbology-ng/qgspointdisplacementrenderer.cpp b/src/core/symbology-ng/qgspointdisplacementrenderer.cpp
@@ -364,6 +364,9 @@ void QgsPointDisplacementRenderer::createDisplacementGroups( QgsVectorLayer* vla
   QgsFeature f;
   QList<QgsFeatureId> intersectList;
 
+  //Because the new vector api does not allow querying features by id within a nextFeature loop, default constructed QgsFeature() is
+  //inserted first and the real features are created in a second loop
+
   QgsFeatureIterator fit = vlayer->getFeatures( QgsFeatureRequest().setFilterRect( viewExtent ).setSubsetOfAttributes( attList ) );
   while ( fit.nextFeature( f ) )
   {
@@ -389,7 +392,7 @@ void QgsPointDisplacementRenderer::createDisplacementGroups( QgsVectorLayer* vla
           {
             found = true;
             QgsFeature feature;
-            it->insert( f.id(), f );
+            it->insert( f.id(), QgsFeature() );
             mDisplacementIds.insert( f.id() );
             break;
           }
@@ -398,17 +401,29 @@ void QgsPointDisplacementRenderer::createDisplacementGroups( QgsVectorLayer* vla
         if ( !found )//insert the already existing feature and the new one into a map
         {
           QMap<QgsFeatureId, QgsFeature> newMap;
-          QgsFeature existingFeature;
-          vlayer->getFeatures( QgsFeatureRequest().setFilterFid( existingEntry ) ).nextFeature( existingFeature );
-          newMap.insert( existingEntry, existingFeature );
+          newMap.insert( existingEntry, QgsFeature() );
           mDisplacementIds.insert( existingEntry );
-          newMap.insert( f.id(), f );
+          newMap.insert( f.id(), QgsFeature() );
           mDisplacementIds.insert( f.id() );
           mDisplacementGroups.push_back( newMap );
         }
       }
     }
   }
+
+  //insert the real features into mDisplacementGroups
+  QList< QMap<QgsFeatureId, QgsFeature> >::iterator it = mDisplacementGroups.begin();
+  for ( ; it != mDisplacementGroups.end(); ++it )
+  {
+    QMap<QgsFeatureId, QgsFeature>::iterator mapIt = it->begin();
+    for ( ; mapIt != it->end(); ++mapIt )
+    {
+      QgsFeature fet;
+      vlayer->getFeatures( QgsFeatureRequest().setFilterFid( mapIt.key() ) ).nextFeature( fet );
+      mapIt.value() = fet;
+    }
+  }
+
 }
 
 QgsRectangle QgsPointDisplacementRenderer::searchRect( const QgsPoint& p ) const

Original file line number	Diff line number	Diff line change
`@@ -364,6 +364,9 @@ void QgsPointDisplacementRenderer::createDisplacementGroups( QgsVectorLayer* vla`
`364`	`364`	`QgsFeature f;`
`365`	`365`	`QList<QgsFeatureId> intersectList;`
`366`	`366`
	`367`	`+ //Because the new vector api does not allow querying features by id within a nextFeature loop, default constructed QgsFeature() is`
	`368`	`+ //inserted first and the real features are created in a second loop`
	`369`	`+`
`367`	`370`	`QgsFeatureIterator fit = vlayer->getFeatures( QgsFeatureRequest().setFilterRect( viewExtent ).setSubsetOfAttributes( attList ) );`
`368`	`371`	`while ( fit.nextFeature( f ) )`
`369`	`372`	`{`
`@@ -389,7 +392,7 @@ void QgsPointDisplacementRenderer::createDisplacementGroups( QgsVectorLayer* vla`
`389`	`392`	`{`
`390`	`393`	`found = true;`
`391`	`394`	`QgsFeature feature;`
`392`		`- it->insert( f.id(), f );`
	`395`	`+ it->insert( f.id(), QgsFeature() );`
`393`	`396`	`mDisplacementIds.insert( f.id() );`
`394`	`397`	`break;`
`395`	`398`	`}`
`@@ -398,17 +401,29 @@ void QgsPointDisplacementRenderer::createDisplacementGroups( QgsVectorLayer* vla`
`398`	`401`	`if ( !found )//insert the already existing feature and the new one into a map`
`399`	`402`	`{`
`400`	`403`	`QMap<QgsFeatureId, QgsFeature> newMap;`
`401`		`- QgsFeature existingFeature;`
`402`		`- vlayer->getFeatures( QgsFeatureRequest().setFilterFid( existingEntry ) ).nextFeature( existingFeature );`
`403`		`- newMap.insert( existingEntry, existingFeature );`
	`404`	`+ newMap.insert( existingEntry, QgsFeature() );`
`404`	`405`	`mDisplacementIds.insert( existingEntry );`
`405`		`- newMap.insert( f.id(), f );`
	`406`	`+ newMap.insert( f.id(), QgsFeature() );`
`406`	`407`	`mDisplacementIds.insert( f.id() );`
`407`	`408`	`mDisplacementGroups.push_back( newMap );`
`408`	`409`	`}`
`409`	`410`	`}`
`410`	`411`	`}`
`411`	`412`	`}`
	`413`	`+`
	`414`	`+ //insert the real features into mDisplacementGroups`
	`415`	`+ QList< QMap<QgsFeatureId, QgsFeature> >::iterator it = mDisplacementGroups.begin();`
	`416`	`+ for ( ; it != mDisplacementGroups.end(); ++it )`
	`417`	`+ {`
	`418`	`+ QMap<QgsFeatureId, QgsFeature>::iterator mapIt = it->begin();`
	`419`	`+ for ( ; mapIt != it->end(); ++mapIt )`
	`420`	`+ {`
	`421`	`+ QgsFeature fet;`
	`422`	`+ vlayer->getFeatures( QgsFeatureRequest().setFilterFid( mapIt.key() ) ).nextFeature( fet );`
	`423`	`+ mapIt.value() = fet;`
	`424`	`+ }`
	`425`	`+ }`
	`426`	`+`
`412`	`427`	`}`
`413`	`428`
`414`	`429`	`QgsRectangle QgsPointDisplacementRenderer::searchRect( const QgsPoint& p ) const`