Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Avoid use of QgsDataDefined::expressionOrField for rotationField values
Maintains behaviour of < 2.10 API
  • Loading branch information
nyalldawson committed Aug 6, 2015
1 parent 933069d commit ae0a532
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
3 changes: 2 additions & 1 deletion src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp
Expand Up @@ -825,7 +825,8 @@ QString QgsCategorizedSymbolRendererV2::rotationField() const
if ( mSourceSymbol->type() == QgsSymbolV2::Marker )
{
QgsMarkerSymbolV2 * s = static_cast<QgsMarkerSymbolV2 *>( mSourceSymbol.data() );
return s->dataDefinedAngle().expressionOrField();
QgsDataDefined ddAngle = s->dataDefinedAngle();
return ddAngle.useExpression() ? ddAngle.expressionString() : ddAngle.field();
}

return QString();
Expand Down
3 changes: 2 additions & 1 deletion src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
Expand Up @@ -1376,7 +1376,8 @@ QString QgsGraduatedSymbolRendererV2::rotationField() const
if ( mSourceSymbol->type() == QgsSymbolV2::Marker )
{
QgsMarkerSymbolV2 * s = static_cast<QgsMarkerSymbolV2 *>( mSourceSymbol.data() );
return s->dataDefinedAngle().expressionOrField();
QgsDataDefined ddAngle = s->dataDefinedAngle();
return ddAngle.useExpression() ? ddAngle.expressionString() : ddAngle.field();
}

return QString();
Expand Down
3 changes: 2 additions & 1 deletion src/core/symbology-ng/qgssinglesymbolrendererv2.cpp
Expand Up @@ -165,7 +165,8 @@ QString QgsSingleSymbolRendererV2::rotationField() const
if ( mSymbol->type() == QgsSymbolV2::Marker )
{
QgsMarkerSymbolV2 * s = static_cast<QgsMarkerSymbolV2 *>( mSymbol.data() );
return s->dataDefinedAngle().expressionOrField();
QgsDataDefined ddAngle = s->dataDefinedAngle();
return ddAngle.useExpression() ? ddAngle.expressionString() : ddAngle.field();
}

return QString();
Expand Down

0 comments on commit ae0a532

Please sign in to comment.