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

[FEATURE][labels] allow to delete custom label rotation

Browse Source 
by pressing DEL key when moving the label
This commit is contained in:
Denis Rouzaud 2019-11-20 08:33:02 +01:00
parent 99bf9687aa
commit 0e110cf01a
1 changed files with 49 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/app/qgsmaptoolrotatelabel.cpp
View File

@ -235,14 +235,56 @@ void QgsMapToolRotateLabel::canvasPressEvent( QgsMapMouseEvent *e )
void QgsMapToolRotateLabel::keyReleaseEvent( QKeyEvent *e )
{
if ( mLabelRubberBand && e->key() == Qt::Key_Escape )
if ( mLabelRubberBand )
{
// escape is cancel
deleteRubberBands();
delete mRotationItem;
mRotationItem = nullptr;
delete mRotationPreviewBox;
mRotationPreviewBox = nullptr;
switch ( e->key() )
{
case Qt::Key_Delete:
{
// delete the label rotation
QgsVectorLayer *vlayer = mCurrentLabel.layer;
if ( vlayer )
{
int rotationCol;
if ( labelIsRotatable( vlayer, mCurrentLabel.settings, rotationCol ) )
{
vlayer->beginEditCommand( tr( "Delete Label Rotation" ) + QStringLiteral( " '%1'" ).arg( currentLabelText( 24 ) ) );
if ( !vlayer->changeAttributeValue( mCurrentLabel.pos.featureId, rotationCol, QVariant() ) )
{
// if the edit command fails, it's likely because the label x/y is being stored in a physical field (not a auxiliary one!)
// and the layer isn't in edit mode
if ( !vlayer->isEditable() )
{
QgisApp::instance()->messageBar()->pushWarning( tr( "Delete Label Rotation" ), tr( "Layer “%1” must be editable in order to move labels from it" ).arg( vlayer->name() ) );
}
else
{
QgisApp::instance()->messageBar()->pushWarning( tr( "Delete Label Rotation" ), tr( "Error encountered while storing new label position" ) );
}
}
vlayer->endEditCommand();
deleteRubberBands();
delete mRotationItem;
mRotationItem = nullptr;
delete mRotationPreviewBox;
mRotationPreviewBox = nullptr;
vlayer->triggerRepaint();
}
}
break;
}
case Qt::Key_Escape:
{
// escape is cancel
deleteRubberBands();
delete mRotationItem;
mRotationItem = nullptr;
delete mRotationPreviewBox;
mRotationPreviewBox = nullptr;
}
}
}
}