Skip to content
Permalink
Browse files

Bump default number of label candidates

Results in much nicer label placement and little to no speed
regression in most cases

(cherry-picked from ed69bf2)
  • Loading branch information
nyalldawson committed Aug 9, 2016
1 parent 4e69a3e commit b3b372d94cc75e862fa4cca0c3630724a31d3b79
Showing with 9 additions and 9 deletions.
  1. +3 −3 src/core/pal/pal.cpp
  2. +6 −6 src/core/qgslabelingenginev2.cpp
@@ -71,9 +71,9 @@ Pal::Pal()

setSearch( CHAIN );

point_p = 8;
line_p = 8;
poly_p = 8;
point_p = 16;
line_p = 50;
poly_p = 30;

showPartial = true;
}
@@ -71,9 +71,9 @@ class QgsLabelSorter
QgsLabelingEngineV2::QgsLabelingEngineV2()
: mFlags( RenderOutlineLabels | UsePartialCandidates )
, mSearchMethod( QgsPalLabeling::Chain )
, mCandPoint( 8 )
, mCandLine( 8 )
, mCandPolygon( 8 )
, mCandPoint( 16 )
, mCandLine( 50 )
, mCandPolygon( 30 )
, mResults( nullptr )
{
mResults = new QgsLabelingResults;
@@ -343,9 +343,9 @@ void QgsLabelingEngineV2::readSettingsFromProject()
bool saved = false;
QgsProject* prj = QgsProject::instance();
mSearchMethod = static_cast< QgsPalLabeling::Search >( prj->readNumEntry( "PAL", "/SearchMethod", static_cast< int >( QgsPalLabeling::Chain ), &saved ) );
mCandPoint = prj->readNumEntry( "PAL", "/CandidatesPoint", 8, &saved );
mCandLine = prj->readNumEntry( "PAL", "/CandidatesLine", 8, &saved );
mCandPolygon = prj->readNumEntry( "PAL", "/CandidatesPolygon", 8, &saved );
mCandPoint = prj->readNumEntry( "PAL", "/CandidatesPoint", 16, &saved );
mCandLine = prj->readNumEntry( "PAL", "/CandidatesLine", 50, &saved );
mCandPolygon = prj->readNumEntry( "PAL", "/CandidatesPolygon", 30, &saved );

mFlags = nullptr;
if ( prj->readBoolEntry( "PAL", "/ShowingCandidates", false, &saved ) ) mFlags |= DrawCandidates;

0 comments on commit b3b372d

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