[Feature]: Merge data defined symbology branch

qgis · Apr 1, 2013 · 2b34ae5 · 2b34ae5
2 parents 5c028f8 + 8a0b0fe
commit 2b34ae5
Show file tree

Hide file tree

Showing 36 changed files with 3,919 additions and 1,157 deletions.
diff --git a/python/core/symbology-ng/qgsellipsesymbollayerv2.sip b/python/core/symbology-ng/qgsellipsesymbollayerv2.sip
@@ -24,42 +24,21 @@ class QgsEllipseSymbolLayerV2 : QgsMarkerSymbolLayerV2
     void setSymbolName( const QString& name );
     QString symbolName() const;
 
-    void setSymbolNameField( const QString& field );
-    const QString& symbolNameField() const;
-
     void setSymbolWidth( double w );
     double symbolWidth() const;
 
-    void setWidthField( const QString& field );
-    const QString& widthField() const;
-
     void setSymbolHeight( double h );
     double symbolHeight() const;
 
-    void setHeightField( const QString& field );
-    const QString& heightField() const;
-
-    void setRotationField( const QString& field );
-    const QString& rotationField() const;
-
     void setOutlineWidth( double w );
     double outlineWidth() const;
 
-    void setOutlineWidthField( const QString& field );
-    const QString& outlineWidthField() const;
-
     void setFillColor( const QColor& c );
     QColor fillColor() const;
 
-    void setFillColorField( const QString& field );
-    const QString& fillColorField() const;
-
     void setOutlineColor( const QColor& c );
     QColor outlineColor() const;
 
-    void setOutlineColorField( const QString& field );
-    const QString& outlineColorField() const;
-
     QSet<QString> usedAttributes() const;
 
 };
diff --git a/src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp b/src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp
@@ -680,3 +680,13 @@ void QgsCategorizedSymbolRendererV2::updateSymbols( QgsSymbolV2 * sym )
     ++i;
   }
 }
+
+void QgsCategorizedSymbolRendererV2::setScaleMethod( QgsSymbolV2::ScaleMethod scaleMethod )
+{
+  mScaleMethod = scaleMethod;
+  QgsCategoryList::const_iterator catIt = mCategories.constBegin();
+  for ( ; catIt != mCategories.constEnd(); ++catIt )
+  {
+    setScaleMethodToSymbol( catIt->symbol(), scaleMethod );
+  }
+}
diff --git a/src/core/symbology-ng/qgscategorizedsymbolrendererv2.h b/src/core/symbology-ng/qgscategorizedsymbolrendererv2.h
@@ -144,7 +144,7 @@ class CORE_EXPORT QgsCategorizedSymbolRendererV2 : public QgsFeatureRendererV2
     QString sizeScaleField() const { return mSizeScaleField; }
 
     //! @note added in 2.0
-    void setScaleMethod( QgsSymbolV2::ScaleMethod scaleMethod ) { mScaleMethod = scaleMethod; }
+    void setScaleMethod( QgsSymbolV2::ScaleMethod scaleMethod );
     //! @note added in 2.0
     QgsSymbolV2::ScaleMethod scaleMethod() const { return mScaleMethod; }