Skip to content
Permalink
Browse files

different fix for 5a1bcf3

  • Loading branch information
jef-n committed Dec 7, 2013
1 parent 7a0b36c commit 5192e8dc7a6636bbe9339fcab4935059b5e2ea44
@@ -18,6 +18,7 @@
#include "qgsexpression.h"
#include "qgsrendercontext.h"
#include "qgsvectorlayer.h"
#include "qgsdxfexport.h"

#include <QSize>
#include <QPainter>
@@ -76,6 +77,23 @@ void QgsSymbolLayerV2::removeDataDefinedProperties()
mDataDefinedProperties.clear();
}

bool QgsSymbolLayerV2::writeDxf( QgsDxfExport& e,
double mmMapUnitScaleFactor,
const QString& layerName,
const QgsSymbolV2RenderContext* context,
const QgsFeature* f,
const QPointF& shift ) const
{
Q_UNUSED( e );
Q_UNUSED( mmMapUnitScaleFactor );
Q_UNUSED( layerName );
Q_UNUSED( context );
Q_UNUSED( f );
Q_UNUSED( shift );
return false;
}


void QgsSymbolLayerV2::prepareExpressions( const QgsVectorLayer* vl, double scale )
{
if ( !vl )
@@ -31,13 +31,14 @@
#include <QDomElement>

#include "qgssymbolv2.h"

#include "qgssymbollayerv2utils.h" // QgsStringMap
#include "qgsdxfexport.h"

class QPainter;
class QSize;
class QPolygonF;

class QgsDxfExport;
class QgsExpression;
class QgsRenderContext;

@@ -93,8 +94,12 @@ class CORE_EXPORT QgsSymbolLayerV2
virtual void removeDataDefinedProperties();
bool hasDataDefinedProperties() const { return mDataDefinedProperties.size() > 0; }

virtual bool writeDxf( QgsDxfExport& e, double mmMapUnitScaleFactor, const QString& layerName, const QgsSymbolV2RenderContext* context, const QgsFeature* f, const QPointF& shift = QPointF( 0.0, 0.0 ) ) const
{ Q_UNUSED( e ); Q_UNUSED( mmMapUnitScaleFactor ); Q_UNUSED( layerName ); Q_UNUSED( context ); Q_UNUSED( f ); Q_UNUSED( shift ); return false; }
virtual bool writeDxf( QgsDxfExport& e,
double mmMapUnitScaleFactor,
const QString& layerName,
const QgsSymbolV2RenderContext* context,
const QgsFeature* f,
const QPointF& shift = QPointF( 0.0, 0.0 ) ) const;

protected:
QgsSymbolLayerV2( QgsSymbolV2::SymbolType type, bool locked = false )
@@ -392,7 +392,6 @@ INCLUDE_DIRECTORIES(
../core/composer
../core/raster
../core/symbology-ng
../core/dxf
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/../ui
${QWT_INCLUDE_DIR}
@@ -8,7 +8,6 @@ SET (util_SRCS qgscompositionchecker.cpp)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/src/core
${CMAKE_SOURCE_DIR}/src/core/dxf
${CMAKE_SOURCE_DIR}/src/core/composer
${CMAKE_SOURCE_DIR}/src/core/raster
${CMAKE_SOURCE_DIR}/src/core/symbology-ng

0 comments on commit 5192e8d

Please sign in to comment.
You can’t perform that action at this time.