Skip to content
Permalink
Browse files

pal: fixed scale-based labeling. Removed one more conversion of label…

… distance.

git-svn-id: http://svn.osgeo.org/qgis/branches/symbology-ng-branch@11024 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
wonder
wonder committed Jul 4, 2009
1 parent 2429be4 commit a557c23061f95f1542b7506d757594b956fcdd70
Showing with 4 additions and 3 deletions.
  1. +4 −3 src/core/pal/pal.cpp
@@ -255,7 +255,7 @@ namespace pal


// feature has to be labeled ?
if ( context->layer->toLabel )
if ( context->layer->toLabel && context->layer->isScaleValid( context->scale ) )
{
// is the feature well defined ? // TODO Check epsilon
if ( ft_ptr->label_x > 0.0000001 && ft_ptr->label_y > 0.0000001 )
@@ -479,10 +479,11 @@ namespace pal

double dist;

double distlabel = unit_convert( double( lp->feature->distlabel ),
double distlabel = lp->feature->distlabel;
/*unit_convert( double( lp->feature->distlabel ),
pal::PIXEL,
pal->map_unit,
pal->dpi, scale, 1 );
pal->dpi, scale, 1 );*/



0 comments on commit a557c23

Please sign in to comment.
You can’t perform that action at this time.