Skip to content

Commit 818d97e

Browse files
committed
Fix #7866
1 parent 827f2d4 commit 818d97e

File tree

5 files changed

+5
-4
lines changed

5 files changed

+5
-4
lines changed

src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ QgsCategorizedSymbolRendererV2::QgsCategorizedSymbolRendererV2( QString attrName
142142
mCategories( categories ),
143143
mSourceSymbol( NULL ),
144144
mSourceColorRamp( NULL ),
145-
mScaleMethod( QgsSymbolV2::ScaleArea ),
145+
mScaleMethod( DEFAULT_SCALE_METHOD ),
146146
mRotationFieldIdx( -1 ),
147147
mSizeScaleFieldIdx( -1 )
148148
{

src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ QgsGraduatedSymbolRendererV2::QgsGraduatedSymbolRendererV2( QString attrName, Qg
158158
mMode( Custom ),
159159
mSourceSymbol( NULL ),
160160
mSourceColorRamp( NULL ),
161-
mScaleMethod( QgsSymbolV2::ScaleArea ),
161+
mScaleMethod( DEFAULT_SCALE_METHOD ),
162162
mRotationFieldIdx( -1 ),
163163
mSizeScaleFieldIdx( -1 )
164164
{

src/core/symbology-ng/qgsmarkersymbollayerv2.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#define DEFAULT_SIMPLEMARKER_BORDERCOLOR QColor(0,0,0)
2525
#define DEFAULT_SIMPLEMARKER_SIZE DEFAULT_POINT_SIZE
2626
#define DEFAULT_SIMPLEMARKER_ANGLE 0
27-
#define DEFAULT_SCALE_METHOD QgsSymbolV2::ScaleArea
2827

2928
#include <QPen>
3029
#include <QBrush>

src/core/symbology-ng/qgssinglesymbolrendererv2.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
#include <QDomElement>
2828

2929
QgsSingleSymbolRendererV2::QgsSingleSymbolRendererV2( QgsSymbolV2* symbol )
30-
: QgsFeatureRendererV2( "singleSymbol" ), mRotationFieldIdx( -1 ), mSizeScaleFieldIdx( -1 ), mTempSymbol( NULL )
30+
: QgsFeatureRendererV2( "singleSymbol" ), mScaleMethod( DEFAULT_SCALE_METHOD ), mRotationFieldIdx( -1 ),
31+
mSizeScaleFieldIdx( -1 ), mTempSymbol( NULL )
3132
{
3233
Q_ASSERT( symbol );
3334
mSymbol = symbol;

src/core/symbology-ng/qgssymbollayerv2.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#endif
2222

2323
#define DEG2RAD(x) ((x)*M_PI/180)
24+
#define DEFAULT_SCALE_METHOD QgsSymbolV2::ScaleArea
2425

2526
#include <QColor>
2627
#include <QMap>

0 commit comments

Comments
 (0)