Skip to content

Commit

Permalink
Since
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed May 3, 2020
1 parent 9364196 commit d0ca4f3
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 1 deletion.
4 changes: 4 additions & 0 deletions python/core/auto_generated/labeling/qgspallabeling.sip.in
Expand Up @@ -408,13 +408,17 @@ Returns the QgsExpression for this label settings. May be ``None`` if isExpressi
Returns the polygon placement flags, which dictate how polygon labels can be placed.

.. seealso:: :py:func:`setPolygonPlacementFlags`

.. versionadded:: 3.14
%End

void setPolygonPlacementFlags( QgsLabeling::PolygonPlacementFlags flags );
%Docstring
Sets the polygon placement ``flags``, which dictate how polygon labels can be placed.

.. seealso:: :py:func:`polygonPlacementFlags`

.. versionadded:: 3.14
%End

bool centroidWhole;
Expand Down
2 changes: 2 additions & 0 deletions src/core/labeling/qgslabelfeature.h
Expand Up @@ -322,13 +322,15 @@ class CORE_EXPORT QgsLabelFeature
* Returns the polygon placement flags, which dictate how polygon labels can be placed.
*
* \see setPolygonPlacementFlags()
* \since QGIS 3.14
*/
QgsLabeling::PolygonPlacementFlags polygonPlacementFlags() const { return mPolygonPlacementFlags; }

/**
* Sets the polygon placement \a flags, which dictate how polygon labels can be placed.
*
* \see polygonPlacementFlags()
* \since QGIS 3.14
*/
void setPolygonPlacementFlags( QgsLabeling::PolygonPlacementFlags flags ) { mPolygonPlacementFlags = flags; }

Expand Down
4 changes: 3 additions & 1 deletion src/core/labeling/qgspallabeling.h
Expand Up @@ -443,7 +443,7 @@ class CORE_EXPORT QgsPalLayerSettings
LinePlacementOptions = 99, //!< Line placement flags
OverrunDistance = 102, //!< Distance which labels can extend past either end of linear features
LabelAllParts = 103, //!< Whether all parts of multi-part features should be labeled
PolygonLabelOutside = 109, //!< Whether labels outside a polygon feature are permitted, or should be forced
PolygonLabelOutside = 109, //!< Whether labels outside a polygon feature are permitted, or should be forced (since QGIS 3.14)

// rendering
ScaleVisibility = 23,
Expand Down Expand Up @@ -652,13 +652,15 @@ class CORE_EXPORT QgsPalLayerSettings
* Returns the polygon placement flags, which dictate how polygon labels can be placed.
*
* \see setPolygonPlacementFlags()
* \since QGIS 3.14
*/
QgsLabeling::PolygonPlacementFlags polygonPlacementFlags() const { return mPolygonPlacementFlags; }

/**
* Sets the polygon placement \a flags, which dictate how polygon labels can be placed.
*
* \see polygonPlacementFlags()
* \since QGIS 3.14
*/
void setPolygonPlacementFlags( QgsLabeling::PolygonPlacementFlags flags ) { mPolygonPlacementFlags = flags; }

Expand Down

0 comments on commit d0ca4f3

Please sign in to comment.