Fix for dxf label export

mhugent · mhugent · commit f45e1123440f · 2014-02-03T09:30:36.000+01:00
diff --git a/src/core/dxf/qgsdxfexport.cpp b/src/core/dxf/qgsdxfexport.cpp
@@ -581,7 +581,6 @@ void QgsDxfExport::writeEntities()
     QgsFeatureRendererV2* renderer = vl->rendererV2();
     renderer->startRender( ctx, vl );
 
-    //todo: call mLabeling.prepareLayer(...)
     QSet<int> attrIndex;
     bool labelLayer = ( labelEngine.prepareLayer( vl, attrIndex, ctx ) != 0 );
 
diff --git a/src/core/dxf/qgsdxfpallabeling.cpp b/src/core/dxf/qgsdxfpallabeling.cpp
@@ -43,6 +43,7 @@ QgsDxfPalLabeling::QgsDxfPalLabeling( QgsDxfExport* dxf, const QgsRectangle& bbo
   mRenderContext.setRendererScale( scale );
   mRenderContext.setExtent( bbox );
   mRenderContext.setScaleFactor( 96.0 / 25.4 );
+  mRenderContext.setMapToPixel( QgsMapToPixel( 1.0 / factor, bbox.xMinimum(), bbox.yMinimum(), bbox.height() * factor ) );
 }
 
 QgsDxfPalLabeling::~QgsDxfPalLabeling()

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ QgsDxfPalLabeling::QgsDxfPalLabeling( QgsDxfExport* dxf, const QgsRectangle& bbo`
`43`	`43`	`mRenderContext.setRendererScale( scale );`
`44`	`44`	`mRenderContext.setExtent( bbox );`
`45`	`45`	`mRenderContext.setScaleFactor( 96.0 / 25.4 );`
	`46`	`+ mRenderContext.setMapToPixel( QgsMapToPixel( 1.0 / factor, bbox.xMinimum(), bbox.yMinimum(), bbox.height() * factor ) );`
`46`	`47`	`}`
`47`	`48`
`48`	`49`	`QgsDxfPalLabeling::~QgsDxfPalLabeling()`