Improve appearance and readability of rotate marker overlay

qgis · Oct 21, 2020 · 0480a64 · 0480a64
1 parent 690d403
commit 0480a64
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 17 deletions.
diff --git a/src/app/qgspointrotationitem.cpp b/src/app/qgspointrotationitem.cpp
@@ -16,6 +16,7 @@
 #include "qgspointrotationitem.h"
 #include <QPainter>
 #include <cmath>
+#include "qgsguiutils.h"
 
 QgsPointRotationItem::QgsPointRotationItem( QgsMapCanvas *canvas )
   : QgsMapCanvasItem( canvas )
@@ -37,6 +38,7 @@ void QgsPointRotationItem::paint( QPainter *painter )
   {
     return;
   }
+  painter->setRenderHint( QPainter::Antialiasing, true );
   painter->save();
 
   //do a bit of trigonometry to find out how to transform a rotated item such that the center point is at the point feature
@@ -55,12 +57,35 @@ void QgsPointRotationItem::paint( QPainter *painter )
   painter->translate( x - mPixmap.width() / 2.0, -y - mPixmap.height() / 2.0 );
   painter->drawPixmap( 0, 0, mPixmap );
 
-  //draw numeric value beside the symbol
+  //draw arrow, using a red line over a thicker white line so that the arrow is visible against a range of backgrounds
+  QPen pen;
+  pen.setWidth( QgsGuiUtils::scaleIconSize( 4 ) );
+  pen.setColor( QColor( Qt::white ) );
+  painter->setPen( pen );
+  painter->drawPath( mArrowPath );
+  pen.setWidth( QgsGuiUtils::scaleIconSize( 1 ) );
+  pen.setColor( QColor( Qt::red ) );
+  painter->setPen( pen );
+  painter->drawPath( mArrowPath );
   painter->restore();
+
+  //draw numeric value beside the symbol
+  painter->save();
+
+  QPen bufferPen;
+  bufferPen.setColor( Qt::white );
+  bufferPen.setWidthF( QgsGuiUtils::scaleIconSize( 4 ) );
   QFontMetricsF fm( mFont );
-  painter->fillRect( mPixmap.width(), 0, mItemSize.width() - mPixmap.width(), mItemSize.height(), QColor( Qt::white ) );
-  painter->setFont( mFont );
-  painter->drawText( mPixmap.width(), mPixmap.height() / 2.0 + fm.height() / 2.0, QString::number( mRotation ) );
+  QPainterPath label;
+  label.addText( mPixmap.width(), mPixmap.height() / 2.0 + fm.height() / 2.0, mFont, QString::number( mRotation ) );
+  painter->setPen( bufferPen );
+  painter->setBrush( Qt::NoBrush );
+  painter->drawPath( label );
+  painter->setPen( Qt::NoPen );
+  painter->setBrush( QBrush( Qt::black ) );
+  painter->drawPath( label );
+
+  painter->restore();
 }
 
 void QgsPointRotationItem::setPointLocation( const QgsPointXY &p )
@@ -74,25 +99,13 @@ void QgsPointRotationItem::setSymbol( const QImage &symbolImage )
   mPixmap = QPixmap::fromImage( symbolImage );
   QFontMetricsF fm( mFont );
 
-  //draw arrow
-  QPainter p( &mPixmap );
-  QPen pen;
-  pen.setWidth( 1 );
-  pen.setColor( QColor( Qt::red ) );
-  p.setPen( pen );
-  int halfItemWidth = mPixmap.width() / 2;
-  int quarterItemHeight = mPixmap.height() / 4;
-  p.drawLine( halfItemWidth, mPixmap.height(), halfItemWidth, 0 );
-  p.drawLine( halfItemWidth, 0, mPixmap.width() / 4, quarterItemHeight );
-  p.drawLine( halfItemWidth, 0, mPixmap.width() * 0.75, quarterItemHeight );
-
   //set item size
 #if QT_VERSION < QT_VERSION_CHECK(5, 11, 0)
   mItemSize.setWidth( mPixmap.width() + fm.width( QStringLiteral( "360" ) ) );
 #else
   mItemSize.setWidth( mPixmap.width() + fm.horizontalAdvance( QStringLiteral( "360" ) ) );
 #endif
-  double pixmapHeight = mPixmap.height();
+  const double pixmapHeight = mPixmap.height();
   double fontHeight = fm.height();
   if ( pixmapHeight >= fontHeight )
   {
@@ -102,6 +115,14 @@ void QgsPointRotationItem::setSymbol( const QImage &symbolImage )
   {
     mItemSize.setHeight( fm.height() );
   }
+
+  const double halfItemWidth = mPixmap.width() / 2.0;
+  mArrowPath.clear();
+  mArrowPath.moveTo( halfItemWidth, pixmapHeight );
+  mArrowPath.lineTo( halfItemWidth, 0 );
+  mArrowPath.moveTo( mPixmap.width() * 0.25, pixmapHeight * 0.25 );
+  mArrowPath.lineTo( halfItemWidth, 0 );
+  mArrowPath.lineTo( mPixmap.width() * 0.75, pixmapHeight * 0.25 );
 }
 
 int QgsPointRotationItem::painterRotation( int rotation ) const

diff --git a/src/app/qgspointrotationitem.h b/src/app/qgspointrotationitem.h
@@ -62,6 +62,8 @@ class APP_EXPORT QgsPointRotationItem: public QgsMapCanvasItem
     //! Symbol pixmap
     QPixmap mPixmap;
     int mRotation;
+    QPainterPath mArrowPath;
+
 };
 
 #endif // QGSPOINTROTATIONITEM_H