sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-27 00:33:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Larry Shaffer 2012-08-16 14:23:14 -06:00
parent 7079f20ebf
commit b2f32144b9
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/qgspallabeling.cpp
View File

@ -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;
}