@@ -1041,7 +1041,7 @@ QgsSvgMarkerSymbolLayerV2::QgsSvgMarkerSymbolLayerV2( const QString& name, doubl
1041
1041
mScaleMethod = scaleMethod;
1042
1042
mOutlineWidth = 1.0 ;
1043
1043
mOutlineWidthUnit = QgsSymbolV2::MM;
1044
- mFillColor = QColor ( Qt::black );
1044
+ mColor = QColor ( Qt::black );
1045
1045
mOutlineColor = QColor ( Qt::black );
1046
1046
}
1047
1047
@@ -1292,10 +1292,10 @@ void QgsSvgMarkerSymbolLayerV2::renderPoint( const QPointF& point, QgsSymbolV2Re
1292
1292
}
1293
1293
outlineWidth = QgsSymbolLayerV2Utils::convertToPainterUnits ( context.renderContext (), outlineWidth, mOutlineWidthUnit , mOutlineWidthMapUnitScale );
1294
1294
1295
- QColor fillColor = mFillColor ;
1295
+ QColor fillColor = mColor ;
1296
1296
if ( hasDataDefinedProperty ( QgsSymbolLayerV2::EXPR_FILL ) )
1297
1297
{
1298
- context.setOriginalValueVariable ( QgsSymbolLayerV2Utils::encodeColor ( mFillColor ) );
1298
+ context.setOriginalValueVariable ( QgsSymbolLayerV2Utils::encodeColor ( mColor ) );
1299
1299
QString colorString = evaluateDataDefinedProperty ( QgsSymbolLayerV2::EXPR_FILL, context, QVariant (), &ok ).toString ();
1300
1300
if ( ok )
1301
1301
fillColor = QgsSymbolLayerV2Utils::decodeColor ( colorString );
@@ -1386,8 +1386,8 @@ QgsStringMap QgsSvgMarkerSymbolLayerV2::properties() const
1386
1386
map[" offset_unit" ] = QgsSymbolLayerV2Utils::encodeOutputUnit ( mOffsetUnit );
1387
1387
map[" offset_map_unit_scale" ] = QgsSymbolLayerV2Utils::encodeMapUnitScale ( mOffsetMapUnitScale );
1388
1388
map[" scale_method" ] = QgsSymbolLayerV2Utils::encodeScaleMethod ( mScaleMethod );
1389
- map[" color" ] = mFillColor . name ( );
1390
- map[" outline_color" ] = mOutlineColor . name ( );
1389
+ map[" color" ] = QgsSymbolLayerV2Utils::encodeColor ( mColor );
1390
+ map[" outline_color" ] = QgsSymbolLayerV2Utils::encodeColor ( mOutlineColor );
1391
1391
map[" outline_width" ] = QString::number ( mOutlineWidth );
1392
1392
map[" outline_width_unit" ] = QgsSymbolLayerV2Utils::encodeOutputUnit ( mOutlineWidthUnit );
1393
1393
map[" outline_width_map_unit_scale" ] = QgsSymbolLayerV2Utils::encodeMapUnitScale ( mOutlineWidthMapUnitScale );
@@ -1401,7 +1401,7 @@ QgsStringMap QgsSvgMarkerSymbolLayerV2::properties() const
1401
1401
QgsSymbolLayerV2* QgsSvgMarkerSymbolLayerV2::clone () const
1402
1402
{
1403
1403
QgsSvgMarkerSymbolLayerV2* m = new QgsSvgMarkerSymbolLayerV2 ( mPath , mSize , mAngle );
1404
- m->setFillColor ( mFillColor );
1404
+ m->setColor ( mColor );
1405
1405
m->setOutlineColor ( mOutlineColor );
1406
1406
m->setOutlineWidth ( mOutlineWidth );
1407
1407
m->setOutlineWidthUnit ( mOutlineWidthUnit );
@@ -1455,7 +1455,7 @@ void QgsSvgMarkerSymbolLayerV2::writeSldMarker( QDomDocument &doc, QDomElement &
1455
1455
QDomElement graphicElem = doc.createElement ( " se:Graphic" );
1456
1456
element.appendChild ( graphicElem );
1457
1457
1458
- QgsSymbolLayerV2Utils::externalGraphicToSld ( doc, graphicElem, mPath , " image/svg+xml" , mFillColor , mSize );
1458
+ QgsSymbolLayerV2Utils::externalGraphicToSld ( doc, graphicElem, mPath , " image/svg+xml" , mColor , mSize );
1459
1459
1460
1460
// <Rotation>
1461
1461
QString angleFunc;
@@ -1598,10 +1598,10 @@ bool QgsSvgMarkerSymbolLayerV2::writeDxf( QgsDxfExport& e, double mmMapUnitScale
1598
1598
}
1599
1599
outlineWidth = QgsSymbolLayerV2Utils::convertToPainterUnits ( context->renderContext (), outlineWidth, mOutlineWidthUnit , mOutlineWidthMapUnitScale );
1600
1600
1601
- QColor fillColor = mFillColor ;
1601
+ QColor fillColor = mColor ;
1602
1602
if ( hasDataDefinedProperty ( QgsSymbolLayerV2::EXPR_FILL ) )
1603
1603
{
1604
- context->setOriginalValueVariable ( QgsSymbolLayerV2Utils::encodeColor ( mFillColor ) );
1604
+ context->setOriginalValueVariable ( QgsSymbolLayerV2Utils::encodeColor ( mColor ) );
1605
1605
QString colorString = evaluateDataDefinedProperty ( QgsSymbolLayerV2::EXPR_FILL, *context, QVariant (), &ok ).toString ();
1606
1606
if ( ok )
1607
1607
fillColor = QgsSymbolLayerV2Utils::decodeColor ( colorString );
0 commit comments