Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix displacement renderer when using map unit sizes for symbols
(cherry-picked from 8868303)
  • Loading branch information
nyalldawson committed Jul 1, 2016
1 parent c33b7ad commit 4235f9e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/core/symbology-ng/qgspointdisplacementrenderer.cpp
Expand Up @@ -183,7 +183,7 @@ void QgsPointDisplacementRenderer::drawGroup( const DisplacementGroup& group, Qg
{
diagonal = qMax( diagonal, QgsSymbolLayerV2Utils::convertToPainterUnits( context,
M_SQRT2 * symbol->size(),
symbol->outputUnit(), symbol->mapUnitScale() ) );
symbol->sizeUnit(), symbol->sizeMapUnitScale() ) );
}
}

Expand Down Expand Up @@ -573,7 +573,7 @@ void QgsPointDisplacementRenderer::calculateSymbolAndLabelPositions( QgsSymbolV2
{
double centerDiagonal = QgsSymbolLayerV2Utils::convertToPainterUnits( symbolContext.renderContext(),
M_SQRT2 * mCenterSymbol->size(),
mCenterSymbol->outputUnit(), mCenterSymbol->mapUnitScale() );
mCenterSymbol->sizeUnit(), mCenterSymbol->sizeMapUnitScale() );

int pointsRemaining = nPosition;
int ringNumber = 1;
Expand Down

0 comments on commit 4235f9e

Please sign in to comment.