Skip to content

Commit cd762da

Browse files
committedDec 15, 2018
Doxygen
1 parent d8eac47 commit cd762da

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed
 

‎python/core/auto_generated/qgsmapsettings.sip.in

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -590,22 +590,22 @@ The geometry is specified using the map's destinationCrs().
590590
%Docstring
591591
Sets a list of ``regions`` to avoid placing labels within.
592592

593-
.. versionadded:: 3.6
594-
595593
.. seealso:: :py:func:`labelBlockingRegions`
596594

597595
.. seealso:: :py:func:`setLabelBoundaryGeometry`
596+
597+
.. versionadded:: 3.6
598598
%End
599599

600600
QList< QgsLabelBlockingRegion > labelBlockingRegions() const;
601601
%Docstring
602602
Returns the list of regions to avoid placing labels within.
603603

604-
.. versionadded:: 3.6
605-
606604
.. seealso:: :py:func:`setLabelBlockingRegions`
607605

608606
.. seealso:: :py:func:`labelBoundaryGeometry`
607+
608+
.. versionadded:: 3.6
609609
%End
610610

611611
protected:

‎src/core/qgslabelingengine.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ void QgsLabelingEngine::run( QgsRenderContext &context )
248248
// get map label boundary geometry - if one hasn't been explicitly set, we use the whole of the map's visible polygon
249249
QgsGeometry mapBoundaryGeom = !mMapSettings.labelBoundaryGeometry().isNull() ? mMapSettings.labelBoundaryGeometry() : QgsGeometry::fromQPolygonF( visiblePoly );
250250

251-
// label blocking regions work by "chopping away" those regions from the permissible labelling area
251+
// label blocking regions work by "chopping away" those regions from the permissible labeling area
252252
const QList< QgsLabelBlockingRegion > blockingRegions = mMapSettings.labelBlockingRegions();
253253
for ( const QgsLabelBlockingRegion &region : blockingRegions )
254254
{

‎src/core/qgsmapsettings.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -518,17 +518,17 @@ class CORE_EXPORT QgsMapSettings
518518

519519
/**
520520
* Sets a list of \a regions to avoid placing labels within.
521-
* \since QGIS 3.6
522521
* \see labelBlockingRegions()
523522
* \see setLabelBoundaryGeometry()
523+
* \since QGIS 3.6
524524
*/
525525
void setLabelBlockingRegions( const QList< QgsLabelBlockingRegion > &regions ) { mLabelBlockingRegions = regions; }
526526

527527
/**
528528
* Returns the list of regions to avoid placing labels within.
529-
* \since QGIS 3.6
530529
* \see setLabelBlockingRegions()
531530
* \see labelBoundaryGeometry()
531+
* \since QGIS 3.6
532532
*/
533533
QList< QgsLabelBlockingRegion > labelBlockingRegions() const { return mLabelBlockingRegions; }
534534

0 commit comments

Comments
 (0)
Please sign in to comment.