Allow cancelation of polygon/polyline creation

qgis · Nov 7, 2017 · 87ef5c5 · 87ef5c5
1 parent 4e8483e
commit 87ef5c5
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 0 deletions.
diff --git a/python/gui/layout/qgslayoutviewtooladdnodeitem.sip b/python/gui/layout/qgslayoutviewtooladdnodeitem.sip
@@ -45,6 +45,8 @@ class QgsLayoutViewToolAddNodeItem : QgsLayoutViewTool
 
     virtual void layoutReleaseEvent( QgsLayoutViewMouseEvent *event );
 
+    virtual void keyPressEvent( QKeyEvent *event );
+
     virtual void deactivate();
 
 

diff --git a/src/gui/layout/qgslayoutviewtooladdnodeitem.cpp b/src/gui/layout/qgslayoutviewtooladdnodeitem.cpp
@@ -111,6 +111,38 @@ void QgsLayoutViewToolAddNodeItem::layoutReleaseEvent( QgsLayoutViewMouseEvent *
   }
 }
 
+void QgsLayoutViewToolAddNodeItem::keyPressEvent( QKeyEvent *event )
+{
+  if ( !mRubberBand || event->isAutoRepeat() )
+  {
+    event->ignore();
+    return;
+  }
+
+  if ( event->key() == Qt::Key_Delete || event->key() == Qt::Key_Backspace )
+  {
+    if ( mPolygon.size() > 2 )
+    {
+      //remove last added vertex
+      mPolygon.pop_back();
+      setRubberBandNodes();
+    }
+    else
+    {
+      // all deleted, cancel
+      mRubberBand.reset();
+    }
+  }
+  else if ( event->key() == Qt::Key_Escape )
+  {
+    mRubberBand.reset();
+  }
+  else
+  {
+    event->ignore();
+  }
+}
+
 void QgsLayoutViewToolAddNodeItem::deactivate()
 {
   if ( mRubberBand )

diff --git a/src/gui/layout/qgslayoutviewtooladdnodeitem.h b/src/gui/layout/qgslayoutviewtooladdnodeitem.h
@@ -55,6 +55,7 @@ class GUI_EXPORT QgsLayoutViewToolAddNodeItem : public QgsLayoutViewTool
     void layoutPressEvent( QgsLayoutViewMouseEvent *event ) override;
     void layoutMoveEvent( QgsLayoutViewMouseEvent *event ) override;
     void layoutReleaseEvent( QgsLayoutViewMouseEvent *event ) override;
+    void keyPressEvent( QKeyEvent *event ) override;
     void deactivate() override;
 
   signals: