sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

[composer] Make parameterised SVG arrow heads respect colors (fix #14997)

Browse Source
This commit is contained in:
Nyall Dawson 2016-06-14 12:11:50 +10:00
parent 44db212aa1
commit 78c434a6c4
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/core/composer/qgscomposerarrow.cpp
View File

@ -19,6 +19,7 @@
#include "qgscomposition.h" #include "qgscomposition.h"
#include "qgscomposerutils.h" #include "qgscomposerutils.h"
#include "qgssymbollayerv2utils.h" #include "qgssymbollayerv2utils.h"
#include "qgssvgcache.h"
#include <QPainter> #include <QPainter>
#include <QSvgRenderer> #include <QSvgRenderer>
#include <QVector2D> #include <QVector2D>
@ -252,22 +253,14 @@ void QgsComposerArrow::drawSVGMarker( QPainter* p, MarkerType type, const QStrin
imageFixPoint.setY( 0 ); imageFixPoint.setY( 0 );
} }
//rasterize svg QString svgFileName = ( type == StartMarker ? mStartMarkerFile : mEndMarkerFile );
if ( svgFileName.isEmpty() )
return;
QSvgRenderer r; QSvgRenderer r;
if ( type == StartMarker ) const QByteArray &svgContent = QgsSvgCache::instance()->svgContent( svgFileName, mArrowHeadWidth, mArrowHeadFillColor, mArrowHeadOutlineColor, mArrowHeadOutlineWidth,
{ 1.0, 1.0 );
if ( mStartMarkerFile.isEmpty() || !r.load( mStartMarkerFile ) ) r.load( svgContent );
{
return;
}
}
else //end marker
{
if ( mEndMarkerFile.isEmpty() || !r.load( mEndMarkerFile ) )
{
return;
}
}
p->save(); p->save();
p->setRenderHint( QPainter::Antialiasing ); p->setRenderHint( QPainter::Antialiasing );