Skip to content

Commit ee09131

Browse files
committedJul 27, 2016
Revert "Bump default number of label candidates"
AKA f***ing label tests!!! This reverts commit cd22d4f.
1 parent 9db46ef commit ee09131

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed
 

‎src/core/pal/pal.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ Pal::Pal()
7171

7272
setSearch( CHAIN );
7373

74-
point_p = 16;
75-
line_p = 50;
76-
poly_p = 30;
74+
point_p = 8;
75+
line_p = 8;
76+
poly_p = 8;
7777

7878
showPartial = true;
7979
}

‎src/core/qgslabelingenginev2.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ class QgsLabelSorter
7171
QgsLabelingEngineV2::QgsLabelingEngineV2()
7272
: mFlags( RenderOutlineLabels | UsePartialCandidates )
7373
, mSearchMethod( QgsPalLabeling::Chain )
74-
, mCandPoint( 16 )
75-
, mCandLine( 50 )
76-
, mCandPolygon( 30 )
74+
, mCandPoint( 8 )
75+
, mCandLine( 8 )
76+
, mCandPolygon( 8 )
7777
, mResults( nullptr )
7878
{
7979
mResults = new QgsLabelingResults;
@@ -346,9 +346,9 @@ void QgsLabelingEngineV2::readSettingsFromProject()
346346
bool saved = false;
347347
QgsProject* prj = QgsProject::instance();
348348
mSearchMethod = static_cast< QgsPalLabeling::Search >( prj->readNumEntry( "PAL", "/SearchMethod", static_cast< int >( QgsPalLabeling::Chain ), &saved ) );
349-
mCandPoint = prj->readNumEntry( "PAL", "/CandidatesPoint", 16, &saved );
350-
mCandLine = prj->readNumEntry( "PAL", "/CandidatesLine", 50, &saved );
351-
mCandPolygon = prj->readNumEntry( "PAL", "/CandidatesPolygon", 30, &saved );
349+
mCandPoint = prj->readNumEntry( "PAL", "/CandidatesPoint", 8, &saved );
350+
mCandLine = prj->readNumEntry( "PAL", "/CandidatesLine", 8, &saved );
351+
mCandPolygon = prj->readNumEntry( "PAL", "/CandidatesPolygon", 8, &saved );
352352

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

0 commit comments

Comments
 (0)
Please sign in to comment.