Fix #7866

mhugent · mhugent · commit 818d97ee40dd · 2013-05-23T11:35:39.000+02:00
diff --git a/src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp b/src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp
@@ -142,7 +142,7 @@ QgsCategorizedSymbolRendererV2::QgsCategorizedSymbolRendererV2( QString attrName
     mCategories( categories ),
     mSourceSymbol( NULL ),
     mSourceColorRamp( NULL ),
-    mScaleMethod( QgsSymbolV2::ScaleArea ),
+    mScaleMethod( DEFAULT_SCALE_METHOD ),
     mRotationFieldIdx( -1 ),
     mSizeScaleFieldIdx( -1 )
 {
diff --git a/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp b/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
@@ -158,7 +158,7 @@ QgsGraduatedSymbolRendererV2::QgsGraduatedSymbolRendererV2( QString attrName, Qg
     mMode( Custom ),
     mSourceSymbol( NULL ),
     mSourceColorRamp( NULL ),
-    mScaleMethod( QgsSymbolV2::ScaleArea ),
+    mScaleMethod( DEFAULT_SCALE_METHOD ),
     mRotationFieldIdx( -1 ),
     mSizeScaleFieldIdx( -1 )
 {
diff --git a/src/core/symbology-ng/qgsmarkersymbollayerv2.h b/src/core/symbology-ng/qgsmarkersymbollayerv2.h
@@ -24,7 +24,6 @@
 #define DEFAULT_SIMPLEMARKER_BORDERCOLOR  QColor(0,0,0)
 #define DEFAULT_SIMPLEMARKER_SIZE         DEFAULT_POINT_SIZE
 #define DEFAULT_SIMPLEMARKER_ANGLE        0
-#define DEFAULT_SCALE_METHOD              QgsSymbolV2::ScaleArea
 
 #include <QPen>
 #include <QBrush>
diff --git a/src/core/symbology-ng/qgssinglesymbolrendererv2.cpp b/src/core/symbology-ng/qgssinglesymbolrendererv2.cpp
@@ -27,7 +27,8 @@
 #include <QDomElement>
 
 QgsSingleSymbolRendererV2::QgsSingleSymbolRendererV2( QgsSymbolV2* symbol )
-    : QgsFeatureRendererV2( "singleSymbol" ), mRotationFieldIdx( -1 ), mSizeScaleFieldIdx( -1 ), mTempSymbol( NULL )
+    : QgsFeatureRendererV2( "singleSymbol" ), mScaleMethod( DEFAULT_SCALE_METHOD ), mRotationFieldIdx( -1 ),
+    mSizeScaleFieldIdx( -1 ), mTempSymbol( NULL )
 {
   Q_ASSERT( symbol );
   mSymbol = symbol;
diff --git a/src/core/symbology-ng/qgssymbollayerv2.h b/src/core/symbology-ng/qgssymbollayerv2.h
@@ -21,6 +21,7 @@
 #endif
 
 #define DEG2RAD(x)    ((x)*M_PI/180)
+#define DEFAULT_SCALE_METHOD              QgsSymbolV2::ScaleArea
 
 #include <QColor>
 #include <QMap>

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ QgsCategorizedSymbolRendererV2::QgsCategorizedSymbolRendererV2( QString attrName`
`142`	`142`	`mCategories( categories ),`
`143`	`143`	`mSourceSymbol( NULL ),`
`144`	`144`	`mSourceColorRamp( NULL ),`
`145`		`- mScaleMethod( QgsSymbolV2::ScaleArea ),`
	`145`	`+ mScaleMethod( DEFAULT_SCALE_METHOD ),`
`146`	`146`	`mRotationFieldIdx( -1 ),`
`147`	`147`	`mSizeScaleFieldIdx( -1 )`
`148`	`148`	`{`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ QgsGraduatedSymbolRendererV2::QgsGraduatedSymbolRendererV2( QString attrName, Qg`
`158`	`158`	`mMode( Custom ),`
`159`	`159`	`mSourceSymbol( NULL ),`
`160`	`160`	`mSourceColorRamp( NULL ),`
`161`		`- mScaleMethod( QgsSymbolV2::ScaleArea ),`
	`161`	`+ mScaleMethod( DEFAULT_SCALE_METHOD ),`
`162`	`162`	`mRotationFieldIdx( -1 ),`
`163`	`163`	`mSizeScaleFieldIdx( -1 )`
`164`	`164`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,8 @@`
`27`	`27`	`#include <QDomElement>`
`28`	`28`
`29`	`29`	`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 )`
`31`	`32`	`{`
`32`	`33`	`Q_ASSERT( symbol );`
`33`	`34`	`mSymbol = symbol;`