nyall's review

qgis · Feb 4, 2020 · a4d8820 · a4d8820
1 parent 6fe51c4
commit a4d8820
Showing 1 changed file with 30 additions and 25 deletions.
diff --git a/src/gui/qgsmaptooldigitizefeature.cpp b/src/gui/qgsmaptooldigitizefeature.cpp
@@ -94,37 +94,42 @@ void QgsMapToolDigitizeFeature::setCheckGeometryType( bool checkGeometryType )
 
 void QgsMapToolDigitizeFeature::keyPressEvent( QKeyEvent *e )
 {
-  QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( mLayer );
+  if ( e && e->key() == Qt::Key_C )
-  if ( !vlayer )
-    //if no given layer take the current from canvas
-    vlayer = currentVectorLayer();
-
-  if ( !vlayer )
   {
-    notifyNotVectorLayer();
+    QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( mLayer );
-    return;
+    if ( !vlayer )
-  }
+      //if no given layer take the current from canvas
+      vlayer = currentVectorLayer();
 
-  QgsVectorDataProvider *provider = vlayer->dataProvider();
+    if ( !vlayer )
+    {
+      notifyNotVectorLayer();
+      return;
+    }
 
-  if ( !( provider->capabilities() & QgsVectorDataProvider::AddFeatures ) )
+    QgsVectorDataProvider *provider = vlayer->dataProvider();
-  {
-    emit messageEmitted( tr( "The data provider for this layer does not support the addition of features." ), Qgis::Warning );
-    return;
-  }
 
-  if ( !vlayer->isEditable() )
+    if ( !( provider->capabilities() & QgsVectorDataProvider::AddFeatures ) )
-  {
+    {
-    notifyNotEditableLayer();
+      emit messageEmitted( tr( "The data provider for this layer does not support the addition of features." ), Qgis::Warning );
-    return;
+      return;
-  }
+    }
 
-  if ( e && e->key() == Qt::Key_C && mode() == CaptureLine && vlayer->geometryType() == QgsWkbTypes::LineGeometry && mCheckGeometryType )
+    if ( !vlayer->isEditable() )
-  {
+    {
-    closePolygon();
+      notifyNotEditableLayer();
-    QgsMapMouseEvent e2( mCanvas, QEvent::MouseButtonRelease, QPoint( ), Qt::RightButton );
+      return;
-    cadCanvasReleaseEvent( &e2 );
+    }
+
+    if ( ( mode() == CaptureLine && vlayer->geometryType() == QgsWkbTypes::LineGeometry && mCheckGeometryType ) || ( mode() == CapturePolygon && vlayer->geometryType() == QgsWkbTypes::PolygonGeometry && mCheckGeometryType ) )
+    {
+      closePolygon();
+      QgsMapMouseEvent e2( mCanvas, QEvent::MouseButtonRelease, QPoint( ), Qt::RightButton );
+      cadCanvasReleaseEvent( &e2 );
+    }
   }
+  else
+    QgsMapToolCapture::keyPressEvent( e );
 }
 void QgsMapToolDigitizeFeature::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
 {