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

nyalldawson · nyalldawson · commit 15ba00640885 · 2015-06-01T07:05:35.000+10:00
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -2127,17 +2127,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
`@@ -2127,17 +2127,12 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, const QgsRenderContext`
`2127`	`2127`	`}`
`2128`	`2128`	`}`
`2129`	`2129`
`2130`		`- if ( repeatDist != 0 )`
	`2130`	`+ if ( !qgsDoubleNear( repeatDist, 0.0 ) )`
`2131`	`2131`	`{`
`2132`		`- if ( repeatdistinmapunit ) //convert distance from mm/map units to pixels`
	`2132`	`+ if ( !repeatdistinmapunit )`
`2133`	`2133`	`{`
`2134`		`- repeatDist /= repeatDistanceMapUnitScale.computeMapUnitsPerPixel( context ) * context.scaleFactor();`
	`2134`	`+ repeatDist *= mapUntsPerMM; //convert repeat distance from mm to map units`
`2135`	`2135`	`}`
`2136`		`- else //mm`
`2137`		`- {`
`2138`		`- repeatDist *= vectorScaleFactor;`
`2139`		`- }`
`2140`		`- repeatDist *= qAbs( ptOne.x() - ptZero.x() );`
`2141`	`2136`	`}`
`2142`	`2137`
`2143`	`2138`	`// feature to the layer`