[Backport]: disable abort if avoid intersections returns a different geometry type (e.g. multitype instead of singletype). Temporary solution for ticket #4880

This commit is contained in:
Marco Hugentobler 2012-01-31 10:12:21 +01:00
parent 05bacf7a8c
commit 6a44e1151d

View File

@ -249,14 +249,14 @@ void QgsMapToolAddFeature::canvasReleaseEvent( QMouseEvent * e )
{ {
//not a polygon type. Impossible to get there //not a polygon type. Impossible to get there
} }
else if ( avoidIntersectionsReturn == 2 ) /*else if ( avoidIntersectionsReturn == 2 ) //MH120131: disable this error message until there is a better way to cope with the single type / multi type problem
{ {
//bail out... //bail out...
QMessageBox::critical( 0, tr( "Error" ), tr( "The feature could not be added because removing the polygon intersections would change the geometry type" ) ); QMessageBox::critical( 0, tr( "Error" ), tr( "The feature could not be added because removing the polygon intersections would change the geometry type" ) );
delete f; delete f;
stopCapturing(); stopCapturing();
return; return;
} }*/
else if ( avoidIntersectionsReturn == 3 ) else if ( avoidIntersectionsReturn == 3 )
{ {
QMessageBox::critical( 0, tr( "Error" ), tr( "An error was reported during intersection removal" ) ); QMessageBox::critical( 0, tr( "Error" ), tr( "An error was reported during intersection removal" ) );