Fix scale-dependent, data defined fields test against renderer's scal…

…e for accuracy
qgis · Aug 16, 2012 · b2f3214 · b2f3214
1 parent 7079f20
commit b2f3214
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -522,9 +522,8 @@ void QgsPalLayerSettings::registerFeature( QgsVectorLayer* layer,  QgsFeature& f
     if ( minScaleValue.isValid() )
     {
       bool conversionOk;
-      int minScale = minScaleValue.toInt( &conversionOk );
-      // TODO: occasional floating point issues?
-      if ( conversionOk && ( int )( context.rendererScale() ) < minScale )
+      double minScale = minScaleValue.toDouble( &conversionOk );
+      if ( conversionOk && context.rendererScale() < minScale )
       {
         return;
       }
@@ -539,9 +538,8 @@ void QgsPalLayerSettings::registerFeature( QgsVectorLayer* layer,  QgsFeature& f
     if ( maxScaleValue.isValid() )
     {
       bool conversionOk;
-      int maxScale = maxScaleValue.toInt( &conversionOk );
-      // TODO: occasional floating point issues?
-      if ( conversionOk && ( int )( context.rendererScale() ) > maxScale )
+      double maxScale = maxScaleValue.toDouble( &conversionOk );
+      if ( conversionOk && context.rendererScale() > maxScale )
       {
         return;
       }