[pal] Respect user set number of line candidates

nyalldawson · nyalldawson · commit 7797e80c66d2 · 2016-08-09T16:55:07.000+10:00
The number of positions used for generating line label candidates
was hardcoded and was not using the pal number of line candidate
setting.

This change means the number of line candidates can be bumped up
resulting in more candidates actually being generated and
a better final label placement
diff --git a/src/core/pal/feature.cpp b/src/core/pal/feature.cpp
@@ -641,9 +641,8 @@ int FeaturePart::createCandidatesAlongLine( QList< LabelPosition* >& lPos, Point
 
   if ( nbls > 0 )
   {
-    //dist /= nbls;
     l = 0;
-    dist = qMin( yrm, xrm );
+    dist = qMin( qMin( yrm, xrm ), dist / mLF->layer()->pal->line_p );
   }
   else   // line length < label with => centering label position
   {
@@ -1002,7 +1001,7 @@ int FeaturePart::createCurvedCandidatesAlongLine( QList< LabelPosition* >& lPos,
   bool isRightToLeft = ( lineAngle > M_PI / 2 || lineAngle <= -M_PI / 2 );
 
   QLinkedList<LabelPosition*> positions;
-  double delta = qMax( li->label_height, total_distance / 10.0 );
+  double delta = qMax( li->label_height, total_distance / mLF->layer()->pal->line_p );
 
   unsigned long flags = mLF->layer()->arrangementFlags();
   if ( flags == 0 )

Original file line number	Diff line number	Diff line change
`@@ -641,9 +641,8 @@ int FeaturePart::createCandidatesAlongLine( QList< LabelPosition* >& lPos, Point`
`641`	`641`
`642`	`642`	`if ( nbls > 0 )`
`643`	`643`	`{`
`644`		`- //dist /= nbls;`
`645`	`644`	`l = 0;`
`646`		`- dist = qMin( yrm, xrm );`
	`645`	`+ dist = qMin( qMin( yrm, xrm ), dist / mLF->layer()->pal->line_p );`
`647`	`646`	`}`
`648`	`647`	`else // line length < label with => centering label position`
`649`	`648`	`{`
`@@ -1002,7 +1001,7 @@ int FeaturePart::createCurvedCandidatesAlongLine( QList< LabelPosition* >& lPos,`
`1002`	`1001`	`bool isRightToLeft = ( lineAngle > M_PI / 2 \|\| lineAngle <= -M_PI / 2 );`
`1003`	`1002`
`1004`	`1003`	`QLinkedList<LabelPosition*> positions;`
`1005`		`- double delta = qMax( li->label_height, total_distance / 10.0 );`
	`1004`	`+ double delta = qMax( li->label_height, total_distance / mLF->layer()->pal->line_p );`
`1006`	`1005`
`1007`	`1006`	`unsigned long flags = mLF->layer()->arrangementFlags();`
`1008`	`1007`	`if ( flags == 0 )`