Skip to content

Commit

Permalink
Use standard naming
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Oct 17, 2024
1 parent 755f725 commit bf42bc2
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/analysis/processing/qgsalgorithmextractlabels.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ class ExtractLabelSink : public QgsLabelSink
break;

case Qgis::LabelMultiLineAlignment::FollowPlacement:
switch ( label->getQuadrant() )
switch ( label->quadrant() )
{
case Qgis::LabelQuadrantPosition::AboveLeft:
case Qgis::LabelQuadrantPosition::Left:
Expand Down
2 changes: 1 addition & 1 deletion src/core/dxf/qgsdxfexport.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2439,7 +2439,7 @@ void QgsDxfExport::drawLabel( const QString &layerId, QgsRenderContext &context,
if ( tmpLyr.multilineAlign == Qgis::LabelMultiLineAlignment::FollowPlacement )
{
//calculate font alignment based on label quadrant
switch ( label->getQuadrant() )
switch ( label->quadrant() )
{
case Qgis::LabelQuadrantPosition::AboveLeft:
case Qgis::LabelQuadrantPosition::Left:
Expand Down
2 changes: 1 addition & 1 deletion src/core/labeling/qgsvectorlayerlabelprovider.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ void QgsVectorLayerLabelProvider::drawLabel( QgsRenderContext &context, pal::Lab
if ( tmpLyr.multilineAlign == Qgis::LabelMultiLineAlignment::FollowPlacement )
{
//calculate font alignment based on label quadrant
switch ( label->getQuadrant() )
switch ( label->quadrant() )
{
case Qgis::LabelQuadrantPosition::AboveLeft:
case Qgis::LabelQuadrantPosition::Left:
Expand Down
5 changes: 4 additions & 1 deletion src/core/pal/labelposition.h
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,10 @@ namespace pal

bool getUpsideDown() const { return upsideDown; }

Qgis::LabelQuadrantPosition getQuadrant() const { return mQuadrant; }
/**
* Returns the quadrant associated with this label position.
*/
Qgis::LabelQuadrantPosition quadrant() const { return mQuadrant; }

/**
* Returns the next part of this label position (i.e. the next character for a curved label).
Expand Down

0 comments on commit bf42bc2

Please sign in to comment.