sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix replacement in style attribute

Browse Source
This commit is contained in:
Marco Hugentobler 2011-06-29 09:20:15 +02:00
parent 66c009fca7
commit 7e274d81ea
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/core/symbology-ng/qgssvgcache.cpp
View File

@ -157,7 +157,7 @@ QgsSvgCacheEntry* QgsSvgCache::insertSVG( const QString& file, double size, cons
} }
void QgsSvgCache::containsParams( const QString& path, bool& hasFillParam, QColor& defaultFillColor, bool& hasOutlineParam, QColor& defaultOutlineColor, void QgsSvgCache::containsParams( const QString& path, bool& hasFillParam, QColor& defaultFillColor, bool& hasOutlineParam, QColor& defaultOutlineColor,
bool& hasOutlineWidthParam, double& defaultOutlineWidth ) const bool& hasOutlineWidthParam, double& defaultOutlineWidth ) const
{ {
/*hasFillParam = false; /*hasFillParam = false;
hasOutlineParam = false; hasOutlineParam = false;
@ -191,7 +191,7 @@ void QgsSvgCache::containsParams( const QString& path, bool& hasFillParam, QColo
}*/ }*/
defaultFillColor = QColor( Qt::black ); defaultFillColor = QColor( Qt::black );
defaultOutlineColor= QColor( Qt::black ); defaultOutlineColor = QColor( Qt::black );
defaultOutlineWidth = 1.0; defaultOutlineWidth = 1.0;
QFile svgFile( path ); QFile svgFile( path );
@ -398,15 +398,15 @@ void QgsSvgCache::replaceElemParams( QDomElement& elem, const QColor& fill, cons
} }
void QgsSvgCache::containsElemParams( const QDomElement& elem, bool& hasFillParam, QColor& defaultFill, bool& hasOutlineParam, QColor& defaultOutline, void QgsSvgCache::containsElemParams( const QDomElement& elem, bool& hasFillParam, QColor& defaultFill, bool& hasOutlineParam, QColor& defaultOutline,
bool& hasOutlineWidthParam, double& defaultOutlineWidth ) const bool& hasOutlineWidthParam, double& defaultOutlineWidth ) const
{ {
if( elem.isNull() ) if ( elem.isNull() )
{ {
return; return;
} }
//we already have all the information, no need to go deeper //we already have all the information, no need to go deeper
if( hasFillParam && hasOutlineParam && hasOutlineWidthParam ) if ( hasFillParam && hasOutlineParam && hasOutlineWidthParam )
{ {
return; return;
} }
@ -426,27 +426,34 @@ void QgsSvgCache::containsElemParams( const QDomElement& elem, bool& hasFillPara
QStringList::const_iterator entryIt = entryList.constBegin(); QStringList::const_iterator entryIt = entryList.constBegin();
for ( ; entryIt != entryList.constEnd(); ++entryIt ) for ( ; entryIt != entryList.constEnd(); ++entryIt )
{ {
valueSplit = entryIt->split(" "); QStringList keyValueSplit = entryIt->split( ':' );
if( !hasFillParam && entryIt->startsWith( "param(fill)" ) ) if ( keyValueSplit.size() < 2 )
{
continue;
}
QString key = keyValueSplit.at( 0 );
QString value = keyValueSplit.at( 1 );
valueSplit = value.split( " " );
if ( !hasFillParam && value.startsWith( "param(fill)" ) )
{ {
hasFillParam = true; hasFillParam = true;
if( valueSplit.size() > 1 ) if ( valueSplit.size() > 1 )
{ {
defaultFill = QColor( valueSplit.at( 1 ) ); defaultFill = QColor( valueSplit.at( 1 ) );
} }
} }
else if( !hasOutlineParam && entryIt->startsWith( "param(outline)" ) ) else if ( !hasOutlineParam && value.startsWith( "param(outline)" ) )
{ {
hasOutlineParam = true; hasOutlineParam = true;
if( valueSplit.size() > 1 ) if ( valueSplit.size() > 1 )
{ {
defaultOutline = QColor( valueSplit.at( 1 ) ); defaultOutline = QColor( valueSplit.at( 1 ) );
} }
} }
else if( !hasOutlineWidthParam && entryIt->startsWith( "param(outlineWidth)" ) ) else if ( !hasOutlineWidthParam && value.startsWith( "param(outlineWidth)" ) )
{ {
hasOutlineWidthParam = true; hasOutlineWidthParam = true;
if( valueSplit.size() > 1 ) if ( valueSplit.size() > 1 )
{ {
defaultOutlineWidth = valueSplit.at( 1 ).toDouble(); defaultOutlineWidth = valueSplit.at( 1 ).toDouble();
} }
@ -456,27 +463,27 @@ void QgsSvgCache::containsElemParams( const QDomElement& elem, bool& hasFillPara
else else
{ {
QString value = attribute.value(); QString value = attribute.value();
valueSplit = value.split(" "); valueSplit = value.split( " " );
if ( !hasFillParam && value.startsWith( "param(fill)" ) ) if ( !hasFillParam && value.startsWith( "param(fill)" ) )
{ {
hasFillParam = true; hasFillParam = true;
if( valueSplit.size() > 1 ) if ( valueSplit.size() > 1 )
{ {
defaultFill = QColor( valueSplit.at( 1 ) ); defaultFill = QColor( valueSplit.at( 1 ) );
} }
} }
else if( !hasOutlineParam && value.startsWith( "param(outline)" ) ) else if ( !hasOutlineParam && value.startsWith( "param(outline)" ) )
{ {
hasOutlineParam = true; hasOutlineParam = true;
if( valueSplit.size() > 1 ) if ( valueSplit.size() > 1 )
{ {
defaultOutline = QColor( valueSplit.at( 1 ) ); defaultOutline = QColor( valueSplit.at( 1 ) );
} }
} }
else if( !hasOutlineWidthParam && value.startsWith( "param(outlineWidth)" ) ) else if ( !hasOutlineWidthParam && value.startsWith( "param(outlineWidth)" ) )
{ {
hasOutlineWidthParam = true; hasOutlineWidthParam = true;
if( valueSplit.size() > 1 ) if ( valueSplit.size() > 1 )
{ {
defaultOutlineWidth = valueSplit.at( 1 ).toDouble(); defaultOutlineWidth = valueSplit.at( 1 ).toDouble();
} }