sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-11-22 00:14:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix broken area scaling for simple marker symbols

Browse Source
This commit is contained in:
Nyall Dawson 2015-05-21 23:38:46 +10:00
parent d62794de5d
commit a32ac3d43a
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
View File

@ -469,19 +469,25 @@ void QgsSimpleMarkerSymbolLayerV2::renderPoint( const QPointF& point, QgsSymbolV
return;
}
double scaledSize = mSize;
bool hasDataDefinedSize = context.renderHints() & QgsSymbolV2::DataDefinedSizeScale || hasDataDefinedProperty( EXPR_SIZE );
double scaledSize = mSize;
bool ok;
if ( hasDataDefinedSize )
bool ok = true;
if ( hasDataDefinedProperty( EXPR_SIZE ) )
{
if ( hasDataDefinedProperty( EXPR_SIZE ) )
scaledSize = evaluateDataDefinedProperty( EXPR_SIZE, context.feature(), mSize, &ok ).toDouble();
}
if ( hasDataDefinedSize && ok )
{
switch ( mScaleMethod )
{
scaledSize = evaluateDataDefinedProperty( EXPR_SIZE, context.feature(), mSize, &ok ).toDouble();
if ( ok && mScaleMethod == QgsSymbolV2::ScaleArea )
{
case QgsSymbolV2::ScaleArea:
scaledSize = sqrt( scaledSize );
}
break;
case QgsSymbolV2::ScaleDiameter:
break;
}
}