sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

SIP sync

Browse Source
This commit is contained in:
Nyall Dawson 2017-01-23 12:22:40 +10:00
parent e06192ec3f
commit 39b89d1bac
6 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python/core/composer/qgscomposerobject.sip
View File

@ -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.

1
python/core/composer/qgscomposerscalebar.sip
View File

@ -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*/

2
python/core/qgsdiagramrenderer.sip
View File

@ -209,6 +209,8 @@ class QgsDiagramLayerSettings
void setDataDefinedProperties( const QgsPropertyCollection& collection );
static const QgsPropertiesDefinition PROPERTY_DEFINITIONS;
};
/** \ingroup core

2
python/core/qgspallabeling.sip
View File

@ -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

2
python/core/symbology-ng/qgs25drenderer.sip
View File

@ -67,7 +67,7 @@ class Qgs25DRenderer : QgsFeatureRenderer
/**
* Get wall shading enabled
*/
bool wallShadingEnabled();
bool wallShadingEnabled() const;
/**
* Get the shadow's color

2
python/core/symbology-ng/qgssymbollayer.sip
View File

@ -122,6 +122,8 @@ class QgsSymbolLayer
PropertyArrowType, //!< Arrow type
};
static const QgsPropertiesDefinition PROPERTY_DEFINITIONS;
virtual ~QgsSymbolLayer();
/**