sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

[labeling] Fix broken repeat distance in map units (fix #11937)

Browse Source
This commit is contained in:
Nyall Dawson 2015-06-01 07:05:35 +10:00
parent c550af2ee3
commit 15ba006408
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/qgspallabeling.cpp
View File

@ -2127,17 +2127,12 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, const QgsRenderContext
}
}
if ( repeatDist != 0 )
if ( !qgsDoubleNear( repeatDist, 0.0 ) )
{
if ( repeatdistinmapunit ) //convert distance from mm/map units to pixels
if ( !repeatdistinmapunit )
{
repeatDist /= repeatDistanceMapUnitScale.computeMapUnitsPerPixel( context ) * context.scaleFactor();
repeatDist *= mapUntsPerMM; //convert repeat distance from mm to map units
}
else //mm
{
repeatDist *= vectorScaleFactor;
}
repeatDist *= qAbs( ptOne.x() - ptZero.x() );
}
// feature to the layer