Fix dxf label export

mhugent · mhugent · commit 211399cec613 · 2014-06-06T14:00:51.000+02:00
diff --git a/src/core/dxf/qgsdxfexport.cpp b/src/core/dxf/qgsdxfexport.cpp
@@ -585,7 +585,8 @@ void QgsDxfExport::writeEntities()
 
     bool labelLayer = ( labelEngine.prepareLayer( vl, attributes, ctx ) != 0 );
 
-    if ( mSymbologyExport == QgsDxfExport::SymbolLayerSymbology && renderer->usingSymbolLevels() )
+    if ( mSymbologyExport == QgsDxfExport::SymbolLayerSymbology && ( renderer->capabilities() & QgsFeatureRendererV2::SymbolLevels ) &&
+         renderer->usingSymbolLevels() )
     {
       writeEntitiesSymbolLevels( vl );
       renderer->stopRender( ctx );
@@ -652,7 +653,6 @@ void QgsDxfExport::writeEntities()
   }
 
   labelEngine.drawLabeling( ctx );
-
   endSection();
 }
 
diff --git a/src/core/dxf/qgsdxfpallabeling.cpp b/src/core/dxf/qgsdxfpallabeling.cpp
@@ -29,15 +29,19 @@ using namespace pal;
 QgsDxfPalLabeling::QgsDxfPalLabeling( QgsDxfExport* dxf, const QgsRectangle& bbox, double scale, QGis::UnitType mapUnits )
     : QgsPalLabeling()
     , mDxfExport( dxf )
+    , mImage( 0 )
+    , mPainter( 0 )
 {
-  QgsMapSettings settings;
-  settings.setExtent( bbox );
+  mSettings = new QgsMapSettings;
+  mSettings->setMapUnits( mapUnits );
+  mSettings->setExtent( bbox );
 
   int dpi = 96;
   double factor = 1000 * dpi / scale / 25.4 * QGis::fromUnitToUnitFactor( mapUnits, QGis::Meters );
-  settings.setOutputSize( QSize( bbox.width() * factor, bbox.height() * factor ) );
-  settings.setOutputDpi( dpi );
-  init( settings );
+  mSettings->setOutputSize( QSize( bbox.width() * factor, bbox.height() * factor ) );
+  mSettings->setOutputDpi( dpi );
+  mSettings->setCrsTransformEnabled( false );
+  init( *mSettings );
 
   mImage = new QImage( 10, 10, QImage::Format_ARGB32_Premultiplied );
   mImage->setDotsPerMeterX( 96 / 25.4 * 1000 );
@@ -54,6 +58,7 @@ QgsDxfPalLabeling::~QgsDxfPalLabeling()
 {
   delete mPainter;
   delete mImage;
+  delete mSettings;
 }
 
 void QgsDxfPalLabeling::drawLabel( pal::LabelPosition* label, QgsRenderContext& context, QgsPalLayerSettings& tmpLyr, DrawLabelType drawType, double dpiRatio )
diff --git a/src/core/dxf/qgsdxfpallabeling.h b/src/core/dxf/qgsdxfpallabeling.h
@@ -40,6 +40,7 @@ class CORE_EXPORT QgsDxfPalLabeling: public QgsPalLabeling
     //only used for render context
     QImage* mImage;
     QPainter* mPainter;
+    QgsMapSettings* mSettings;
 };
 
 #endif // QGSDXFPALLABELING_H

Original file line number	Diff line number	Diff line change
`@@ -585,7 +585,8 @@ void QgsDxfExport::writeEntities()`
`585`	`585`
`586`	`586`	`bool labelLayer = ( labelEngine.prepareLayer( vl, attributes, ctx ) != 0 );`
`587`	`587`
`588`		`- if ( mSymbologyExport == QgsDxfExport::SymbolLayerSymbology && renderer->usingSymbolLevels() )`
	`588`	`+ if ( mSymbologyExport == QgsDxfExport::SymbolLayerSymbology && ( renderer->capabilities() & QgsFeatureRendererV2::SymbolLevels ) &&`
	`589`	`+ renderer->usingSymbolLevels() )`
`589`	`590`	`{`
`590`	`591`	`writeEntitiesSymbolLevels( vl );`
`591`	`592`	`renderer->stopRender( ctx );`
`@@ -652,7 +653,6 @@ void QgsDxfExport::writeEntities()`
`652`	`653`	`}`
`653`	`654`
`654`	`655`	`labelEngine.drawLabeling( ctx );`
`655`		`-`
`656`	`656`	`endSection();`
`657`	`657`	`}`
`658`	`658`