Fix displacement renderer when using map unit sizes for symbols

qgis · Jun 16, 2016 · 8868303 · 8868303
1 parent a6f96ba
commit 8868303
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/core/symbology-ng/qgspointdisplacementrenderer.cpp b/src/core/symbology-ng/qgspointdisplacementrenderer.cpp
@@ -185,7 +185,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() ) );
     }
   }
 
@@ -575,7 +575,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;