Support also style-syntax for svg params

mhugent · mhugent · commit 166b3d258942 · 2011-06-27T13:59:16.000+02:00
diff --git a/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp b/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
@@ -537,7 +537,7 @@ void QgsSvgMarkerSymbolLayerV2::renderPoint( const QPointF& point, QgsSymbolV2Re
   if( context.selected() )
   {
     QPen pen( context.selectionColor() );
-    pen.setWidth( 2 );
+    pen.setWidth( context.outputLineWidth( 1.0 ) );
     p->setPen( pen );
     p->setBrush( Qt::NoBrush );
     double sizePixel = context.outputLineWidth( mSize );
diff --git a/src/core/symbology-ng/qgssvgcache.cpp b/src/core/symbology-ng/qgssvgcache.cpp
@@ -74,7 +74,7 @@ QgsSvgCache::QgsSvgCache(): mTotalSize( 0 )
 QgsSvgCache::~QgsSvgCache()
 {
   QMultiHash< QString, QgsSvgCacheEntry* >::iterator it = mEntryLookup.begin();
-  for( ; it != mEntryLookup.end(); ++it )
+  for ( ; it != mEntryLookup.end(); ++it )
   {
     delete it.value();
   }
@@ -94,7 +94,7 @@ const QImage& QgsSvgCache::svgAsImage( const QString& file, double size, const Q
   }
 
   //debug: display current cache usage
-  QgsDebugMsg("cache size: " + QString::number( mTotalSize ) );
+  QgsDebugMsg( "cache size: " + QString::number( mTotalSize ) );
 
   //set entry timestamp to current time
   currentEntry->lastUsed = QDateTime::currentDateTime();
@@ -115,7 +115,7 @@ const QPicture& QgsSvgCache::svgAsPicture( const QString& file, double size, con
   }
 
   //debug: display current cache usage
-  QgsDebugMsg("cache size: " + QString::number( mTotalSize ) );
+  QgsDebugMsg( "cache size: " + QString::number( mTotalSize ) );
 
   //set entry timestamp to current time
   currentEntry->lastUsed = QDateTime::currentDateTime();
@@ -155,15 +155,15 @@ void QgsSvgCache::containsParams( const QString& path, bool& hasFillParam, bool&
 
   //there are surely faster ways to get this information
   QString content = svgDoc.toString();
-  if( content.contains("param(fill") )
+  if ( content.contains( "param(fill" ) )
   {
     hasFillParam = true;
   }
-  if( content.contains("param(outline") )
+  if ( content.contains( "param(outline" ) )
   {
     hasOutlineParam = true;
   }
-  if( content.contains("param(outline-width)" ) )
+  if ( content.contains( "param(outline-width)" ) )
   {
     hasOutlineWidthParam = true;
   }
@@ -215,7 +215,7 @@ void QgsSvgCache::cacheImage( QgsSvgCacheEntry* entry )
   r.render( &p );
 
   entry->image = image;
-  mTotalSize += (image->width() * image->height() * 32);
+  mTotalSize += ( image->width() * image->height() * 32 );
 }
 
 void QgsSvgCache::cachePicture( QgsSvgCacheEntry *entry )
@@ -284,18 +284,54 @@ void QgsSvgCache::replaceElemParams( QDomElement& elem, const QColor& fill, cons
   for ( int i = 0; i < nAttributes; ++i )
   {
     QDomAttr attribute = attributes.item( i ).toAttr();
-    QString value = attribute.value();
-    if ( value.startsWith( "param(fill)" ) )
+    //e.g. style="fill:param(fill);param(stroke)"
+    if ( attribute.name().compare( "style", Qt::CaseInsensitive ) == 0 )
     {
-      elem.setAttribute( attribute.name(), fill.name() );
+      //entries separated by ';'
+      QString newAttributeString;
+
+      QStringList entryList = attribute.value().split( ';' );
+      QStringList::const_iterator entryIt = entryList.constBegin();
+      for ( ; entryIt != entryList.constEnd(); ++entryIt )
+      {
+        QStringList keyValueSplit = entryIt->split( ':' );
+        if ( keyValueSplit.size() < 2 )
+        {
+          continue;
+        }
+        QString key = keyValueSplit.at( 0 );
+        QString value = keyValueSplit.at( 1 );
+        if ( value.startsWith( "param(fill" ) )
+        {
+          value = fill.name();
+        }
+        else if ( value.startsWith( "param(outline)" ) )
+        {
+          value = outline.name();
+        }
+        else if ( value.startsWith( "param(outline-width)" ) )
+        {
+          value = QString::number( outlineWidth );
+        }
+        newAttributeString.append( key + ":" + value + ";" );
+      }
+      elem.setAttribute( attribute.name(), newAttributeString );
     }
-    else if ( value.startsWith( "param(outline)" ) )
+    else
     {
-      elem.setAttribute( attribute.name(), outline.name() );
-    }
-    else if ( value.startsWith( "param(outline-width)" ) )
-    {
-      elem.setAttribute( attribute.name(), QString::number( outlineWidth ) );
+      QString value = attribute.value();
+      if ( value.startsWith( "param(fill)" ) )
+      {
+        elem.setAttribute( attribute.name(), fill.name() );
+      }
+      else if ( value.startsWith( "param(outline)" ) )
+      {
+        elem.setAttribute( attribute.name(), outline.name() );
+      }
+      else if ( value.startsWith( "param(outline-width)" ) )
+      {
+        elem.setAttribute( attribute.name(), QString::number( outlineWidth ) );
+      }
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -537,7 +537,7 @@ void QgsSvgMarkerSymbolLayerV2::renderPoint( const QPointF& point, QgsSymbolV2Re`
`537`	`537`	`if( context.selected() )`
`538`	`538`	`{`
`539`	`539`	`QPen pen( context.selectionColor() );`
`540`		`- pen.setWidth( 2 );`
	`540`	`+ pen.setWidth( context.outputLineWidth( 1.0 ) );`
`541`	`541`	`p->setPen( pen );`
`542`	`542`	`p->setBrush( Qt::NoBrush );`
`543`	`543`	`double sizePixel = context.outputLineWidth( mSize );`