Fix diagrams

mhugent · mhugent · commit 0b5f554d3cdb · 2011-03-16T08:00:22.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15513 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgsmaprenderer.h b/src/core/qgsmaprenderer.h
@@ -74,7 +74,7 @@ class QgsLabelingEngineInterface
     //! @note: this method was added in version 1.6
     virtual int prepareLayer( QgsVectorLayer* layer, QSet<int>& attrIndices, QgsRenderContext& ctx ) = 0;
     //! adds a diagram layer to the labeling engine
-    virtual int addDiagramLayer( QgsVectorLayer* layer, QgsDiagramLayerSettings& s ) { return 0; };
+    virtual int addDiagramLayer( QgsVectorLayer* layer, QgsDiagramLayerSettings* s ) { return 0; }
     //! called for every feature
     virtual void registerFeature( QgsVectorLayer* layer, QgsFeature& feat, const QgsRenderContext& context = QgsRenderContext() ) = 0;
     //! called for every diagram feature
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -5191,7 +5191,7 @@ void QgsVectorLayer::prepareLabelingAndDiagrams( QgsRenderContext& rendererConte
     if ( mDiagramRenderer && mDiagramLayerSettings )
     {
       mDiagramLayerSettings->renderer = mDiagramRenderer;
-      rendererContext.labelingEngine()->addDiagramLayer( this, *mDiagramLayerSettings );
+      rendererContext.labelingEngine()->addDiagramLayer( this, mDiagramLayerSettings );
       //add attributes needed by the diagram renderer
       QList<int> att = mDiagramRenderer->diagramAttributes();
       QList<int>::const_iterator attIt = att.constBegin();

Original file line number	Diff line number	Diff line change
`@@ -5191,7 +5191,7 @@ void QgsVectorLayer::prepareLabelingAndDiagrams( QgsRenderContext& rendererConte`
`5191`	`5191`	`if ( mDiagramRenderer && mDiagramLayerSettings )`
`5192`	`5192`	`{`
`5193`	`5193`	`mDiagramLayerSettings->renderer = mDiagramRenderer;`
`5194`		`- rendererContext.labelingEngine()->addDiagramLayer( this, *mDiagramLayerSettings );`
	`5194`	`+ rendererContext.labelingEngine()->addDiagramLayer( this, mDiagramLayerSettings );`
`5195`	`5195`	`//add attributes needed by the diagram renderer`
`5196`	`5196`	`QList<int> att = mDiagramRenderer->diagramAttributes();`
`5197`	`5197`	`QList<int>::const_iterator attIt = att.constBegin();`