Skip to content

Commit

Permalink
Ignore bounds for generated geometries
Browse files Browse the repository at this point in the history 
And guard many other static_casts to avoid crashes.
  • Loading branch information
@m-kuhn
m-kuhn committed Dec 11, 2015
1 parent d021100 commit 7daca21
Showing 1 changed file with 103 additions and 78 deletions.
181 changes: 103 additions & 78 deletions src/core/symbology-ng/qgssymbolv2.cpp
View file
Expand Up @@ -949,24 +949,24 @@ void QgsMarkerSymbolV2::setAngle( double ang )

double QgsMarkerSymbolV2::angle() const
{
QgsSymbolLayerV2List::const_iterator it = mLayers.begin();

if ( it == mLayers.end() )
return 0;

// return angle of the first symbol layer
const QgsMarkerSymbolLayerV2* layer = static_cast<const QgsMarkerSymbolLayerV2 *>( *it );
return layer->angle();
Q_FOREACH ( QgsSymbolLayerV2* layer, mLayers )
{
if ( layer->type() != QgsSymbolV2::Marker )
continue;
const QgsMarkerSymbolLayerV2* markerLayer = static_cast<const QgsMarkerSymbolLayerV2*>( layer );
return markerLayer->angle();
}
return 0;
}

void QgsMarkerSymbolV2::setLineAngle( double lineAng )
{
Q_FOREACH ( QgsSymbolLayerV2* layer, mLayers )
{
QgsMarkerSymbolLayerV2* markerLayer = dynamic_cast<QgsMarkerSymbolLayerV2*>( layer );

if ( markerLayer )
markerLayer->setLineAngle( lineAng );
if ( layer->type() != QgsSymbolV2::Marker )
continue;
QgsMarkerSymbolLayerV2* markerLayer = static_cast<QgsMarkerSymbolLayerV2*>( layer );
markerLayer->setLineAngle( lineAng );
}
}

Expand All @@ -976,25 +976,23 @@ void QgsMarkerSymbolV2::setDataDefinedAngle( const QgsDataDefined& dd )

Q_FOREACH ( QgsSymbolLayerV2* layer, mLayers )
{
QgsMarkerSymbolLayerV2* markerLayer = dynamic_cast<QgsMarkerSymbolLayerV2*>( layer );

if ( markerLayer )
if ( layer->type() != QgsSymbolV2::Marker )
continue;
const QgsMarkerSymbolLayerV2* markerLayer = static_cast<const QgsMarkerSymbolLayerV2*>( layer );
if ( dd.hasDefaultValues() )
{
if ( dd.hasDefaultValues() )
layer->removeDataDefinedProperty( "angle" );
}
else
{
if ( qgsDoubleNear( markerLayer->angle(), symbolRotation ) )
{
layer->removeDataDefinedProperty( "angle" );
layer->setDataDefinedProperty( "angle", new QgsDataDefined( dd ) );
}
else
{
if ( qgsDoubleNear( markerLayer->angle(), symbolRotation ) )
{
layer->setDataDefinedProperty( "angle", new QgsDataDefined( dd ) );
}
else
{
QgsDataDefined* rotatedDD = rotateWholeSymbol( markerLayer->angle() - symbolRotation, dd );
layer->setDataDefinedProperty( "angle", rotatedDD );
}
QgsDataDefined* rotatedDD = rotateWholeSymbol( markerLayer->angle() - symbolRotation, dd );
layer->setDataDefinedProperty( "angle", rotatedDD );
}
}
}
Expand All @@ -1006,12 +1004,14 @@ QgsDataDefined QgsMarkerSymbolV2::dataDefinedAngle() const
QgsDataDefined* symbolDD = 0;

