Ellipse marker support for color expressions (Fix #9114)

m-kuhn · m-kuhn · commit c1d2798f47b7 · 2013-11-25T08:54:27.000+01:00
diff --git a/src/core/symbology-ng/qgsellipsesymbollayerv2.cpp b/src/core/symbology-ng/qgsellipsesymbollayerv2.cpp
@@ -195,12 +195,12 @@ void QgsEllipseSymbolLayerV2::renderPoint( const QPointF& point, QgsSymbolV2Rend
   if ( fillColorExpression )
   {
     QString colorString = fillColorExpression->evaluate( const_cast<QgsFeature*>( context.feature() ) ).toString();
-    mBrush.setColor( QColor( colorString ) );
+    mBrush.setColor( QColor( QgsSymbolLayerV2Utils::decodeColor( colorString ) ) );
   }
   if ( outlineColorExpression )
   {
     QString colorString = outlineColorExpression->evaluate( const_cast<QgsFeature*>( context.feature() ) ).toString();
-    mPen.setColor( QColor( colorString ) );
+    mPen.setColor( QColor( QgsSymbolLayerV2Utils::decodeColor( colorString ) ) );
   }
   if ( widthExpression || heightExpression || symbolNameExpression )
   {

Original file line number	Diff line number	Diff line change
`@@ -195,12 +195,12 @@ void QgsEllipseSymbolLayerV2::renderPoint( const QPointF& point, QgsSymbolV2Rend`
`195`	`195`	`if ( fillColorExpression )`
`196`	`196`	`{`
`197`	`197`	`QString colorString = fillColorExpression->evaluate( const_cast<QgsFeature*>( context.feature() ) ).toString();`
`198`		`- mBrush.setColor( QColor( colorString ) );`
	`198`	`+ mBrush.setColor( QColor( QgsSymbolLayerV2Utils::decodeColor( colorString ) ) );`
`199`	`199`	`}`
`200`	`200`	`if ( outlineColorExpression )`
`201`	`201`	`{`
`202`	`202`	`QString colorString = outlineColorExpression->evaluate( const_cast<QgsFeature*>( context.feature() ) ).toString();`
`203`		`- mPen.setColor( QColor( colorString ) );`
	`203`	`+ mPen.setColor( QColor( QgsSymbolLayerV2Utils::decodeColor( colorString ) ) );`
`204`	`204`	`}`
`205`	`205`	`if ( widthExpression \|\| heightExpression \|\| symbolNameExpression )`
`206`	`206`	`{`