Merge pull request #740 from 3nids/snapfirstnode

Visual snapping when adding first node or starting feature (fix #8300)
qgis · Jul 16, 2013 · 6b6742b · 6b6742b
2 parents dc489df + 805be41
commit 6b6742b
Showing 1 changed file with 16 additions and 19 deletions.
diff --git a/src/app/qgsmaptoolcapture.cpp b/src/app/qgsmaptoolcapture.cpp
@@ -105,28 +105,25 @@ void QgsMapToolCapture::currentLayerChanged( QgsMapLayer *layer )
 
 void QgsMapToolCapture::canvasMoveEvent( QMouseEvent * e )
 {
-  if ( mCaptureMode == CapturePoint )
-    return;
-
-  if ( mRubberBand && mCapturing )
+  QgsPoint mapPoint;
+  QList<QgsSnappingResult> snapResults;
+  if ( mSnapper.snapToBackgroundLayers( e->pos(), snapResults ) == 0 )
   {
-    QgsPoint mapPoint;
-    QList<QgsSnappingResult> snapResults;
-    if ( mSnapper.snapToBackgroundLayers( e->pos(), snapResults ) == 0 )
+    while ( !mSnappingMarkers.isEmpty() )
+      delete mSnappingMarkers.takeFirst();
+
+    foreach ( const QgsSnappingResult &r, snapResults )
     {
-      while ( !mSnappingMarkers.isEmpty() )
-        delete mSnappingMarkers.takeFirst();
-
-      foreach ( const QgsSnappingResult &r, snapResults )
-      {
-        QgsVertexMarker *m = new QgsVertexMarker( mCanvas );
-        m->setIconType( QgsVertexMarker::ICON_CROSS );
-        m->setColor( Qt::green );
-        m->setPenWidth( 1 );
-        m->setCenter( r.snappedVertex );
-        mSnappingMarkers << m;
-      }
+      QgsVertexMarker *m = new QgsVertexMarker( mCanvas );
+      m->setIconType( QgsVertexMarker::ICON_CROSS );
+      m->setColor( Qt::green );
+      m->setPenWidth( 2 );
+      m->setCenter( r.snappedVertex );
+      mSnappingMarkers << m;
+    }
 
+    if ( mCaptureMode != CapturePoint && mRubberBand && mCapturing )
+    {
       mapPoint = snapPointFromResults( snapResults, e->pos() );
       mRubberBand->movePoint( mapPoint );
     }