Fix line offset dxf export

mhugent · mhugent · commit f5c03db78b1d · 2018-04-12T17:08:01.000+02:00
diff --git a/src/core/symbology-ng/qgslinesymbollayerv2.cpp b/src/core/symbology-ng/qgslinesymbollayerv2.cpp
@@ -654,7 +654,13 @@ double QgsSimpleLineSymbolLayerV2::dxfOffset( const QgsDxfExport& e, QgsSymbolV2
     context.setOriginalValueVariable( mOffset );
     offset = evaluateDataDefinedProperty( QgsSymbolLayerV2::EXPR_OFFSET, context, mOffset ).toDouble();
   }
-  return offset;
+
+  offset *= e.mapUnitScaleFactor( e.symbologyScaleDenominator(), offsetUnit(), e.mapUnits(), context.renderContext().mapToPixel().mapUnitsPerPixel() );
+  if ( mOffsetUnit == QgsSymbolV2::MapUnit )
+  {
+    e.clipValueToMapUnitScale( offset, mOffsetMapUnitScale, context.renderContext().scaleFactor() );
+  }
+  return -offset; //direction seems to be inverse to symbology offset
 }
 
 /////////

Original file line number	Diff line number	Diff line change
`@@ -654,7 +654,13 @@ double QgsSimpleLineSymbolLayerV2::dxfOffset( const QgsDxfExport& e, QgsSymbolV2`
`654`	`654`	`context.setOriginalValueVariable( mOffset );`
`655`	`655`	`offset = evaluateDataDefinedProperty( QgsSymbolLayerV2::EXPR_OFFSET, context, mOffset ).toDouble();`
`656`	`656`	`}`
`657`		`- return offset;`
	`657`	`+`
	`658`	`+ offset *= e.mapUnitScaleFactor( e.symbologyScaleDenominator(), offsetUnit(), e.mapUnits(), context.renderContext().mapToPixel().mapUnitsPerPixel() );`
	`659`	`+ if ( mOffsetUnit == QgsSymbolV2::MapUnit )`
	`660`	`+ {`
	`661`	`+ e.clipValueToMapUnitScale( offset, mOffsetMapUnitScale, context.renderContext().scaleFactor() );`
	`662`	`+ }`
	`663`	`+ return -offset; //direction seems to be inverse to symbology offset`
`658`	`664`	`}`
`659`	`665`
`660`	`666`	`/////////`