Fix bad icon drawn on top of points when rotating labels

This commit is contained in:
Nyall Dawson 2017-09-04 12:34:47 +10:00
parent 0f407e1e5d
commit d1d5e6cf83
3 changed files with 4 additions and 9 deletions

View File

@ -92,7 +92,6 @@ void QgsMapToolRotateLabel::canvasPressEvent( QgsMapMouseEvent *e )
mRotationItem = new QgsPointRotationItem( mCanvas );
mRotationItem->setOrientation( QgsPointRotationItem::Clockwise );
mRotationItem->setSymbol( QgsApplication::getThemePixmap( QStringLiteral( "mActionRotatePointSymbols.svg" ) ).toImage() );
mRotationItem->setPointLocation( mRotationPoint );
mRotationItem->setSymbolRotation( mCurrentRotation );
}

View File

@ -25,14 +25,10 @@ QgsPointRotationItem::QgsPointRotationItem( QgsMapCanvas *canvas )
//setup font
mFont.setPointSize( 12 );
mFont.setBold( true );
}
QgsPointRotationItem::QgsPointRotationItem()
: QgsMapCanvasItem( nullptr )
, mOrientation( Clockwise )
, mRotation( 0.0 )
{
QImage im( 24, 24, QImage::Format_ARGB32 );
im.fill( Qt::transparent );
setSymbol( im );
}
QgsPointRotationItem::~QgsPointRotationItem()

View File

@ -51,7 +51,7 @@ class APP_EXPORT QgsPointRotationItem: public QgsMapCanvasItem
Orientation orientation() const { return mOrientation; }
private:
QgsPointRotationItem();
//! Converts rotation into QPainter rotation considering mOrientation
int painterRotation( int rotation ) const;
//! Clockwise (default) or counterclockwise