Fixed scale method (area/diameter) for graduated and categorized markers

m-kuhn · m-kuhn · commit e323df97ee70 · 2012-08-15T14:35:23.000+02:00
diff --git a/src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp b/src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp
@@ -122,6 +122,7 @@ QgsCategorizedSymbolRendererV2::QgsCategorizedSymbolRendererV2( QString attrName
     mCategories( categories ),
     mSourceSymbol( NULL ),
     mSourceColorRamp( NULL ),
+    mScaleMethod( QgsSymbolV2::ScaleArea ),
     mRotationFieldIdx( -1 ),
     mSizeScaleFieldIdx( -1 )
 {
@@ -216,6 +217,7 @@ QgsSymbolV2* QgsCategorizedSymbolRendererV2::symbolForFeature( QgsFeature& featu
       markerSymbol->setAngle( rotation );
     if ( mSizeScaleFieldIdx != -1 )
       markerSymbol->setSize( sizeScale * static_cast<QgsMarkerSymbolV2*>( symbol )->size() );
+    markerSymbol->setScaleMethod( mScaleMethod );
   }
   else if ( tempSymbol->type() == QgsSymbolV2::Line )
   {
@@ -374,6 +376,7 @@ QgsFeatureRendererV2* QgsCategorizedSymbolRendererV2::clone()
   r->setUsingSymbolLevels( usingSymbolLevels() );
   r->setRotationField( rotationField() );
   r->setSizeScaleField( sizeScaleField() );
+  r->setScaleMethod( scaleMethod() );
   return r;
 }
 
diff --git a/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp b/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
@@ -140,6 +140,7 @@ QgsGraduatedSymbolRendererV2::QgsGraduatedSymbolRendererV2( QString attrName, Qg
     mMode( Custom ),
     mSourceSymbol( NULL ),
     mSourceColorRamp( NULL ),
+    mScaleMethod( QgsSymbolV2::ScaleArea ),
     mRotationFieldIdx( -1 ),
     mSizeScaleFieldIdx( -1 )
 {
@@ -201,6 +202,7 @@ QgsSymbolV2* QgsGraduatedSymbolRendererV2::symbolForFeature( QgsFeature& feature
       markerSymbol->setAngle( rotation );
     if ( mSizeScaleFieldIdx != -1 )
       markerSymbol->setSize( sizeScale * static_cast<QgsMarkerSymbolV2*>( symbol )->size() );
+    markerSymbol->setScaleMethod( mScaleMethod );
   }
   else if ( tempSymbol->type() == QgsSymbolV2::Line )
   {
@@ -332,6 +334,7 @@ QgsFeatureRendererV2* QgsGraduatedSymbolRendererV2::clone()
   r->setUsingSymbolLevels( usingSymbolLevels() );
   r->setRotationField( rotationField() );
   r->setSizeScaleField( sizeScaleField() );
+  r->setScaleMethod( scaleMethod() );
   return r;
 }
 
diff --git a/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp b/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
@@ -107,6 +107,7 @@ QgsCategorizedSymbolRendererV2Widget::QgsCategorizedSymbolRendererV2Widget( QgsV
       mRenderer->rotationField(), mRenderer->sizeScaleField(), mRenderer->scaleMethod() );
   connect( mDataDefinedMenus, SIGNAL( rotationFieldChanged( QString ) ), this, SLOT( rotationFieldChanged( QString ) ) );
   connect( mDataDefinedMenus, SIGNAL( sizeScaleFieldChanged( QString ) ), this, SLOT( sizeScaleFieldChanged( QString ) ) );
+  connect( mDataDefinedMenus, SIGNAL( scaleMethodChanged( QgsSymbolV2::ScaleMethod ) ), this, SLOT( scaleMethodChanged( QgsSymbolV2::ScaleMethod ) ) );
   btnAdvanced->setMenu( advMenu );
 }
 
@@ -366,10 +367,14 @@ void QgsCategorizedSymbolRendererV2Widget::addCategories()
   */
 
   // recreate renderer
+  QgsCategorizedSymbolRendererV2 *r = new QgsCategorizedSymbolRendererV2( attrName, cats );
+  r->setSourceSymbol( mCategorizedSymbol->clone() );
+  r->setSourceColorRamp( ramp->clone() );
+  r->setScaleMethod( mRenderer->scaleMethod() );
+  r->setSizeScaleField( mRenderer->sizeScaleField() );
+  r->setRotationField( mRenderer->rotationField() );
   delete mRenderer;
-  mRenderer = new QgsCategorizedSymbolRendererV2( attrName, cats );
-  mRenderer->setSourceSymbol( mCategorizedSymbol->clone() );
-  mRenderer->setSourceColorRamp( ramp->clone() );
+  mRenderer = r;
 
   populateCategories();
 }
@@ -452,6 +457,11 @@ void QgsCategorizedSymbolRendererV2Widget::sizeScaleFieldChanged( QString fldNam
   mRenderer->setSizeScaleField( fldName );
 }
 
+void QgsCategorizedSymbolRendererV2Widget::scaleMethodChanged( QgsSymbolV2::ScaleMethod scaleMethod )
+{
+  mRenderer->setScaleMethod( scaleMethod );
+}
+
 QList<QgsSymbolV2*> QgsCategorizedSymbolRendererV2Widget::selectedSymbols()
 {
   QList<QgsSymbolV2*> selectedSymbols;
diff --git a/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.h b/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.h
@@ -48,6 +48,7 @@ class GUI_EXPORT QgsCategorizedSymbolRendererV2Widget : public QgsRendererV2Widg
 
     void rotationFieldChanged( QString fldName );
     void sizeScaleFieldChanged( QString fldName );
+    void scaleMethodChanged( QgsSymbolV2::ScaleMethod scaleMethod );
 
     void showSymbolLevels();
 
diff --git a/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp b/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
@@ -106,6 +106,7 @@ QgsGraduatedSymbolRendererV2Widget::QgsGraduatedSymbolRendererV2Widget( QgsVecto
       mRenderer->rotationField(), mRenderer->sizeScaleField(), mRenderer->scaleMethod() );
   connect( mDataDefinedMenus, SIGNAL( rotationFieldChanged( QString ) ), this, SLOT( rotationFieldChanged( QString ) ) );
   connect( mDataDefinedMenus, SIGNAL( sizeScaleFieldChanged( QString ) ), this, SLOT( sizeScaleFieldChanged( QString ) ) );
+  connect( mDataDefinedMenus, SIGNAL( scaleMethodChanged( QgsSymbolV2::ScaleMethod ) ), this, SLOT( scaleMethodChanged( QgsSymbolV2::ScaleMethod ) ) );
   btnAdvanced->setMenu( advMenu );
 }
 
@@ -216,6 +217,10 @@ void QgsGraduatedSymbolRendererV2Widget::classifyGraduated()
     return;
   }
 
+  r->setSizeScaleField( mRenderer->sizeScaleField() );
+  r->setRotationField( mRenderer->rotationField() );
+  r->setScaleMethod( mRenderer->scaleMethod() );
+
   delete mRenderer;
   mRenderer = r;
 
@@ -383,6 +388,11 @@ void QgsGraduatedSymbolRendererV2Widget::sizeScaleFieldChanged( QString fldName
   mRenderer->setSizeScaleField( fldName );
 }
 
+void QgsGraduatedSymbolRendererV2Widget::scaleMethodChanged( QgsSymbolV2::ScaleMethod scaleMethod )
+{
+  mRenderer->setScaleMethod( scaleMethod );
+}
+
 QList<QgsSymbolV2*> QgsGraduatedSymbolRendererV2Widget::selectedSymbols()
 {
   QList<QgsSymbolV2*> selectedSymbols;
diff --git a/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.h b/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.h
@@ -51,6 +51,7 @@ class GUI_EXPORT QgsGraduatedSymbolRendererV2Widget : public QgsRendererV2Widget
 
     void rotationFieldChanged( QString fldName );
     void sizeScaleFieldChanged( QString fldName );
+    void scaleMethodChanged( QgsSymbolV2::ScaleMethod scaleMethod );
 
     void showSymbolLevels();
 

Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,7 @@ QgsCategorizedSymbolRendererV2::QgsCategorizedSymbolRendererV2( QString attrName`
`122`	`122`	`mCategories( categories ),`
`123`	`123`	`mSourceSymbol( NULL ),`
`124`	`124`	`mSourceColorRamp( NULL ),`
	`125`	`+ mScaleMethod( QgsSymbolV2::ScaleArea ),`
`125`	`126`	`mRotationFieldIdx( -1 ),`
`126`	`127`	`mSizeScaleFieldIdx( -1 )`
`127`	`128`	`{`
`@@ -216,6 +217,7 @@ QgsSymbolV2* QgsCategorizedSymbolRendererV2::symbolForFeature( QgsFeature& featu`
`216`	`217`	`markerSymbol->setAngle( rotation );`
`217`	`218`	`if ( mSizeScaleFieldIdx != -1 )`
`218`	`219`	`markerSymbol->setSize( sizeScale * static_cast<QgsMarkerSymbolV2*>( symbol )->size() );`
	`220`	`+ markerSymbol->setScaleMethod( mScaleMethod );`
`219`	`221`	`}`
`220`	`222`	`else if ( tempSymbol->type() == QgsSymbolV2::Line )`
`221`	`223`	`{`
`@@ -374,6 +376,7 @@ QgsFeatureRendererV2* QgsCategorizedSymbolRendererV2::clone()`
`374`	`376`	`r->setUsingSymbolLevels( usingSymbolLevels() );`
`375`	`377`	`r->setRotationField( rotationField() );`
`376`	`378`	`r->setSizeScaleField( sizeScaleField() );`
	`379`	`+ r->setScaleMethod( scaleMethod() );`
`377`	`380`	`return r;`
`378`	`381`	`}`
`379`	`382`
Original file line number	Diff line number	Diff line change
`@@ -140,6 +140,7 @@ QgsGraduatedSymbolRendererV2::QgsGraduatedSymbolRendererV2( QString attrName, Qg`
`140`	`140`	`mMode( Custom ),`
`141`	`141`	`mSourceSymbol( NULL ),`
`142`	`142`	`mSourceColorRamp( NULL ),`
	`143`	`+ mScaleMethod( QgsSymbolV2::ScaleArea ),`
`143`	`144`	`mRotationFieldIdx( -1 ),`
`144`	`145`	`mSizeScaleFieldIdx( -1 )`
`145`	`146`	`{`
`@@ -201,6 +202,7 @@ QgsSymbolV2* QgsGraduatedSymbolRendererV2::symbolForFeature( QgsFeature& feature`
`201`	`202`	`markerSymbol->setAngle( rotation );`
`202`	`203`	`if ( mSizeScaleFieldIdx != -1 )`
`203`	`204`	`markerSymbol->setSize( sizeScale * static_cast<QgsMarkerSymbolV2*>( symbol )->size() );`
	`205`	`+ markerSymbol->setScaleMethod( mScaleMethod );`
`204`	`206`	`}`
`205`	`207`	`else if ( tempSymbol->type() == QgsSymbolV2::Line )`
`206`	`208`	`{`
`@@ -332,6 +334,7 @@ QgsFeatureRendererV2* QgsGraduatedSymbolRendererV2::clone()`
`332`	`334`	`r->setUsingSymbolLevels( usingSymbolLevels() );`
`333`	`335`	`r->setRotationField( rotationField() );`
`334`	`336`	`r->setSizeScaleField( sizeScaleField() );`
	`337`	`+ r->setScaleMethod( scaleMethod() );`
`335`	`338`	`return r;`
`336`	`339`	`}`
`337`	`340`