sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

avoid warning messages on composer arrows without markers

Browse Source
This commit is contained in:
Juergen E. Fischer 2014-03-26 09:46:03 +01:00
parent b4b01550e4
commit a838700801
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,14 +169,14 @@ void QgsComposerArrow::drawSVGMarker( QPainter* p, MarkerType type, const QStrin
QSvgRenderer r;
if ( type == StartMarker )
{
if ( !r.load( mStartMarkerFile ) )
if ( mStartMarkerFile.isEmpty() || !r.load( mStartMarkerFile ) )
{
return;
}
}
else //end marker
{
if ( !r.load( mEndMarkerFile ) )
if ( mEndMarkerFile.isEmpty() || !r.load( mEndMarkerFile ) )
{
return;
}
@ -215,7 +215,7 @@ void QgsComposerArrow::drawSVGMarker( QPainter* p, MarkerType type, const QStrin
void QgsComposerArrow::setStartMarker( const QString& svgPath )
{
QSvgRenderer r;
if ( !r.load( svgPath ) )
if ( svgPath.isEmpty() || !r.load( svgPath ) )
{
return;
// mStartArrowHeadHeight = 0;
@ -231,7 +231,7 @@ void QgsComposerArrow::setStartMarker( const QString& svgPath )
void QgsComposerArrow::setEndMarker( const QString& svgPath )
{
QSvgRenderer r;
if ( !r.load( svgPath ) )
if ( svgPath.isEmpty() || !r.load( svgPath ) )
{
return;
// mStopArrowHeadHeight = 0;