Add notification in case a map tool does notthing (fixes #15160)

qgis · Jun 29, 2016 · 51c6d8a · 51c6d8a
1 parent a12152c
commit 51c6d8a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/src/app/nodetool/qgsmaptoolnodetool.cpp b/src/app/nodetool/qgsmaptoolnodetool.cpp
@@ -228,7 +228,7 @@ void QgsMapToolNodeTool::canvasPressEvent( QgsMapMouseEvent* e )
       QgsFeature feature = getFeatureAtPoint( e );
       if ( !feature.constGeometry() )
       {
-        emit messageEmitted( tr( "could not snap to a segment on the current layer." ) );
+        emit messageEmitted( tr( "Could not snap to a feature in the current layer." ) );
         return;
       }
       else

diff --git a/src/app/qgsmaptooloffsetcurve.cpp b/src/app/qgsmaptooloffsetcurve.cpp
@@ -119,6 +119,10 @@ void QgsMapToolOffsetCurve::canvasReleaseEvent( QgsMapMouseEvent* e )
         createDistanceWidget();
       }
     }
+    else
+    {
+      emit messageEmitted( tr( "Could not find a nearby feature in any vector layer." ) );
+    }
     return;
   }
 

diff --git a/src/app/qgsmaptoolrotatefeature.cpp b/src/app/qgsmaptoolrotatefeature.cpp
@@ -257,6 +257,7 @@ void QgsMapToolRotateFeature::canvasReleaseEvent( QgsMapMouseEvent* e )
 
       if ( minDistance == std::numeric_limits<double>::max() )
       {
+        emit messageEmitted( tr( "Could not find a nearby feature in the current layer." ) );
         return;
       }
 

diff --git a/src/app/qgsmaptoolsimplify.cpp b/src/app/qgsmaptoolsimplify.cpp
@@ -257,6 +257,12 @@ void QgsMapToolSimplify::canvasReleaseEvent( QgsMapMouseEvent* e )
 
   mDragging = false;
 
+  if ( mSelectedFeatures.isEmpty() )
+  {
+    emit messageEmitted( tr( "Could not find a nearby feature in the current layer." ) );
+    return;
+  }
+
   // count vertices, prepare rubber bands
   mOriginalVertexCount = 0;
   Q_FOREACH ( const QgsFeature& f, mSelectedFeatures )