Convert more code from QgsMapCanvasSnapper to QgsSnappingUtils

wonder-sk · wonder-sk · commit 1174361cd44f · 2015-01-20T10:21:55.000+07:00
diff --git a/src/app/qgsmaptoolrotatepointsymbols.cpp b/src/app/qgsmaptoolrotatepointsymbols.cpp
@@ -18,6 +18,7 @@
 #include "qgsmapcanvas.h"
 #include "qgspointrotationitem.h"
 #include "qgsrendererv2.h"
+#include "qgssnappingutils.h"
 #include "qgssymbolv2.h"
 #include "qgsvectorlayer.h"
 #include <QGraphicsPixmapItem>
@@ -91,15 +92,14 @@ void QgsMapToolRotatePointSymbols::canvasPressEvent( QMouseEvent *e )
   }
 
   //find the closest feature to the pressed position
-  QgsMapCanvasSnapper canvasSnapper( mCanvas );
-  QList<QgsSnappingResult> snapResults;
-  if ( canvasSnapper.snapToCurrentLayer( e->pos(), snapResults, QgsSnapper::SnapToVertex, -1 ) != 0 || snapResults.size() < 1 )
+  QgsPointLocator::Match m = mCanvas->snappingUtils()->snapToCurrentLayer( e->pos(), QgsPointLocator::Vertex );
+  if ( !m.isValid() )
   {
     emit messageEmitted( tr( "No point feature was detected at the clicked position. Please click closer to the feature or enhance the search tolerance under Settings->Options->Digitizing->Serch radius for vertex edits" ), QgsMessageBar::CRITICAL );
     return; //error during snapping
   }
 
-  mFeatureNumber = snapResults.at( 0 ).snappedAtGeometry;
+  mFeatureNumber = m.featureId();
 
   //get list with renderer rotation attributes
   if ( layerRotationAttributes( mActiveLayer, mCurrentRotationAttributes ) != 0 )
@@ -113,7 +113,7 @@ void QgsMapToolRotatePointSymbols::canvasPressEvent( QMouseEvent *e )
     return;
   }
 
-  mSnappedPoint = toCanvasCoordinates( snapResults.at( 0 ).snappedVertex );
+  mSnappedPoint = toCanvasCoordinates( m.point() );
 
   //find out initial arrow direction
   QgsFeature pointFeature;
@@ -131,7 +131,7 @@ void QgsMapToolRotatePointSymbols::canvasPressEvent( QMouseEvent *e )
   createPixmapItem( pointFeature );
   if ( mRotationItem )
   {
-    mRotationItem->setPointLocation( snapResults.at( 0 ).snappedVertex );
+    mRotationItem->setPointLocation( m.point() );
   }
   mCurrentMouseAzimut = calculateAzimut( e->pos() );
   setPixmapItemRotation(( int )( mCurrentMouseAzimut ) );
diff --git a/src/app/qgsmaptoolsplitfeatures.cpp b/src/app/qgsmaptoolsplitfeatures.cpp
@@ -18,6 +18,7 @@
 #include "qgsmapcanvas.h"
 #include "qgsmaptoolsplitfeatures.h"
 #include "qgsproject.h"
+#include "qgssnappingutils.h"
 #include "qgsvectorlayer.h"
 
 #include <QMouseEvent>
@@ -56,17 +57,13 @@ void QgsMapToolSplitFeatures::canvasMapReleaseEvent( QgsMapMouseEvent * e )
   //add point to list and to rubber band
   if ( e->button() == Qt::LeftButton )
   {
-    QList<QgsSnappingResult> snapResults;
-
     //If we snap the first point on a vertex of a line layer, we directly split the feature at this point
     if ( vlayer->geometryType() == QGis::Line && points().isEmpty() )
     {
-      if ( mSnapper.snapToCurrentLayer( e->pos(), snapResults, QgsSnapper::SnapToVertex ) == 0 )
+      QgsPointLocator::Match m = mCanvas->snappingUtils()->snapToCurrentLayer( e->pos(), QgsPointLocator::Vertex );
+      if ( m.isValid() )
       {
-        if ( snapResults.size() > 0 )
-        {
-          split = true;
-        }
+        split = true;
       }
     }
 
diff --git a/src/app/qgsmaptoolsplitparts.cpp b/src/app/qgsmaptoolsplitparts.cpp
@@ -18,6 +18,7 @@
 #include "qgsmapcanvas.h"
 #include "qgsproject.h"
 #include "qgsmaptoolsplitparts.h"
+#include "qgssnappingutils.h"
 #include "qgsvectorlayer.h"
 
 #include <QMouseEvent>
@@ -55,17 +56,13 @@ void QgsMapToolSplitParts::canvasMapReleaseEvent( QgsMapMouseEvent * e )
   //add point to list and to rubber band
   if ( e->button() == Qt::LeftButton )
   {
-    QList<QgsSnappingResult> snapResults;
-
     //If we snap the first point on a vertex of a line layer, we directly split the feature at this point
     if ( vlayer->geometryType() == QGis::Line && points().isEmpty() )
     {
-      if ( mSnapper.snapToCurrentLayer( e->pos(), snapResults, QgsSnapper::SnapToVertex ) == 0 )
+      QgsPointLocator::Match m = mCanvas->snappingUtils()->snapToCurrentLayer( e->pos(), QgsPointLocator::Vertex );
+      if ( m.isValid() )
       {
-        if ( snapResults.size() > 0 )
-        {
-          split = true;
-        }
+        split = true;
       }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`#include "qgsmapcanvas.h"`
`19`	`19`	`#include "qgsmaptoolsplitfeatures.h"`
`20`	`20`	`#include "qgsproject.h"`
	`21`	`+#include "qgssnappingutils.h"`
`21`	`22`	`#include "qgsvectorlayer.h"`
`22`	`23`
`23`	`24`	`#include <QMouseEvent>`
`@@ -56,17 +57,13 @@ void QgsMapToolSplitFeatures::canvasMapReleaseEvent( QgsMapMouseEvent * e )`
`56`	`57`	`//add point to list and to rubber band`
`57`	`58`	`if ( e->button() == Qt::LeftButton )`
`58`	`59`	`{`
`59`		`- QList<QgsSnappingResult> snapResults;`
`60`		`-`
`61`	`60`	`//If we snap the first point on a vertex of a line layer, we directly split the feature at this point`
`62`	`61`	`if ( vlayer->geometryType() == QGis::Line && points().isEmpty() )`
`63`	`62`	`{`
`64`		`- if ( mSnapper.snapToCurrentLayer( e->pos(), snapResults, QgsSnapper::SnapToVertex ) == 0 )`
	`63`	`+ QgsPointLocator::Match m = mCanvas->snappingUtils()->snapToCurrentLayer( e->pos(), QgsPointLocator::Vertex );`
	`64`	`+ if ( m.isValid() )`
`65`	`65`	`{`
`66`		`- if ( snapResults.size() > 0 )`
`67`		`- {`
`68`		`- split = true;`
`69`		`- }`
	`66`	`+ split = true;`
`70`	`67`	`}`
`71`	`68`	`}`
`72`	`69`