Dxf: another small improvement in symbology export

mhugent · mhugent · commit 45d6f7bf3f22 · 2013-12-18T16:43:50.000+01:00
diff --git a/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp b/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
@@ -764,8 +764,11 @@ bool QgsSimpleMarkerSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitSc
   }
   double halfSize = size / 2.0;
 
-
-  QColor c = mBrush.color();
+  QColor c = mPen.color();
+  if ( mPen.style() == Qt::NoPen )
+  {
+    c = mBrush.color();
+  }
   QgsExpression* colorExpression = expression( "color" );
   if ( colorExpression )
   {

Original file line number	Diff line number	Diff line change
`@@ -764,8 +764,11 @@ bool QgsSimpleMarkerSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitSc`
`764`	`764`	`}`
`765`	`765`	`double halfSize = size / 2.0;`
`766`	`766`
`767`		`-`
`768`		`- QColor c = mBrush.color();`
	`767`	`+ QColor c = mPen.color();`
	`768`	`+ if ( mPen.style() == Qt::NoPen )`
	`769`	`+ {`
	`770`	`+ c = mBrush.color();`
	`771`	`+ }`
`769`	`772`	`QgsExpression* colorExpression = expression( "color" );`
`770`	`773`	`if ( colorExpression )`
`771`	`774`	`{`