Fix point displacement renderer to work with the new selection parameter

mhugent · mhugent · commit 8e1b2aafff7a · 2010-04-23T15:35:17.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@13354 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/plugins/point_displacement_renderer/qgspointdisplacementrenderer.cpp b/src/plugins/point_displacement_renderer/qgspointdisplacementrenderer.cpp
@@ -66,7 +66,7 @@ QgsFeatureRendererV2* QgsPointDisplacementRenderer::clone()
   return r;
 }
 
-void QgsPointDisplacementRenderer::renderFeature( QgsFeature& feature, QgsRenderContext& context, int layer, bool drawVertexMarker )
+void QgsPointDisplacementRenderer::renderFeature( QgsFeature& feature, QgsRenderContext& context, int layer, bool selected, bool drawVertexMarker )
 {
   //point position in screen coords
   QgsGeometry* geom = feature.geometry();
@@ -147,7 +147,7 @@ void QgsPointDisplacementRenderer::renderFeature( QgsFeature& feature, QgsRender
   }
 
 
-  QgsSymbolV2RenderContext symbolContext( context, QgsSymbolV2::MM );
+  QgsSymbolV2RenderContext symbolContext( context, QgsSymbolV2::MM, 1.0, selected );
   double circleAdditionPainterUnits = symbolContext.outputLineWidth( mCircleRadiusAddition );
   double radius = std::max(( diagonal / 2 ), labelAttributeList.size() * diagonal / 2 / M_PI ) + circleAdditionPainterUnits;
 
@@ -163,7 +163,7 @@ void QgsPointDisplacementRenderer::renderFeature( QgsFeature& feature, QgsRender
   {
     if ( mCenterSymbol )
     {
-      mCenterSymbol->renderPoint( pt, context );
+      mCenterSymbol->renderPoint( pt, context, layer, selected );
     }
     else
     {
@@ -172,7 +172,7 @@ void QgsPointDisplacementRenderer::renderFeature( QgsFeature& feature, QgsRender
   }
 
   //draw symbols on the circle
-  drawSymbols( context, symbolList, symbolPositions );
+  drawSymbols( context, symbolList, symbolPositions, selected );
   //and also the labels
   drawLabels( pt, symbolContext, labelPositions, labelAttributeList );
 }
@@ -508,15 +508,15 @@ void QgsPointDisplacementRenderer::drawCircle( double radiusPainterUnits, QgsSym
   p->drawArc( QRectF( centerPoint.x() - radiusPainterUnits, centerPoint.y() - radiusPainterUnits, 2 * radiusPainterUnits, 2 * radiusPainterUnits ), 0, 5760 );
 }
 
-void QgsPointDisplacementRenderer::drawSymbols( QgsRenderContext& context, const QList<QgsMarkerSymbolV2*>& symbolList, const QList<QPointF>& symbolPositions )
+void QgsPointDisplacementRenderer::drawSymbols( QgsRenderContext& context, const QList<QgsMarkerSymbolV2*>& symbolList, const QList<QPointF>& symbolPositions, bool selected )
 {
   QList<QPointF>::const_iterator symbolPosIt = symbolPositions.constBegin();
   QList<QgsMarkerSymbolV2*>::const_iterator symbolIt = symbolList.constBegin();
   for ( ; symbolPosIt != symbolPositions.constEnd() && symbolIt != symbolList.constEnd(); ++symbolPosIt, ++symbolIt )
   {
     if ( *symbolIt )
     {
-      ( *symbolIt )->renderPoint( *symbolPosIt, context );
+      ( *symbolIt )->renderPoint( *symbolPosIt, context, -1, selected );
     }
   }
 }
diff --git a/src/plugins/point_displacement_renderer/qgspointdisplacementrenderer.h b/src/plugins/point_displacement_renderer/qgspointdisplacementrenderer.h
@@ -37,7 +37,7 @@ class QgsPointDisplacementRenderer: public QgsFeatureRendererV2
     QgsFeatureRendererV2* clone();
 
     /**Reimplemented from QgsFeatureRendererV2*/
-    void renderFeature( QgsFeature& feature, QgsRenderContext& context, int layer = -1, bool drawVertexMarker = false );
+    void renderFeature( QgsFeature& feature, QgsRenderContext& context, int layer = -1, bool selected = false, bool drawVertexMarker = false );
 
     QgsSymbolV2* symbolForFeature( QgsFeature& feature );
 
@@ -143,7 +143,7 @@ class QgsPointDisplacementRenderer: public QgsFeatureRendererV2
     //helper functions
     void calculateSymbolAndLabelPositions( const QPointF& centerPoint, int nPosition, double radius, double symbolDiagonal, QList<QPointF>& symbolPositions, QList<QPointF>& labelShifts ) const;
     void drawCircle( double radiusPainterUnits, QgsSymbolV2RenderContext& context, const QPointF& centerPoint, int nSymbols );
-    void drawSymbols( QgsRenderContext& context, const QList<QgsMarkerSymbolV2*>& symbolList, const QList<QPointF>& symbolPositions );
+    void drawSymbols( QgsRenderContext& context, const QList<QgsMarkerSymbolV2*>& symbolList, const QList<QPointF>& symbolPositions, bool selected = false );
     void drawLabels( const QPointF& centerPoint, QgsSymbolV2RenderContext& context, const QList<QPointF>& labelShifts, const QStringList& labelList );
 };
 

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ QgsFeatureRendererV2* QgsPointDisplacementRenderer::clone()`
`66`	`66`	`return r;`
`67`	`67`	`}`
`68`	`68`
`69`		`-void QgsPointDisplacementRenderer::renderFeature( QgsFeature& feature, QgsRenderContext& context, int layer, bool drawVertexMarker )`
	`69`	`+void QgsPointDisplacementRenderer::renderFeature( QgsFeature& feature, QgsRenderContext& context, int layer, bool selected, bool drawVertexMarker )`
`70`	`70`	`{`
`71`	`71`	`//point position in screen coords`
`72`	`72`	`QgsGeometry* geom = feature.geometry();`
`@@ -147,7 +147,7 @@ void QgsPointDisplacementRenderer::renderFeature( QgsFeature& feature, QgsRender`
`147`	`147`	`}`
`148`	`148`
`149`	`149`
`150`		`- QgsSymbolV2RenderContext symbolContext( context, QgsSymbolV2::MM );`
	`150`	`+ QgsSymbolV2RenderContext symbolContext( context, QgsSymbolV2::MM, 1.0, selected );`
`151`	`151`	`double circleAdditionPainterUnits = symbolContext.outputLineWidth( mCircleRadiusAddition );`
`152`	`152`	`double radius = std::max(( diagonal / 2 ), labelAttributeList.size() * diagonal / 2 / M_PI ) + circleAdditionPainterUnits;`
`153`	`153`
`@@ -163,7 +163,7 @@ void QgsPointDisplacementRenderer::renderFeature( QgsFeature& feature, QgsRender`
`163`	`163`	`{`
`164`	`164`	`if ( mCenterSymbol )`
`165`	`165`	`{`
`166`		`- mCenterSymbol->renderPoint( pt, context );`
	`166`	`+ mCenterSymbol->renderPoint( pt, context, layer, selected );`
`167`	`167`	`}`
`168`	`168`	`else`
`169`	`169`	`{`
`@@ -172,7 +172,7 @@ void QgsPointDisplacementRenderer::renderFeature( QgsFeature& feature, QgsRender`
`172`	`172`	`}`
`173`	`173`
`174`	`174`	`//draw symbols on the circle`
`175`		`- drawSymbols( context, symbolList, symbolPositions );`
	`175`	`+ drawSymbols( context, symbolList, symbolPositions, selected );`
`176`	`176`	`//and also the labels`
`177`	`177`	`drawLabels( pt, symbolContext, labelPositions, labelAttributeList );`
`178`	`178`	`}`
`@@ -508,15 +508,15 @@ void QgsPointDisplacementRenderer::drawCircle( double radiusPainterUnits, QgsSym`
`508`	`508`	`p->drawArc( QRectF( centerPoint.x() - radiusPainterUnits, centerPoint.y() - radiusPainterUnits, 2 * radiusPainterUnits, 2 * radiusPainterUnits ), 0, 5760 );`
`509`	`509`	`}`
`510`	`510`
`511`		`-void QgsPointDisplacementRenderer::drawSymbols( QgsRenderContext& context, const QList<QgsMarkerSymbolV2*>& symbolList, const QList<QPointF>& symbolPositions )`
	`511`	`+void QgsPointDisplacementRenderer::drawSymbols( QgsRenderContext& context, const QList<QgsMarkerSymbolV2*>& symbolList, const QList<QPointF>& symbolPositions, bool selected )`
`512`	`512`	`{`
`513`	`513`	`QList<QPointF>::const_iterator symbolPosIt = symbolPositions.constBegin();`
`514`	`514`	`QList<QgsMarkerSymbolV2*>::const_iterator symbolIt = symbolList.constBegin();`
`515`	`515`	`for ( ; symbolPosIt != symbolPositions.constEnd() && symbolIt != symbolList.constEnd(); ++symbolPosIt, ++symbolIt )`
`516`	`516`	`{`
`517`	`517`	`if ( *symbolIt )`
`518`	`518`	`{`
`519`		`- ( symbolIt )->renderPoint( symbolPosIt, context );`
	`519`	`+ ( symbolIt )->renderPoint( symbolPosIt, context, -1, selected );`
`520`	`520`	`}`
`521`	`521`	`}`
`522`	`522`	`}`