Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Spelling fixes
  • Loading branch information
nyalldawson committed Jan 23, 2017
1 parent 2966a16 commit c3617de
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions src/core/qgspallabeling.cpp
Expand Up @@ -1895,11 +1895,10 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, QgsRenderContext &cont
positionOrder = QgsPalLayerSettings::DEFAULT_PLACEMENT_ORDER;

context.expressionContext().setOriginalValueVariable( QgsLabelingUtils::encodePredefinedPositionOrder( predefinedPositionOrder ) );
exprVal = mProperties.value( QgsPalLayerSettings::PredefinedPositionOrder, context.expressionContext() );
if ( exprVal.isValid() )
QString dataDefinedOrder = mProperties.valueAsString( QgsPalLayerSettings::PredefinedPositionOrder, context.expressionContext() );
if ( !dataDefinedOrder.isEmpty() )
{
QString orderD = exprVal.toString();
positionOrder = QgsLabelingUtils::decodePredefinedPositionOrder( orderD );
positionOrder = QgsLabelingUtils::decodePredefinedPositionOrder( dataDefinedOrder );
}
( *labelFeature )->setPredefinedPositionOrder( positionOrder );

Expand Down

0 comments on commit c3617de

Please sign in to comment.