Merge pull request #1172 from leyan/multiple_snapping

replace list of snapping markers with a single marker
qgis · Feb 26, 2014 · 6670bfc · 6670bfc
2 parents 2d21b67 + f66c461
commit 6670bfc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git a/src/app/qgsmaptoolcapture.cpp b/src/app/qgsmaptoolcapture.cpp
@@ -51,8 +51,7 @@ QgsMapToolCapture::QgsMapToolCapture( QgsMapCanvas* canvas, enum CaptureMode too
 
 QgsMapToolCapture::~QgsMapToolCapture()
 {
-  while ( !mSnappingMarkers.isEmpty() )
-    delete mSnappingMarkers.takeFirst();
+  delete mSnappingMarker;
 
   stopCapturing();
 
@@ -65,8 +64,7 @@ QgsMapToolCapture::~QgsMapToolCapture()
 
 void QgsMapToolCapture::deactivate()
 {
-  while ( !mSnappingMarkers.isEmpty() )
-    delete mSnappingMarkers.takeFirst();
+  delete mSnappingMarker;
 
   QgsMapToolEdit::deactivate();
 }
@@ -107,18 +105,14 @@ void QgsMapToolCapture::canvasMoveEvent( QMouseEvent * e )
   QList<QgsSnappingResult> snapResults;
   if ( mSnapper.snapToBackgroundLayers( e->pos(), snapResults ) == 0 )
   {
-    while ( !mSnappingMarkers.isEmpty() )
-      delete mSnappingMarkers.takeFirst();
+    delete mSnappingMarker;
+
+    mSnappingMarker = new QgsVertexMarker( mCanvas );
+    mSnappingMarker->setIconType( QgsVertexMarker::ICON_CROSS );
+    mSnappingMarker->setColor( Qt::magenta );
+    mSnappingMarker->setPenWidth( 3 );
+    mSnappingMarker->setCenter( snapPointFromResults(snapResults,e->pos()) );
 
-    foreach ( const QgsSnappingResult &r, snapResults )
-    {
-      QgsVertexMarker *m = new QgsVertexMarker( mCanvas );
-      m->setIconType( QgsVertexMarker::ICON_CROSS );
-      m->setColor( Qt::magenta );
-      m->setPenWidth( 3 );
-      m->setCenter( r.snappedVertex );
-      mSnappingMarkers << m;
-    }
 
     if ( mCaptureMode != CapturePoint && mTempRubberBand && mCapturing )
     {

diff --git a/src/app/qgsmaptoolcapture.h b/src/app/qgsmaptoolcapture.h
@@ -116,7 +116,7 @@ class APP_EXPORT QgsMapToolCapture : public QgsMapToolEdit
 
     bool mCaptureModeFromLayer;
 
-    QList<QgsVertexMarker *> mSnappingMarkers;
+    QgsVertexMarker* mSnappingMarker;
 };
 
 #endif