Actually hook up missing datadefined outline style for ellipse marker

nyalldawson · nyalldawson · commit 8216f7dfc972 · 2015-01-22T16:04:35.000+11:00
diff --git a/src/core/symbology-ng/qgsellipsesymbollayerv2.cpp b/src/core/symbology-ng/qgsellipsesymbollayerv2.cpp
@@ -173,6 +173,10 @@ QgsSymbolLayerV2* QgsEllipseSymbolLayerV2::create( const QgsStringMap& propertie
   {
     layer->setDataDefinedProperty( "outline_width", properties[ "outline_width_expression" ] );
   }
+  if ( properties.contains( "outline_style_expression" ) )
+  {
+    layer->setDataDefinedProperty( "outline_style", properties[ "outline_style_expression" ] );
+  }
   if ( properties.contains( "fill_color_expression" ) )
   {
     layer->setDataDefinedProperty( "fill_color", properties["fill_color_expression"] );
@@ -234,6 +238,7 @@ QgsSymbolLayerV2* QgsEllipseSymbolLayerV2::create( const QgsStringMap& propertie
 void QgsEllipseSymbolLayerV2::renderPoint( const QPointF& point, QgsSymbolV2RenderContext& context )
 {
   QgsExpression* outlineWidthExpression = expression( "outline_width" );
+  QgsExpression* outlineStyleExpression = expression( "outline_style" );
   QgsExpression* fillColorExpression = expression( "fill_color" );
   QgsExpression* outlineColorExpression = expression( "outline_color" );
   QgsExpression* widthExpression = expression( "width" );
@@ -247,6 +252,11 @@ void QgsEllipseSymbolLayerV2::renderPoint( const QPointF& point, QgsSymbolV2Rend
     width *= QgsSymbolLayerV2Utils::lineWidthScaleFactor( context.renderContext(), mOutlineWidthUnit, mOutlineWidthMapUnitScale );
     mPen.setWidthF( width );
   }
+  if ( outlineStyleExpression )
+  {
+    Qt::PenStyle style = QgsSymbolLayerV2Utils::decodePenStyle( outlineStyleExpression->evaluate( const_cast<QgsFeature*>( context.feature() ) ).toString() );
+    mPen.setStyle( style );
+  }
   if ( fillColorExpression )
   {
     QString colorString = fillColorExpression->evaluate( const_cast<QgsFeature*>( context.feature() ) ).toString();

Original file line number	Diff line number	Diff line change
`@@ -173,6 +173,10 @@ QgsSymbolLayerV2* QgsEllipseSymbolLayerV2::create( const QgsStringMap& propertie`
`173`	`173`	`{`
`174`	`174`	`layer->setDataDefinedProperty( "outline_width", properties[ "outline_width_expression" ] );`
`175`	`175`	`}`
	`176`	`+ if ( properties.contains( "outline_style_expression" ) )`
	`177`	`+ {`
	`178`	`+ layer->setDataDefinedProperty( "outline_style", properties[ "outline_style_expression" ] );`
	`179`	`+ }`
`176`	`180`	`if ( properties.contains( "fill_color_expression" ) )`
`177`	`181`	`{`
`178`	`182`	`layer->setDataDefinedProperty( "fill_color", properties["fill_color_expression"] );`
`@@ -234,6 +238,7 @@ QgsSymbolLayerV2* QgsEllipseSymbolLayerV2::create( const QgsStringMap& propertie`
`234`	`238`	`void QgsEllipseSymbolLayerV2::renderPoint( const QPointF& point, QgsSymbolV2RenderContext& context )`
`235`	`239`	`{`
`236`	`240`	`QgsExpression* outlineWidthExpression = expression( "outline_width" );`
	`241`	`+ QgsExpression* outlineStyleExpression = expression( "outline_style" );`
`237`	`242`	`QgsExpression* fillColorExpression = expression( "fill_color" );`
`238`	`243`	`QgsExpression* outlineColorExpression = expression( "outline_color" );`
`239`	`244`	`QgsExpression* widthExpression = expression( "width" );`
`@@ -247,6 +252,11 @@ void QgsEllipseSymbolLayerV2::renderPoint( const QPointF& point, QgsSymbolV2Rend`
`247`	`252`	`width *= QgsSymbolLayerV2Utils::lineWidthScaleFactor( context.renderContext(), mOutlineWidthUnit, mOutlineWidthMapUnitScale );`
`248`	`253`	`mPen.setWidthF( width );`
`249`	`254`	`}`
	`255`	`+ if ( outlineStyleExpression )`
	`256`	`+ {`
	`257`	`+ Qt::PenStyle style = QgsSymbolLayerV2Utils::decodePenStyle( outlineStyleExpression->evaluate( const_cast<QgsFeature*>( context.feature() ) ).toString() );`
	`258`	`+ mPen.setStyle( style );`
	`259`	`+ }`
`250`	`260`	`if ( fillColorExpression )`
`251`	`261`	`{`
`252`	`262`	`QString colorString = fillColorExpression->evaluate( const_cast<QgsFeature*>( context.feature() ) ).toString();`