Escape should cancel rotation map tool

qgis · Jan 22, 2018 · 8a6fcc8eace5ff412107d8267b52b40f69624df0 · 8a6fcc8
1 parent 5a80ec5
commit 8a6fcc8eace5ff412107d8267b52b40f69624df0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/src/app/qgsmaptoolrotatefeature.cpp b/src/app/qgsmaptoolrotatefeature.cpp
@@ -109,6 +109,11 @@ bool QgsAngleMagnetWidget::eventFilter( QObject *obj, QEvent *ev )
   if ( obj == mAngleSpinBox && ev->type() == QEvent::KeyPress )
   {
     QKeyEvent *event = static_cast<QKeyEvent *>( ev );
+    if ( event->key() == Qt::Key_Escape )
+    {
+      emit angleEditingCanceled();
+      return true;
+    }
     if ( event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return )
     {
       emit angleEditingFinished( angle() );
@@ -309,6 +314,13 @@ void QgsMapToolRotateFeature::canvasReleaseEvent( QgsMapMouseEvent *e )
   applyRotation( mRotation );
 }
 
+void QgsMapToolRotateFeature::cancel()
+{
+  deleteRotationWidget();
+  deleteRubberband();
+  mRotationActive = false;
+}
+
 void QgsMapToolRotateFeature::updateRubberband( double rotation )
 {
   if ( mRotationActive )
@@ -455,6 +467,7 @@ void QgsMapToolRotateFeature::createRotationWidget()
 
   connect( mRotationWidget, &QgsAngleMagnetWidget::angleChanged, this, &QgsMapToolRotateFeature::updateRubberband );
   connect( mRotationWidget, &QgsAngleMagnetWidget::angleEditingFinished, this, &QgsMapToolRotateFeature::applyRotation );
+  connect( mRotationWidget, &QgsAngleMagnetWidget::angleEditingCanceled, this, &QgsMapToolRotateFeature::cancel );
 }
 
 void QgsMapToolRotateFeature::deleteRotationWidget()
@@ -463,6 +476,8 @@ void QgsMapToolRotateFeature::deleteRotationWidget()
   {
     disconnect( mRotationWidget, &QgsAngleMagnetWidget::angleChanged, this, &QgsMapToolRotateFeature::updateRubberband );
     disconnect( mRotationWidget, &QgsAngleMagnetWidget::angleEditingFinished, this, &QgsMapToolRotateFeature::applyRotation );
+    disconnect( mRotationWidget, &QgsAngleMagnetWidget::angleEditingCanceled, this, &QgsMapToolRotateFeature::cancel );
+
     mRotationWidget->releaseKeyboard();
     mRotationWidget->deleteLater();
   }

diff --git a/src/app/qgsmaptoolrotatefeature.h b/src/app/qgsmaptoolrotatefeature.h
@@ -43,6 +43,7 @@ class APP_EXPORT QgsAngleMagnetWidget : public QWidget
   signals:
     void angleChanged( double angle );
     void angleEditingFinished( double angle );
+    void angleEditingCanceled();
 
 
   public slots:
@@ -81,6 +82,7 @@ class APP_EXPORT QgsMapToolRotateFeature: public QgsMapToolEdit
     void updateRubberband( double rotation );
 
     void applyRotation( double rotation );
+    void cancel();
 
   private: