Skip to content

Commit

Permalink
Added svg parameters to marker files
Browse files Browse the repository at this point in the history
  • Loading branch information
mhugent committed Jun 29, 2011
1 parent 0a15a07 commit 3ca7458
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions images/svg/geometric/Square1.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions images/svg/geometric/Square2.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions images/svg/geometric/Triangle1.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion images/svg/transport/amenity=airport.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions images/svg/transport/amenity=ferry_terminal.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 9 additions & 9 deletions images/svg/transport/amenity=taxi.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
Expand Up @@ -609,7 +609,7 @@ QgsSymbolLayerV2* QgsSvgMarkerSymbolLayerV2::clone() const
QgsSvgMarkerSymbolLayerV2* m = new QgsSvgMarkerSymbolLayerV2( mPath, mSize, mAngle );
m->setFillColor( mFillColor );
m->setOutlineColor( mOutlineColor );
m->setOutlineWidth( 1.0 );
m->setOutlineWidth( mOutlineWidth );
m->setOffset( mOffset );
return m;
}
Expand Down
4 changes: 2 additions & 2 deletions src/core/symbology-ng/qgssvgcache.cpp
Expand Up @@ -450,7 +450,7 @@ void QgsSvgCache::containsElemParams( const QDomElement& elem, bool& hasFillPara
defaultOutline = QColor( valueSplit.at( 1 ) );
}
}
else if ( !hasOutlineWidthParam && value.startsWith( "param(outlineWidth)" ) )
else if ( !hasOutlineWidthParam && value.startsWith( "param(outline-width)" ) )
{
hasOutlineWidthParam = true;
if ( valueSplit.size() > 1 )
Expand Down Expand Up @@ -480,7 +480,7 @@ void QgsSvgCache::containsElemParams( const QDomElement& elem, bool& hasFillPara
defaultOutline = QColor( valueSplit.at( 1 ) );
}
}
else if ( !hasOutlineWidthParam && value.startsWith( "param(outlineWidth)" ) )
else if ( !hasOutlineWidthParam && value.startsWith( "param(outline-width)" ) )
{
hasOutlineWidthParam = true;
if ( valueSplit.size() > 1 )
Expand Down

0 comments on commit 3ca7458

Please sign in to comment.