Fix incorrect calculation of priority for diagrams (fix #4692)

qgis · Apr 13, 2015 · 3117333117722d682e1ae1e9f9ee9799d2b9504d · 3117333
1 parent 15b6043
commit 3117333117722d682e1ae1e9f9ee9799d2b9504d
Unified Split

Showing with 2 additions and 1 deletion.

+2 −1 src/core/qgspallabeling.cpp
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -3382,7 +3382,8 @@ int QgsPalLabeling::prepareLayer( QgsVectorLayer* layer, QStringList& attrNames,
 
 int QgsPalLabeling::addDiagramLayer( QgsVectorLayer* layer, const QgsDiagramLayerSettings *s )
 {
-  Layer* l = mPal->addLayer( layer->id().append( "d" ).toUtf8().data(), -1, -1, pal::Arrangement( s->placement ), METER, s->priority, s->obstacle, true, true );
+  double priority = 1 - s->priority / 10.0; // convert 0..10 --> 1..0
+  Layer* l = mPal->addLayer( layer->id().append( "d" ).toUtf8().data(), -1, -1, pal::Arrangement( s->placement ), METER, priority, s->obstacle, true, true );
   l->setArrangementFlags( s->placementFlags );
 
   mActiveDiagramLayers.insert( layer->id(), *s );