Fix todo in QgsMapMouseEvent

wonder-sk · wonder-sk · commit c391abd75275 · 2015-01-21T12:06:43.000+07:00
diff --git a/src/app/qgsmapmouseevent.cpp b/src/app/qgsmapmouseevent.cpp
@@ -78,6 +78,11 @@ QgsPoint QgsMapMouseEvent::mapPoint( bool* snappedPoint ) const
   return mMapPoint;
 }
 
+struct EdgesOnlyFilter : public QgsPointLocator::MatchFilter
+{
+  bool acceptMatch( const QgsPointLocator::Match& m ) { return m.hasEdge(); }
+};
+
 QList<QgsPoint> QgsMapMouseEvent::snappedSegment( bool* snapped ) const
 {
   QList<QgsPoint> segment =  QList<QgsPoint>();
@@ -89,7 +94,9 @@ QList<QgsPoint> QgsMapMouseEvent::snappedSegment( bool* snapped ) const
   }
   else
   {
-    // TODO: run snapToMap with only segments (resp. all hits)
+    // run snapToMap with only segments
+    EdgesOnlyFilter filter;
+    mMapTool->canvas()->snappingUtils()->snapToMap( mMapPoint, &filter );
   }
 
   if ( snapped )

Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,11 @@ QgsPoint QgsMapMouseEvent::mapPoint( bool* snappedPoint ) const`
`78`	`78`	`return mMapPoint;`
`79`	`79`	`}`
`80`	`80`
	`81`	`+struct EdgesOnlyFilter : public QgsPointLocator::MatchFilter`
	`82`	`+{`
	`83`	`+ bool acceptMatch( const QgsPointLocator::Match& m ) { return m.hasEdge(); }`
	`84`	`+};`
	`85`	`+`
`81`	`86`	`QList<QgsPoint> QgsMapMouseEvent::snappedSegment( bool* snapped ) const`
`82`	`87`	`{`
`83`	`88`	`QList<QgsPoint> segment = QList<QgsPoint>();`
`@@ -89,7 +94,9 @@ QList<QgsPoint> QgsMapMouseEvent::snappedSegment( bool* snapped ) const`
`89`	`94`	`}`
`90`	`95`	`else`
`91`	`96`	`{`
`92`		`- // TODO: run snapToMap with only segments (resp. all hits)`
	`97`	`+ // run snapToMap with only segments`
	`98`	`+ EdgesOnlyFilter filter;`
	`99`	`+ mMapTool->canvas()->snappingUtils()->snapToMap( mMapPoint, &filter );`
`93`	`100`	`}`
`94`	`101`
`95`	`102`	`if ( snapped )`