Fix marker line offset along line unit is ignored when in Interval mode

nyalldawson · nyalldawson · commit fc258ab58c9c · 2019-03-22T13:42:12.000+10:00
(cherry picked from commit e7389db)
diff --git a/src/core/symbology/qgslinesymbollayer.cpp b/src/core/symbology/qgslinesymbollayer.cpp
@@ -1013,7 +1013,7 @@ void QgsMarkerLineSymbolLayer::renderPolylineInterval( const QPolygonF &points,
   }
 
   double painterUnitInterval = rc.convertToPainterUnits( interval, mIntervalUnit, mIntervalMapUnitScale );
-  lengthLeft = painterUnitInterval - rc.convertToPainterUnits( offsetAlongLine, mIntervalUnit, mIntervalMapUnitScale );
+  lengthLeft = painterUnitInterval - rc.convertToPainterUnits( offsetAlongLine, mOffsetAlongLineUnit, mOffsetAlongLineMapUnitScale );
 
   int pointNum = 0;
   for ( int i = 1; i < points.count(); ++i )

Original file line number	Diff line number	Diff line change
`@@ -1013,7 +1013,7 @@ void QgsMarkerLineSymbolLayer::renderPolylineInterval( const QPolygonF &points,`
`1013`	`1013`	`}`
`1014`	`1014`
`1015`	`1015`	`double painterUnitInterval = rc.convertToPainterUnits( interval, mIntervalUnit, mIntervalMapUnitScale );`
`1016`		`- lengthLeft = painterUnitInterval - rc.convertToPainterUnits( offsetAlongLine, mIntervalUnit, mIntervalMapUnitScale );`
	`1016`	`+ lengthLeft = painterUnitInterval - rc.convertToPainterUnits( offsetAlongLine, mOffsetAlongLineUnit, mOffsetAlongLineMapUnitScale );`
`1017`	`1017`
`1018`	`1018`	`int pointNum = 0;`
`1019`	`1019`	`for ( int i = 1; i < points.count(); ++i )`