Fix scale dependant rendering of diagrams (fix #10700)

qgis · Apr 13, 2015 · 15b60438c840984a0c1d9208cf86992c5555e6c1 · 15b6043
1 parent d371824
commit 15b60438c840984a0c1d9208cf86992c5555e6c1
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/src/core/diagram/qgstextdiagram.cpp b/src/core/diagram/qgstextdiagram.cpp
@@ -109,13 +109,6 @@ void QgsTextDiagram::renderDiagram( const QgsFeature& feature, QgsRenderContext&
     return;
   }
 
-  double scaleDenominator = c.rendererScale();
-  if (( s.minScaleDenominator != -1 && scaleDenominator < s.minScaleDenominator )
-      || ( s.maxScaleDenominator != -1 && scaleDenominator > s.maxScaleDenominator ) )
-  {
-    return;
-  }
-
   //convert from mm / map units to painter units
   QSizeF spu = sizePainterUnits( s.size, s, c );
   double w = spu.width();

diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -3418,6 +3418,26 @@ void QgsPalLabeling::registerDiagramFeature( const QString& layerID, QgsFeature&
     return;
   }
 
+  QgsDiagramRendererV2* dr = layerIt.value().renderer;
+  if ( dr )
+  {
+    QList<QgsDiagramSettings> settingList = dr->diagramSettings();
+    if ( settingList.size() > 0 )
+    {
+      double minScale = settingList.at( 0 ).minScaleDenominator;
+      if ( minScale > 0 && context.rendererScale() < minScale )
+      {
+        return;
+      }
+
+      double maxScale = settingList.at( 0 ).maxScaleDenominator;
+      if ( maxScale > 0 && context.rendererScale() > maxScale )
+      {
+        return;
+      }
+    }
+  }
+
   //convert geom to geos
   QgsGeometry* geom = feat.geometry();
 
@@ -3456,7 +3476,6 @@ void QgsPalLabeling::registerDiagramFeature( const QString& layerID, QgsFeature&
 
   double diagramWidth = 0;
   double diagramHeight = 0;
-  QgsDiagramRendererV2* dr = layerIt.value().renderer;
   if ( dr )
   {
     QSizeF diagSize = dr->sizeMapUnits( feat, context );
@@ -4004,7 +4023,7 @@ void QgsPalLabeling::drawLabeling( QgsRenderContext& context )
           feature.setFields( &dit.value().fields );
           palGeometry->feature( feature );
           QgsPoint outPt = xform.transform(( *it )->getX(), ( *it )->getY() );
-          dit.value().renderer->renderDiagram( feature, context, QPointF( outPt.x(), outPt.y() ) );
+          dit.value().renderer->renderDiagram( feature, context, outPt.toQPointF() );
         }
       }