Skip to content
Permalink
Browse files

[Feature]: Merge data defined symbology branch

  • Loading branch information
mhugent committed Apr 1, 2013
2 parents 5c028f8 + 8a0b0fe commit 2b34ae566270e563715467bd7efb8f548feb1980
Showing with 3,919 additions and 1,157 deletions.
  1. +0 −21 python/core/symbology-ng/qgsellipsesymbollayerv2.sip
  2. +10 −0 src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp
  3. +1 −1 src/core/symbology-ng/qgscategorizedsymbolrendererv2.h
  4. +276 −102 src/core/symbology-ng/qgsellipsesymbollayerv2.cpp
  5. +17 −55 src/core/symbology-ng/qgsellipsesymbollayerv2.h
  6. +925 −37 src/core/symbology-ng/qgsfillsymbollayerv2.cpp
  7. +84 −0 src/core/symbology-ng/qgsfillsymbollayerv2.h
  8. +9 −0 src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
  9. +1 −1 src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h
  10. +479 −25 src/core/symbology-ng/qgslinesymbollayerv2.cpp
  11. +43 −1 src/core/symbology-ng/qgslinesymbollayerv2.h
  12. +631 −38 src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
  13. +43 −2 src/core/symbology-ng/qgsmarkersymbollayerv2.h
  14. +15 −0 src/core/symbology-ng/qgsrendererv2.cpp
  15. +2 −0 src/core/symbology-ng/qgsrendererv2.h
  16. +6 −0 src/core/symbology-ng/qgssinglesymbolrendererv2.cpp
  17. +1 −1 src/core/symbology-ng/qgssinglesymbolrendererv2.h
  18. +7 −0 src/core/symbology-ng/qgssymbollayerv2.h
  19. +1 −0 src/core/symbology-ng/qgssymbolv2.h
  20. +2 −0 src/gui/CMakeLists.txt
  21. +154 −0 src/gui/symbology-ng/qgsdatadefinedsymboldialog.cpp
  22. +29 −0 src/gui/symbology-ng/qgsdatadefinedsymboldialog.h
  23. +36 −162 src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp
  24. +2 −10 src/gui/symbology-ng/qgsellipsesymbollayerv2widget.h
  25. +264 −5 src/gui/symbology-ng/qgssymbollayerv2widget.cpp
  26. +8 −1 src/gui/symbology-ng/qgssymbollayerv2widget.h
  27. +88 −0 src/ui/qgsdatadefinedsymboldialogbase.ui
  28. +215 −294 src/ui/symbollayer/widget_ellipse.ui
  29. +89 −65 src/ui/symbollayer/widget_linepatternfill.ui
  30. +105 −81 src/ui/symbollayer/widget_markerline.ui
  31. +94 −70 src/ui/symbollayer/widget_pointpatternfill.ui
  32. +86 −62 src/ui/symbollayer/widget_simplefill.ui
  33. +23 −22 src/ui/symbollayer/widget_simpleline.ui
  34. +25 −1 src/ui/symbollayer/widget_simplemarker.ui
  35. +62 −38 src/ui/symbollayer/widget_svgfill.ui
  36. +86 −62 src/ui/symbollayer/widget_svgmarker.ui
@@ -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;

};
@@ -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 );
}
}
@@ -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; }

0 comments on commit 2b34ae5

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