revert adding tolerance to QgsSnappingUtils::snapToCurrentLayer

3nids · 3nids · commit 965a4e87aa8b · 2018-02-19T02:08:36.000-09:00
since it already uses digitizing settings
diff --git a/python/core/qgssnappingutils.sip.in b/python/core/qgssnappingutils.sip.in
@@ -54,16 +54,9 @@ Snap to map according to the current configuration. Optional filter allows disca
     QgsPointLocator::Match snapToMap( const QgsPointXY &pointMap, QgsPointLocator::MatchFilter *filter = 0 );
 
 
-    QgsPointLocator::Match snapToCurrentLayer( QPoint point, QgsPointLocator::Types type, QgsPointLocator::MatchFilter *filter = 0, double tolerance = 0.0 );
+    QgsPointLocator::Match snapToCurrentLayer( QPoint point, QgsPointLocator::Types type, QgsPointLocator::MatchFilter *filter = 0 );
 %Docstring
- snapToCurrentLayer snap to current layer with given settings
-
-:param point: the point to snap from
-:param type: the matching type (vertex, edge, area)
-:param filter: the matching filter
-:param tolerance: the tolerance in project units. If left to 0, it is calculated from current map settings
-
-:return: the snapping match
+Snap to current layer
 %End
 
 
diff --git a/src/core/qgssnappingutils.cpp b/src/core/qgssnappingutils.cpp
@@ -440,14 +440,13 @@ void QgsSnappingUtils::toggleEnabled()
   emit configChanged( mSnappingConfig );
 }
 
-QgsPointLocator::Match QgsSnappingUtils::snapToCurrentLayer( QPoint point, QgsPointLocator::Types type, QgsPointLocator::MatchFilter *filter, double tolerance )
+QgsPointLocator::Match QgsSnappingUtils::snapToCurrentLayer( QPoint point, QgsPointLocator::Types type, QgsPointLocator::MatchFilter *filter )
 {
   if ( !mCurrentLayer )
     return QgsPointLocator::Match();
 
   QgsPointXY pointMap = mMapSettings.mapToPixel().toMapCoordinates( point );
-  if ( tolerance == 0.0 )
-    tolerance = QgsTolerance::vertexSearchRadius( mMapSettings );
+  double tolerance = QgsTolerance::vertexSearchRadius( mMapSettings );
 
   QgsPointLocator *loc = locatorForLayerUsingStrategy( mCurrentLayer, pointMap, tolerance );
   if ( !loc )
diff --git a/src/core/qgssnappingutils.h b/src/core/qgssnappingutils.h
@@ -67,15 +67,8 @@ class CORE_EXPORT QgsSnappingUtils : public QObject
 
     //! Snap to current layer
 
-    /**
-     * \brief snapToCurrentLayer snap to current layer with given settings
-     * \param point the point to snap from
-     * \param type the matching type (vertex, edge, area)
-     * \param filter the matching filter
-     * \param tolerance the tolerance in project units. If left to 0, it is calculated from current map settings
-     * \return the snapping match
-     */
-    QgsPointLocator::Match snapToCurrentLayer( QPoint point, QgsPointLocator::Types type, QgsPointLocator::MatchFilter *filter = nullptr, double tolerance = 0.0 );
+    //! Snap to current layer
+    QgsPointLocator::Match snapToCurrentLayer( QPoint point, QgsPointLocator::Types type, QgsPointLocator::MatchFilter *filter = nullptr );
 
     // environment setup
 

Original file line number	Diff line number	Diff line change
`@@ -440,14 +440,13 @@ void QgsSnappingUtils::toggleEnabled()`
`440`	`440`	`emit configChanged( mSnappingConfig );`
`441`	`441`	`}`
`442`	`442`
`443`		`-QgsPointLocator::Match QgsSnappingUtils::snapToCurrentLayer( QPoint point, QgsPointLocator::Types type, QgsPointLocator::MatchFilter *filter, double tolerance )`
	`443`	`+QgsPointLocator::Match QgsSnappingUtils::snapToCurrentLayer( QPoint point, QgsPointLocator::Types type, QgsPointLocator::MatchFilter *filter )`
`444`	`444`	`{`
`445`	`445`	`if ( !mCurrentLayer )`
`446`	`446`	`return QgsPointLocator::Match();`
`447`	`447`
`448`	`448`	`QgsPointXY pointMap = mMapSettings.mapToPixel().toMapCoordinates( point );`
`449`		`- if ( tolerance == 0.0 )`
`450`		`- tolerance = QgsTolerance::vertexSearchRadius( mMapSettings );`
	`449`	`+ double tolerance = QgsTolerance::vertexSearchRadius( mMapSettings );`
`451`	`450`
`452`	`451`	`QgsPointLocator *loc = locatorForLayerUsingStrategy( mCurrentLayer, pointMap, tolerance );`
`453`	`452`	`if ( !loc )`