Fix scale-dependent, data defined fields test against renderer's scale for accuracy

dakcarto · dakcarto · commit b2f32144b976 · 2012-08-16T14:23:14.000-06:00
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;
       }

Original file line number	Diff line number	Diff line change
`@@ -522,9 +522,8 @@ void QgsPalLayerSettings::registerFeature( QgsVectorLayer* layer, QgsFeature& f`
`522`	`522`	`if ( minScaleValue.isValid() )`
`523`	`523`	`{`
`524`	`524`	`bool conversionOk;`
`525`		`- int minScale = minScaleValue.toInt( &conversionOk );`
`526`		`- // TODO: occasional floating point issues?`
`527`		`- if ( conversionOk && ( int )( context.rendererScale() ) < minScale )`
	`525`	`+ double minScale = minScaleValue.toDouble( &conversionOk );`
	`526`	`+ if ( conversionOk && context.rendererScale() < minScale )`
`528`	`527`	`{`
`529`	`528`	`return;`
`530`	`529`	`}`
`@@ -539,9 +538,8 @@ void QgsPalLayerSettings::registerFeature( QgsVectorLayer* layer, QgsFeature& f`
`539`	`538`	`if ( maxScaleValue.isValid() )`
`540`	`539`	`{`
`541`	`540`	`bool conversionOk;`
`542`		`- int maxScale = maxScaleValue.toInt( &conversionOk );`
`543`		`- // TODO: occasional floating point issues?`
`544`		`- if ( conversionOk && ( int )( context.rendererScale() ) > maxScale )`
	`541`	`+ double maxScale = maxScaleValue.toDouble( &conversionOk );`
	`542`	`+ if ( conversionOk && context.rendererScale() > maxScale )`
`545`	`543`	`{`
`546`	`544`	`return;`
`547`	`545`	`}`