// find the base of the "en masse" pattern
for ( QgsSymbolLayerV2List::const_iterator it = mLayers.begin(); it != mLayers.end(); ++it )
Q_FOREACH ( QgsSymbolLayerV2* layer, mLayers )
{
const QgsMarkerSymbolLayerV2* layer = static_cast<const QgsMarkerSymbolLayerV2 *>( *it );
if ( layer->angle() == symbolRotation && layer->getDataDefinedProperty( "angle" ) )
if ( layer->type() != QgsSymbolV2::Marker )
continue;
const QgsMarkerSymbolLayerV2* markerLayer = static_cast<const QgsMarkerSymbolLayerV2*>( layer );
if ( markerLayer->angle() == symbolRotation && markerLayer->getDataDefinedProperty( "angle" ) )
{
symbolDD = layer->getDataDefinedProperty( "angle" );
symbolDD = markerLayer->getDataDefinedProperty( "angle" );
break;
}
}
Expand All @@ -1020,20 +1020,21 @@ QgsDataDefined QgsMarkerSymbolV2::dataDefinedAngle() const
return QgsDataDefined();

// check that all layer's angle expressions match the "en masse" pattern
for ( QgsSymbolLayerV2List::const_iterator it = mLayers.begin(); it != mLayers.end(); ++it )
Q_FOREACH ( QgsSymbolLayerV2* layer, mLayers )
{
const QgsMarkerSymbolLayerV2* layer = static_cast<const QgsMarkerSymbolLayerV2 *>( *it );

QgsDataDefined* layerAngleDD = layer->getDataDefinedProperty( "angle" );
if ( layer->type() != QgsSymbolV2::Marker )
continue;
const QgsMarkerSymbolLayerV2* markerLayer = static_cast<const QgsMarkerSymbolLayerV2*>( layer );
QgsDataDefined* layerAngleDD = markerLayer->getDataDefinedProperty( "angle" );

if ( qgsDoubleNear( layer->angle(), symbolRotation ) )
if ( qgsDoubleNear( markerLayer->angle(), symbolRotation ) )
{
if ( !layerAngleDD || *layerAngleDD != *symbolDD )
return QgsDataDefined();
}
else
{
QScopedPointer< QgsDataDefined > rotatedDD( rotateWholeSymbol( layer->angle() - symbolRotation, *symbolDD ) );
QScopedPointer< QgsDataDefined > rotatedDD( rotateWholeSymbol( markerLayer->angle() - symbolRotation, *symbolDD ) );
if ( !layerAngleDD || *layerAngleDD != *( rotatedDD.data() ) )
return QgsDataDefined();
}
Expand All @@ -1048,7 +1049,9 @@ void QgsMarkerSymbolV2::setSize( double s )

Q_FOREACH ( QgsSymbolLayerV2* layer, mLayers )
{
QgsMarkerSymbolLayerV2* markerLayer = dynamic_cast<QgsMarkerSymbolLayerV2*>( layer );
if ( layer->type() != QgsSymbolV2::Marker )
continue;
QgsMarkerSymbolLayerV2* markerLayer = static_cast<QgsMarkerSymbolLayerV2*>( layer );
if ( markerLayer->size() == origSize )
markerLayer->setSize( s );
else if ( origSize != 0 )
Expand All @@ -1067,10 +1070,12 @@ double QgsMarkerSymbolV2::size() const
{
// return size of the largest symbol
double maxSize = 0;
for ( QgsSymbolLayerV2List::const_iterator it = mLayers.begin(); it != mLayers.end(); ++it )
Q_FOREACH ( QgsSymbolLayerV2* layer, mLayers )
{
const QgsMarkerSymbolLayerV2* layer = static_cast<const QgsMarkerSymbolLayerV2 *>( *it );
double lsize = layer->size();
if ( layer->type() != QgsSymbolV2::Marker )
continue;
const QgsMarkerSymbolLayerV2* markerLayer = static_cast<const QgsMarkerSymbolLayerV2*>( layer );
double lsize = markerLayer->size();
if ( lsize > maxSize )
maxSize = lsize;
}
Expand All @@ -1083,7 +1088,9 @@ void QgsMarkerSymbolV2::setDataDefinedSize( const QgsDataDefined &dd )

Q_FOREACH ( QgsSymbolLayerV2* layer, mLayers )
{
QgsMarkerSymbolLayerV2* markerLayer = dynamic_cast<QgsMarkerSymbolLayerV2 *>( layer );
if ( layer->type() != QgsSymbolV2::Marker )
continue;
QgsMarkerSymbolLayerV2* markerLayer = static_cast<QgsMarkerSymbolLayerV2*>( layer );

if ( dd.hasDefaultValues() )
{
Expand Down Expand Up @@ -1118,12 +1125,14 @@ QgsDataDefined QgsMarkerSymbolV2::dataDefinedSize() const
QgsDataDefined* symbolDD = 0;

// find the base of the "en masse" pattern
for ( QgsSymbolLayerV2List::const_iterator it = mLayers.begin(); it != mLayers.end(); ++it )
Q_FOREACH ( QgsSymbolLayerV2* layer, mLayers )
{
const QgsMarkerSymbolLayerV2* layer = static_cast<const QgsMarkerSymbolLayerV2 *>( *it );
if ( layer->size() == symbolSize && layer->getDataDefinedProperty( "size" ) )
if ( layer->type() != QgsSymbolV2::Marker )
continue;
const QgsMarkerSymbolLayerV2* markerLayer = static_cast<const QgsMarkerSymbolLayerV2*>( layer );
if ( markerLayer->size() == symbolSize && markerLayer->getDataDefinedProperty( "size" ) )
{
symbolDD = layer->getDataDefinedProperty( "size" );
symbolDD = markerLayer->getDataDefinedProperty( "size" );
break;
}
}
Expand All @@ -1132,14 +1141,16 @@ QgsDataDefined QgsMarkerSymbolV2::dataDefinedSize() const
return QgsDataDefined();

// check that all layers size expressions match the "en masse" pattern
for ( QgsSymbolLayerV2List::const_iterator it = mLayers.begin(); it != mLayers.end(); ++it )
Q_FOREACH ( QgsSymbolLayerV2* layer, mLayers )
{
const QgsMarkerSymbolLayerV2* layer = static_cast<const QgsMarkerSymbolLayerV2 *>( *it );
if ( layer->type() != QgsSymbolV2::Marker )
continue;
const QgsMarkerSymbolLayerV2* markerLayer = static_cast<const QgsMarkerSymbolLayerV2*>( layer );

QgsDataDefined* layerSizeDD = layer->getDataDefinedProperty( "size" );
QgsDataDefined* layerOffsetDD = layer->getDataDefinedProperty( "offset" );
QgsDataDefined* layerSizeDD = markerLayer->getDataDefinedProperty( "size" );
QgsDataDefined* layerOffsetDD = markerLayer->getDataDefinedProperty( "offset" );

if ( qgsDoubleNear( layer->size(), symbolSize ) )
if ( qgsDoubleNear( markerLayer->size(), symbolSize ) )
{
if ( !layerSizeDD || *layerSizeDD != *symbolDD )
return QgsDataDefined();
Expand All @@ -1149,12 +1160,12 @@ QgsDataDefined QgsMarkerSymbolV2::dataDefinedSize() const
if ( symbolSize == 0 )
return QgsDataDefined();

QScopedPointer< QgsDataDefined > scaledDD( scaleWholeSymbol( layer->size() / symbolSize, *symbolDD ) );
QScopedPointer< QgsDataDefined > scaledDD( scaleWholeSymbol( markerLayer->size() / symbolSize, *symbolDD ) );
if ( !layerSizeDD || *layerSizeDD != *( scaledDD.data() ) )
return QgsDataDefined();
}

QScopedPointer< QgsDataDefined > scaledOffsetDD( scaleWholeSymbol( layer->offset().x() / symbolSize, layer->offset().y() / symbolSize, *symbolDD ) );
QScopedPointer< QgsDataDefined > scaledOffsetDD( scaleWholeSymbol( markerLayer->offset().x() / symbolSize, markerLayer->offset().y() / symbolSize, *symbolDD ) );
if ( layerOffsetDD && *layerOffsetDD != *( scaledOffsetDD.data() ) )
return QgsDataDefined();
}
Expand All @@ -1166,22 +1177,25 @@ void QgsMarkerSymbolV2::setScaleMethod( QgsSymbolV2::ScaleMethod scaleMethod )
{
Q_FOREACH ( QgsSymbolLayerV2* layer, mLayers )
{
QgsMarkerSymbolLayerV2* markerLayer = dynamic_cast<QgsMarkerSymbolLayerV2*>( layer );
if ( markerLayer )
markerLayer->setScaleMethod( scaleMethod );
if ( layer->type() != QgsSymbolV2::Marker )
continue;
QgsMarkerSymbolLayerV2* markerLayer = static_cast<QgsMarkerSymbolLayerV2*>( layer );
markerLayer->setScaleMethod( scaleMethod );
}
}

QgsSymbolV2::ScaleMethod QgsMarkerSymbolV2::scaleMethod()
{
QgsSymbolLayerV2List::const_iterator it = mLayers.begin();

if ( it == mLayers.end() )
return DEFAULT_SCALE_METHOD;
Q_FOREACH ( QgsSymbolLayerV2* layer, mLayers )
{
if ( layer->type() != QgsSymbolV2::Marker )
continue;
const QgsMarkerSymbolLayerV2* markerLayer = static_cast<const QgsMarkerSymbolLayerV2*>( layer );
// return scale method of the first symbol layer
return markerLayer->scaleMethod();
}

// return scale method of the first symbol layer
const QgsMarkerSymbolLayerV2* layer = static_cast<const QgsMarkerSymbolLayerV2 *>( *it );
return layer->scaleMethod();
return DEFAULT_SCALE_METHOD;
}

void QgsMarkerSymbolV2::renderPointUsingLayer( QgsMarkerSymbolLayerV2* layer, const QPointF& point, QgsSymbolV2RenderContext& context )
Expand Down Expand Up @@ -1241,12 +1255,16 @@ QRectF QgsMarkerSymbolV2::bounds( const QPointF& point, QgsRenderContext& contex
QgsSymbolV2RenderContext symbolContext( context, outputUnit(), mAlpha, false, mRenderHints, 0, 0, mapUnitScale() );

QRectF bound;
for ( QgsSymbolLayerV2List::const_iterator it = mLayers.constBegin(); it != mLayers.constEnd(); ++it )
Q_FOREACH ( QgsSymbolLayerV2* layer, mLayers )
{
if ( bound.isNull() )
bound = static_cast< QgsMarkerSymbolLayerV2* >( *it )->bounds( point, symbolContext );
else
bound = bound.united( static_cast< QgsMarkerSymbolLayerV2* >( *it )->bounds( point, symbolContext ) );
if ( layer->type() == QgsSymbolV2::Marker )
{
QgsMarkerSymbolLayerV2* symbolLayer = static_cast< QgsMarkerSymbolLayerV2* >( layer );
if ( bound.isNull() )
bound = symbolLayer->bounds( point, symbolContext );
else
bound = symbolLayer->bounds( point, symbolContext );
}
}
return bound;
}
Expand Down Expand Up @@ -1370,14 +1388,16 @@ QgsDataDefined QgsLineSymbolV2::dataDefinedWidth() const
return QgsDataDefined();

// check that all layers width expressions match the "en masse" pattern
for ( QgsSymbolLayerV2List::const_iterator it = mLayers.begin(); it != mLayers.end(); ++it )
Q_FOREACH ( QgsSymbolLayerV2* layer, mLayers )
{
const QgsLineSymbolLayerV2* layer = static_cast<const QgsLineSymbolLayerV2*>( *it );
if ( layer->type() != QgsSymbolV2::Line )
continue;
const QgsLineSymbolLayerV2* lineLayer = static_cast<const QgsLineSymbolLayerV2*>( layer );

QgsDataDefined* layerWidthDD = layer->getDataDefinedProperty( "width" );
QgsDataDefined* layerOffsetDD = layer->getDataDefinedProperty( "offset" );
QgsDataDefined* layerWidthDD = lineLayer->getDataDefinedProperty( "width" );
QgsDataDefined* layerOffsetDD = lineLayer->getDataDefinedProperty( "offset" );

if ( qgsDoubleNear( layer->width(), symbolWidth ) )
if ( qgsDoubleNear( lineLayer->width(), symbolWidth ) )
{
if ( !layerWidthDD || *layerWidthDD != *symbolDD )
return QgsDataDefined();
Expand All @@ -1387,12 +1407,12 @@ QgsDataDefined QgsLineSymbolV2::dataDefinedWidth() const
if ( symbolWidth == 0 )
return QgsDataDefined();

QScopedPointer< QgsDataDefined > scaledDD( scaleWholeSymbol( layer->width() / symbolWidth, *symbolDD ) );
QScopedPointer< QgsDataDefined > scaledDD( scaleWholeSymbol( lineLayer->width() / symbolWidth, *symbolDD ) );
if ( !layerWidthDD || *layerWidthDD != *( scaledDD.data() ) )
return QgsDataDefined();
}

QScopedPointer< QgsDataDefined > scaledOffsetDD( scaleWholeSymbol( layer->offset() / symbolWidth, *symbolDD ) );
QScopedPointer< QgsDataDefined > scaledOffsetDD( scaleWholeSymbol( lineLayer->offset() / symbolWidth, *symbolDD ) );
if ( layerOffsetDD && *layerOffsetDD != *( scaledOffsetDD.data() ) )
return QgsDataDefined();
}
Expand Down Expand Up @@ -1422,7 +1442,9 @@ void QgsLineSymbolV2::renderPolyline( const QPolygonF& points, const QgsFeature*

Q_FOREACH ( QgsSymbolLayerV2* symbolLayer, mLayers )
{
QgsLineSymbolLayerV2* lineLayer = dynamic_cast<QgsLineSymbolLayerV2*>( symbolLayer );
if ( symbolLayer->type() != QgsSymbolV2::Line )
continue;
QgsLineSymbolLayerV2* lineLayer = static_cast<QgsLineSymbolLayerV2*>( symbolLayer );

if ( lineLayer )
renderPolylineUsingLayer( lineLayer, points, symbolContext );
Expand Down Expand Up @@ -1480,9 +1502,9 @@ void QgsFillSymbolV2::renderPolygon( const QPolygonF& points, QList<QPolygonF>*

if ( layerIdx != -1 )
{
if ( layerIdx >= 0 && layerIdx < mLayers.count() )
QgsSymbolLayerV2* layer = mLayers.value( layerIdx );
if ( layer )
{
QgsSymbolLayerV2* layer = mLayers.at( layerIdx );
if ( layer->type() == Fill || layer->type() == Line )
renderPolygonUsingLayer( layer, points, rings, symbolContext );
else
Expand Down Expand Up @@ -1582,7 +1604,10 @@ void QgsFillSymbolV2::setAngle( double angle )
{
Q_FOREACH ( QgsSymbolLayerV2* layer, mLayers )
{
QgsFillSymbolLayerV2* fillLayer = dynamic_cast<QgsFillSymbolLayerV2*>( layer );
if ( layer->type() != QgsSymbolV2::Fill )
continue;

QgsFillSymbolLayerV2* fillLayer = static_cast<QgsFillSymbolLayerV2*>( layer );

if ( fillLayer )
fillLayer->setAngle( angle );
Expand Down

2 comments on commit 7daca21

@nirvn
Copy link
Contributor

@nirvn nirvn commented on 7daca21 Dec 11, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@m-kuhn thanks. Here's a gift in return, one more dynamic buffer symbology fill example (this time for markers):
marker-dynamic-buffer

The red circles are a shapeburst fill, and the third circle is a SVG fill; the layer is a point dataset, with a dynamic buffer created using buffer($geometry,1000).

@m-kuhn
Copy link
Member Author

@m-kuhn m-kuhn commented on 7daca21 Dec 11, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @nirvn

Please sign in to comment.