Bugfix: consider multiple overlay objects for multitypes (or also possible no overlay objects if the feature is too small)

mhugent · mhugent · commit 921321ea3ece · 2009-05-04T13:47:03.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@10725 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/plugins/diagram_overlay/qgsdiagramoverlay.cpp b/src/plugins/diagram_overlay/qgsdiagramoverlay.cpp
@@ -135,24 +135,29 @@ void QgsDiagramOverlay::drawOverlayObjects( QgsRenderContext& context ) const
         {
           if ( it.value() )
           {
-            QgsPoint overlayPosition = it.value()->position();
+            QList<QgsPoint> positionList = it.value()->positions();
             const QgsCoordinateTransform* ct = context.coordinateTransform();
-            if ( ct )
-            {
-              overlayPosition = ct->transform( overlayPosition );
-            }
-            context.mapToPixel().transform( &overlayPosition );
-            int shiftX = currentDiagramImage->width() / 2;
-            int shiftY = currentDiagramImage->height() / 2;
 
-            if ( painter )
+            QList<QgsPoint>::const_iterator positionIt = positionList.constBegin();
+            for(; positionIt != positionList.constEnd(); ++positionIt)
             {
-              painter->save();
-              painter->scale( 1.0 / context.rasterScaleFactor(), 1.0 / context.rasterScaleFactor() );
-              //painter->drawRect(( int )( overlayPosition.x() * context.rasterScaleFactor() ) - shiftX, ( int )( overlayPosition.y() * context.rasterScaleFactor() ) - shiftY, it.value()->width(), it.value()->height());
-              painter->drawImage(( int )( overlayPosition.x() * context.rasterScaleFactor() ) - shiftX, ( int )( overlayPosition.y() * context.rasterScaleFactor() ) - shiftY, *currentDiagramImage );
-
-              painter->restore();
+                QgsPoint overlayPosition = *positionIt;
+                if ( ct )
+                {
+                    overlayPosition = ct->transform(overlayPosition);
+                }
+                context.mapToPixel().transform( &overlayPosition );
+                int shiftX = currentDiagramImage->width() / 2;
+                int shiftY = currentDiagramImage->height() / 2;
+
+                if ( painter )
+                {
+                    painter->save();
+                    painter->scale( 1.0 / context.rasterScaleFactor(), 1.0 / context.rasterScaleFactor() );
+                    //painter->drawRect(( int )( overlayPosition.x() * context.rasterScaleFactor() ) - shiftX, ( int )( overlayPosition.y() * context.rasterScaleFactor() ) - shiftY, it.value()->width(), it.value()->height());
+                    painter->drawImage(( int )( overlayPosition.x() * context.rasterScaleFactor() ) - shiftX, ( int )( overlayPosition.y() * context.rasterScaleFactor() ) - shiftY, *currentDiagramImage );
+                    painter->restore();
+                }
             }
           }
         }
