diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index 5bfb76a7e65..3ff27647251 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -38,6 +38,7 @@ INCLUDE_DIRECTORIES( ../src/core/pal ../src/core/composer ../src/core/diagram + ../src/core/dxf ../src/core/gps ../src/core/raster ../src/core/symbology-ng diff --git a/src/core/dxf/qgsdxfexport.cpp b/src/core/dxf/qgsdxfexport.cpp index 18511296f6e..8ca3c32d9dc 100644 --- a/src/core/dxf/qgsdxfexport.cpp +++ b/src/core/dxf/qgsdxfexport.cpp @@ -291,6 +291,23 @@ QgsDxfExport::QgsDxfExport(): mSymbologyScaleDenominator( 1.0 ), mSymbologyExpor { } +QgsDxfExport::QgsDxfExport( const QgsDxfExport& dxfExport ) +{ + *this = dxfExport; +} + +QgsDxfExport& QgsDxfExport::operator=( const QgsDxfExport & dxfExport ) +{ + mLayers = dxfExport.mLayers; + mSymbologyScaleDenominator = dxfExport.mSymbologyScaleDenominator; + mSymbologyExport = dxfExport.mSymbologyExport; + mMapUnits = dxfExport.mMapUnits; + mSymbolLayerCounter = 0; //internal counter + mNextHandleId = 0; + mBlockCounter = 0; + return *this; +} + QgsDxfExport::~QgsDxfExport() { } diff --git a/src/core/dxf/qgsdxfexport.h b/src/core/dxf/qgsdxfexport.h index 9bebde5c7f5..e0cbc10b7da 100644 --- a/src/core/dxf/qgsdxfexport.h +++ b/src/core/dxf/qgsdxfexport.h @@ -40,7 +40,9 @@ class QgsDxfExport }; QgsDxfExport(); + QgsDxfExport( const QgsDxfExport& dxfExport ); ~QgsDxfExport(); + QgsDxfExport& operator=( const QgsDxfExport& dxfExport ); void addLayers( QList< QgsMapLayer* >& layers ) { mLayers = layers; } int writeToFile( QIODevice* d ); //maybe add progress dialog? //other parameters (e.g. scale, dpi)? @@ -84,8 +86,6 @@ class QgsDxfExport QTextStream mTextStream; - QVector mDxfColorPalette; - static double mDxfColors[][3]; int mSymbolLayerCounter; //internal counter