[labeling] Fix broken repeat distance in map units (fix #11937)

nyalldawson · nyalldawson · commit 5378f7366df2 · 2015-06-24T21:47:58.000+10:00
Cherry-picked from 15ba006
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -2175,17 +2175,12 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, const QgsRenderContext
     }
   }
 
-  if ( repeatDist != 0 )
+  if ( !qgsDoubleNear( repeatDist, 0.0 ) )
   {
-    if ( repeatdistinmapunit ) //convert distance from mm/map units to pixels
+    if ( !repeatdistinmapunit )
     {
-      repeatDist /= repeatDistanceMapUnitScale.computeMapUnitsPerPixel( context ) * context.scaleFactor();
+      repeatDist *= mapUntsPerMM; //convert repeat distance from mm to map units
     }
-    else //mm
-    {
-      repeatDist *= vectorScaleFactor;
-    }
-    repeatDist *= qAbs( ptOne.x() - ptZero.x() );
   }
 
   //  feature to the layer

Original file line number	Diff line number	Diff line change
`@@ -2175,17 +2175,12 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, const QgsRenderContext`
`2175`	`2175`	`}`
`2176`	`2176`	`}`
`2177`	`2177`
`2178`		`- if ( repeatDist != 0 )`
	`2178`	`+ if ( !qgsDoubleNear( repeatDist, 0.0 ) )`
`2179`	`2179`	`{`
`2180`		`- if ( repeatdistinmapunit ) //convert distance from mm/map units to pixels`
	`2180`	`+ if ( !repeatdistinmapunit )`
`2181`	`2181`	`{`
`2182`		`- repeatDist /= repeatDistanceMapUnitScale.computeMapUnitsPerPixel( context ) * context.scaleFactor();`
	`2182`	`+ repeatDist *= mapUntsPerMM; //convert repeat distance from mm to map units`
`2183`	`2183`	`}`
`2184`		`- else //mm`
`2185`		`- {`
`2186`		`- repeatDist *= vectorScaleFactor;`
`2187`		`- }`
`2188`		`- repeatDist *= qAbs( ptOne.x() - ptZero.x() );`
`2189`	`2184`	`}`
`2190`	`2185`
`2191`	`2186`	`// feature to the layer`