Showing with 14 additions and 5 deletions.
  1. +7 −2 src/app/qgsmaptooldeletepart.cpp
  2. +7 −3 src/app/qgsmaptooldeletering.cpp
9 changes: 7 additions & 2 deletions src/app/qgsmaptooldeletepart.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ void QgsMapToolDeletePart::canvasPressEvent( QMouseEvent *e )

mRecentSnappingResults.clear();
//do snap -> new recent snapping results
if ( mSnapper.snapToCurrentLayer( e->pos(), mRecentSnappingResults, QgsSnapper::SnapToVertex ) != 0 )
if ( mSnapper.snapToCurrentLayer( e->pos(), mRecentSnappingResults, QgsSnapper::SnapToVertexAndSegment ) != 0 )
{
//error
}
Expand Down Expand Up @@ -84,7 +84,12 @@ void QgsMapToolDeletePart::canvasReleaseEvent( QMouseEvent *e )
QList<QgsSnappingResult>::iterator sr_it = mRecentSnappingResults.begin();
for ( ; sr_it != mRecentSnappingResults.end(); ++sr_it )
{
deletePart( sr_it->snappedAtGeometry, sr_it->snappedVertexNr, vlayer );
if ( sr_it->snappedVertexNr != -1 )
deletePart( sr_it->snappedAtGeometry, sr_it->snappedVertexNr, vlayer );
else if ( sr_it->beforeVertexNr != -1 )
deletePart( sr_it->snappedAtGeometry, sr_it->beforeVertexNr, vlayer );
else if ( sr_it->afterVertexNr != -1 )
deletePart( sr_it->snappedAtGeometry, sr_it->afterVertexNr, vlayer );
}
}

Expand Down
10 changes: 7 additions & 3 deletions src/app/qgsmaptooldeletering.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ void QgsMapToolDeleteRing::canvasPressEvent( QMouseEvent *e )

mRecentSnappingResults.clear();
//do snap -> new recent snapping results
if ( mSnapper.snapToCurrentLayer( e->pos(), mRecentSnappingResults, QgsSnapper::SnapToVertex ) != 0 )
if ( mSnapper.snapToCurrentLayer( e->pos(), mRecentSnappingResults, QgsSnapper::SnapToVertexAndSegment ) != 0 )
{
//error
}
Expand Down Expand Up @@ -85,12 +85,16 @@ void QgsMapToolDeleteRing::canvasReleaseEvent( QMouseEvent *e )
QList<QgsSnappingResult>::iterator sr_it = mRecentSnappingResults.begin();
for ( ; sr_it != mRecentSnappingResults.end(); ++sr_it )
{
deleteRing( sr_it->snappedAtGeometry, sr_it->snappedVertexNr, vlayer );
if ( sr_it->snappedVertexNr != -1 )
deleteRing( sr_it->snappedAtGeometry, sr_it->snappedVertexNr, vlayer );
else if ( sr_it->beforeVertexNr != -1 )
deleteRing( sr_it->snappedAtGeometry, sr_it->beforeVertexNr, vlayer );
else if ( sr_it->afterVertexNr != -1 )
deleteRing( sr_it->snappedAtGeometry, sr_it->afterVertexNr, vlayer );
}
}
}


void QgsMapToolDeleteRing::deleteRing( QgsFeatureId fId, int beforeVertexNr, QgsVectorLayer* vlayer )
{
QgsFeature f;
Expand Down