[svg markers] allow setting alpha value for fill and outline colors

nirvn · nyalldawson · commit 757cd7af854a · 2015-12-08T22:45:42.000+11:00
diff --git a/src/core/symbology-ng/qgssvgcache.cpp b/src/core/symbology-ng/qgssvgcache.cpp
@@ -620,14 +620,22 @@ void QgsSvgCache::replaceElemParams( QDomElement& elem, const QColor& fill, cons
         }
         QString key = keyValueSplit.at( 0 );
         QString value = keyValueSplit.at( 1 );
-        if ( value.startsWith( "param(fill" ) )
+        if ( value.startsWith( "param(fill)" ) )
         {
           value = fill.name();
         }
+        else if ( value.startsWith( "param(fill-opacity)" ) )
+        {
+          value = fill.alphaF();
+        }
         else if ( value.startsWith( "param(outline)" ) )
         {
           value = outline.name();
         }
+        else if ( value.startsWith( "param(outline-opacity)" ) )
+        {
+          value = outline.alphaF();
+        }
         else if ( value.startsWith( "param(outline-width)" ) )
         {
           value = QString::number( outlineWidth );
@@ -648,10 +656,18 @@ void QgsSvgCache::replaceElemParams( QDomElement& elem, const QColor& fill, cons
       {
         elem.setAttribute( attribute.name(), fill.name() );
       }
+      else if ( value.startsWith( "param(fill-opacity)" ) )
+      {
+        elem.setAttribute( attribute.name(), fill.alphaF() );
+      }
       else if ( value.startsWith( "param(outline)" ) )
       {
         elem.setAttribute( attribute.name(), outline.name() );
       }
+      else if ( value.startsWith( "param(outline-opacity)" ) )
+      {
+        elem.setAttribute( attribute.name(), outline.alphaF() );
+      }
       else if ( value.startsWith( "param(outline-width)" ) )
       {
         elem.setAttribute( attribute.name(), QString::number( outlineWidth ) );
diff --git a/src/gui/symbology-ng/qgssymbollayerv2widget.cpp b/src/gui/symbology-ng/qgssymbollayerv2widget.cpp
@@ -1564,11 +1564,12 @@ QgsSvgMarkerSymbolLayerV2Widget::QgsSvgMarkerSymbolLayerV2Widget( const QgsVecto
   mBorderWidthUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
   mOffsetUnitWidget->setUnits( QgsSymbolV2::OutputUnitList() << QgsSymbolV2::MM << QgsSymbolV2::MapUnit << QgsSymbolV2::Pixel );
   viewGroups->setHeaderHidden( true );
-
+  mChangeColorButton->setAllowAlpha( true );
   mChangeColorButton->setColorDialogTitle( tr( "Select fill color" ) );
   mChangeColorButton->setContext( "symbology" );
+  mChangeBorderColorButton->setAllowAlpha( true );
   mChangeBorderColorButton->setColorDialogTitle( tr( "Select border color" ) );
-  mChangeColorButton->setContext( "symbology" );
+  mChangeBorderColorButton->setContext( "symbology" );
 
   spinOffsetX->setClearValue( 0.0 );
   spinOffsetY->setClearValue( 0.0 );

Original file line number	Diff line number	Diff line change
`@@ -620,14 +620,22 @@ void QgsSvgCache::replaceElemParams( QDomElement& elem, const QColor& fill, cons`
`620`	`620`	`}`
`621`	`621`	`QString key = keyValueSplit.at( 0 );`
`622`	`622`	`QString value = keyValueSplit.at( 1 );`
`623`		`- if ( value.startsWith( "param(fill" ) )`
	`623`	`+ if ( value.startsWith( "param(fill)" ) )`
`624`	`624`	`{`
`625`	`625`	`value = fill.name();`
`626`	`626`	`}`
	`627`	`+ else if ( value.startsWith( "param(fill-opacity)" ) )`
	`628`	`+ {`
	`629`	`+ value = fill.alphaF();`
	`630`	`+ }`
`627`	`631`	`else if ( value.startsWith( "param(outline)" ) )`
`628`	`632`	`{`
`629`	`633`	`value = outline.name();`
`630`	`634`	`}`
	`635`	`+ else if ( value.startsWith( "param(outline-opacity)" ) )`
	`636`	`+ {`
	`637`	`+ value = outline.alphaF();`
	`638`	`+ }`
`631`	`639`	`else if ( value.startsWith( "param(outline-width)" ) )`
`632`	`640`	`{`
`633`	`641`	`value = QString::number( outlineWidth );`
`@@ -648,10 +656,18 @@ void QgsSvgCache::replaceElemParams( QDomElement& elem, const QColor& fill, cons`
`648`	`656`	`{`
`649`	`657`	`elem.setAttribute( attribute.name(), fill.name() );`
`650`	`658`	`}`
	`659`	`+ else if ( value.startsWith( "param(fill-opacity)" ) )`
	`660`	`+ {`
	`661`	`+ elem.setAttribute( attribute.name(), fill.alphaF() );`
	`662`	`+ }`
`651`	`663`	`else if ( value.startsWith( "param(outline)" ) )`
`652`	`664`	`{`
`653`	`665`	`elem.setAttribute( attribute.name(), outline.name() );`
`654`	`666`	`}`
	`667`	`+ else if ( value.startsWith( "param(outline-opacity)" ) )`
	`668`	`+ {`
	`669`	`+ elem.setAttribute( attribute.name(), outline.alphaF() );`
	`670`	`+ }`
`655`	`671`	`else if ( value.startsWith( "param(outline-width)" ) )`
`656`	`672`	`{`
`657`	`673`	`elem.setAttribute( attribute.name(), QString::number( outlineWidth ) );`