From 39b89d1bac4623ff378b3903ba152e01984de951 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Mon, 23 Jan 2017 12:22:40 +1000 Subject: [PATCH] SIP sync --- python/core/composer/qgscomposerobject.sip | 6 ++++++ python/core/composer/qgscomposerscalebar.sip | 1 + python/core/qgsdiagramrenderer.sip | 2 ++ python/core/qgspallabeling.sip | 2 ++ python/core/symbology-ng/qgs25drenderer.sip | 2 +- python/core/symbology-ng/qgssymbollayer.sip | 2 ++ 6 files changed, 14 insertions(+), 1 deletion(-) diff --git a/python/core/composer/qgscomposerobject.sip b/python/core/composer/qgscomposerobject.sip index c01703de58f..aee20501275 100644 --- a/python/core/composer/qgscomposerobject.sip +++ b/python/core/composer/qgscomposerobject.sip @@ -54,8 +54,14 @@ class QgsComposerObject : QObject, QgsExpressionContextGenerator //legend item LegendTitle, //!< Legend title LegendColumnCount, //!< Legend column count + ScalebarFillColor, //!< Scalebar fill color + ScalebarFillColor2, //!< Scalebar secondary fill color + ScalebarLineColor, //!< Scalebar line color + ScalebarLineWidth, //!< Scalebar line width }; + static const QgsPropertiesDefinition PROPERTY_DEFINITIONS; + /** Specifies whether the value returned by a function should be the original, user * set value, or the current evaluated value for the property. This may differ if * a property has a data defined expression active. diff --git a/python/core/composer/qgscomposerscalebar.sip b/python/core/composer/qgscomposerscalebar.sip index c4109f1fd8b..92e53e09107 100644 --- a/python/core/composer/qgscomposerscalebar.sip +++ b/python/core/composer/qgscomposerscalebar.sip @@ -309,6 +309,7 @@ class QgsComposerScaleBar: QgsComposerItem void updateSegmentSize(); /** Sets mCompositionMap to 0 if the map is deleted*/ void invalidateCurrentMap(); + virtual void refreshDataDefinedProperty( const QgsComposerObject::DataDefinedProperty property = QgsComposerObject::AllProperties, const QgsExpressionContext* context = nullptr ); protected: /** Calculates with of a segment in mm and stores it in mSegmentMillimeters*/ diff --git a/python/core/qgsdiagramrenderer.sip b/python/core/qgsdiagramrenderer.sip index 74e66aaab85..5bf37623be9 100644 --- a/python/core/qgsdiagramrenderer.sip +++ b/python/core/qgsdiagramrenderer.sip @@ -209,6 +209,8 @@ class QgsDiagramLayerSettings void setDataDefinedProperties( const QgsPropertyCollection& collection ); + static const QgsPropertiesDefinition PROPERTY_DEFINITIONS; + }; /** \ingroup core diff --git a/python/core/qgspallabeling.sip b/python/core/qgspallabeling.sip index e0f151d9749..be69a09b902 100644 --- a/python/core/qgspallabeling.sip +++ b/python/core/qgspallabeling.sip @@ -460,6 +460,8 @@ class QgsPalLayerSettings int mFeatsSendingToPal; // total features tested for sending into PAL (relative to maxNumLabels) int mFeatsRegPal; // number of features registered in PAL, when using limitNumLabels + static const QgsPropertiesDefinition PROPERTY_DEFINITIONS; + }; class QgsLabelCandidate diff --git a/python/core/symbology-ng/qgs25drenderer.sip b/python/core/symbology-ng/qgs25drenderer.sip index 584b4706014..24a8f4aab34 100644 --- a/python/core/symbology-ng/qgs25drenderer.sip +++ b/python/core/symbology-ng/qgs25drenderer.sip @@ -67,7 +67,7 @@ class Qgs25DRenderer : QgsFeatureRenderer /** * Get wall shading enabled */ - bool wallShadingEnabled(); + bool wallShadingEnabled() const; /** * Get the shadow's color diff --git a/python/core/symbology-ng/qgssymbollayer.sip b/python/core/symbology-ng/qgssymbollayer.sip index 7f6a3c7e75b..6ca4b7ee77e 100644 --- a/python/core/symbology-ng/qgssymbollayer.sip +++ b/python/core/symbology-ng/qgssymbollayer.sip @@ -122,6 +122,8 @@ class QgsSymbolLayer PropertyArrowType, //!< Arrow type }; + static const QgsPropertiesDefinition PROPERTY_DEFINITIONS; + virtual ~QgsSymbolLayer(); /**