Avoid labels being marked as overlapping obstacles when features

neighbour each other (cherry-picked from 655fc93)
qgis · Aug 9, 2016 · 93389a8 · 93389a8
1 parent 00e9c32
commit 93389a8
Showing 1 changed file with 16 additions and 8 deletions.
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -2926,16 +2926,24 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, QgsRenderContext &cont
     }
   }
 
+  if ( distinmapunit ) //convert distance from mm/map units to pixels
+  {
+    distance /= distMapUnitScale.computeMapUnitsPerPixel( context );
+  }
+  else //mm
+  {
+    distance *= vectorScaleFactor;
+  }
+
+  // when using certain placement modes, we force a tiny minimum distance. This ensures that
+  // candidates are created just offset from a border and avoids candidates being incorrectly flagged as colliding with neighbours
+  if ( placement == QgsPalLayerSettings::Line || placement == QgsPalLayerSettings::Curved || placement == QgsPalLayerSettings::PerimeterCurved )
+  {
+    distance = qMax( distance, 1.0 );
+  }
+
   if ( !qgsDoubleNear( distance, 0.0 ) )
   {
-    if ( distinmapunit ) //convert distance from mm/map units to pixels
-    {
-      distance /= distMapUnitScale.computeMapUnitsPerPixel( context );
-    }
-    else //mm
-    {
-      distance *= vectorScaleFactor;
-    }
     double d = ptOne.distance( ptZero ) * distance;
     ( *labelFeature )->setDistLabel( d );
   }