Applied modification from strk to fix label direction, ticket #3643

mhugent · mhugent · commit 9a167ba09492 · 2011-03-29T15:51:33.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@15637 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/pal/feature.cpp b/src/core/pal/feature.cpp
@@ -596,7 +596,7 @@ namespace pal
       {
         //std::cout << alpha*180/M_PI << std::endl;
         if ( flags & FLAG_MAP_ORIENTATION )
-          reversed = ( alpha > M_PI / 2 || alpha < -M_PI / 2 );
+          reversed = ( alpha > M_PI / 2 || alpha <= -M_PI / 2 );
 
         if (( !reversed && ( flags & FLAG_ABOVE_LINE ) ) || ( reversed && ( flags & FLAG_BELOW_LINE ) ) )
           positions->push_back( new LabelPosition( i, bx + cos( beta ) *distlabel , by + sin( beta ) *distlabel, xrm, yrm, alpha, cost, this, reversed ) ); // Line

Original file line number	Diff line number	Diff line change
`@@ -596,7 +596,7 @@ namespace pal`
`596`	`596`	`{`
`597`	`597`	`//std::cout << alpha*180/M_PI << std::endl;`
`598`	`598`	`if ( flags & FLAG_MAP_ORIENTATION )`
`599`		`- reversed = ( alpha > M_PI / 2 \|\| alpha < -M_PI / 2 );`
	`599`	`+ reversed = ( alpha > M_PI / 2 \|\| alpha <= -M_PI / 2 );`
`600`	`600`
`601`	`601`	`if (( !reversed && ( flags & FLAG_ABOVE_LINE ) ) \|\| ( reversed && ( flags & FLAG_BELOW_LINE ) ) )`
`602`	`602`	`positions->push_back( new LabelPosition( i, bx + cos( beta ) distlabel , by + sin( beta ) distlabel, xrm, yrm, alpha, cost, this, reversed ) ); // Line`