[QGIS Commit] r11415 - branches/symbology-ng-branch/src/core/pal

[svn_qgis at osgeo.org]

Author: wonder
Date: 2009-08-17 16:08:57 -0400 (Mon, 17 Aug 2009)
New Revision: 11415

Modified:
   branches/symbology-ng-branch/src/core/pal/labelposition.cpp
Log:
pal: fixed occasional upside-down characters when using curved labels


Modified: branches/symbology-ng-branch/src/core/pal/labelposition.cpp
===================================================================
--- branches/symbology-ng-branch/src/core/pal/labelposition.cpp	2009-08-17 19:39:22 UTC (rev 11414)
+++ branches/symbology-ng-branch/src/core/pal/labelposition.cpp	2009-08-17 20:08:57 UTC (rev 11415)
@@ -89,8 +89,9 @@
     x[3] = x1 + dx2;
     y[3] = y1 + dy2;
 
-    // upside down ?
-    if ( this->alpha > M_PI / 2 && this->alpha <= 3*M_PI / 2 )
+    // upside down ? (curved labels are always correct)
+    if ( feature->getLayer()->getArrangement() != P_CURVED &&
+         this->alpha > M_PI / 2 && this->alpha <= 3*M_PI / 2 )
     {
       tx = x[0];
       ty = y[0];