Remove another restriction on QgsMapToolCapture preventing non-vector

use of this class
qgis · Sep 8, 2021 · e7faf95 · e7faf95
1 parent c8ac971
commit e7faf95
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 20 deletions.
diff --git a/python/gui/auto_generated/qgsmaptoolcapture.sip.in b/python/gui/auto_generated/qgsmaptoolcapture.sip.in
@@ -157,7 +157,7 @@ Converts a map point to layer coordinates
 
 :return:
          0 in case of success
-         1 if the current layer is ``None`` or not a vector layer
+         1 if the current layer is ``None``
          2 if the transformation failed
 %End
 

diff --git a/src/gui/qgsmaptoolcapture.cpp b/src/gui/qgsmaptoolcapture.cpp
@@ -450,26 +450,26 @@ void QgsMapToolCapture::cadCanvasMoveEvent( QgsMapMouseEvent *e )
 
 int QgsMapToolCapture::nextPoint( const QgsPoint &mapPoint, QgsPoint &layerPoint )
 {
-  QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( mCanvas->currentLayer() );
-  if ( !vlayer )
-  {
-    QgsDebugMsg( QStringLiteral( "no vector layer" ) );
-    return 1;
-  }
-  try
+  if ( QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( mCanvas->currentLayer() ) )
   {
-    const QgsPointXY mapP( mapPoint.x(), mapPoint.y() );  //#spellok
-    layerPoint = QgsPoint( toLayerCoordinates( vlayer, mapP ) ); //transform snapped point back to layer crs  //#spellok
-    if ( QgsWkbTypes::hasZ( vlayer->wkbType() ) )
-      layerPoint.addZValue( defaultZValue() );
-    if ( QgsWkbTypes::hasM( vlayer->wkbType() ) )
-      layerPoint.addMValue( defaultMValue() );
+    try
+    {
+      const QgsPointXY mapP( mapPoint.x(), mapPoint.y() );  //#spellok
+      layerPoint = QgsPoint( toLayerCoordinates( vlayer, mapP ) ); //transform snapped point back to layer crs  //#spellok
+      if ( QgsWkbTypes::hasZ( vlayer->wkbType() ) )
+        layerPoint.addZValue( defaultZValue() );
+      if ( QgsWkbTypes::hasM( vlayer->wkbType() ) )
+        layerPoint.addMValue( defaultMValue() );
+    }
+    catch ( QgsCsException & )
+    {
+      QgsDebugMsg( QStringLiteral( "transformation to layer coordinate failed" ) );
+      return 2;
+    }
   }
-  catch ( QgsCsException &cse )
+  else
   {
-    Q_UNUSED( cse )
-    QgsDebugMsg( QStringLiteral( "transformation to layer coordinate failed" ) );
-    return 2;
+    layerPoint = QgsPoint( toLayerCoordinates( mCanvas->currentLayer(), mapPoint ) );
   }
 
   return 0;

diff --git a/src/gui/qgsmaptoolcapture.h b/src/gui/qgsmaptoolcapture.h
@@ -256,7 +256,7 @@ class GUI_EXPORT QgsMapToolCapture : public QgsMapToolAdvancedDigitizing
      *  \param[in,out] layerPoint the point in layer coordinates
      *  \returns
      *   0 in case of success
-     *   1 if the current layer is NULLPTR or not a vector layer
+     *   1 if the current layer is NULLPTR
      *   2 if the transformation failed
      */
     int nextPoint( const QgsPoint &mapPoint, QgsPoint &layerPoint );

diff --git a/tests/src/gui/testqgsmaptoolcapture.cpp b/tests/src/gui/testqgsmaptoolcapture.cpp
@@ -83,7 +83,11 @@ void TestQgsMapToolCapture::addVertexNonVectorLayer()
   // even though we don't have a vector layer selected, adding vertices should still be allowed
   QCOMPARE( tool.addVertex( QgsPoint( 5, 5 ), QgsPointLocator::Match() ), 0 );
 
-
+  // the nextPoint method must also accept non vector layers
+  QgsPoint layerPoint;
+  QCOMPARE( tool.nextPoint( QgsPoint( 5, 6 ), layerPoint ), 0 );
+  QCOMPARE( layerPoint.x(), 5.0 );
+  QCOMPARE( layerPoint.y(), 6.0 );
 }
 
 QGSTEST_MAIN( TestQgsMapToolCapture )