fix #2281

jef · jef · commit ffd8db9eceaf · 2009-12-14T20:46:13.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12455 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgsmaptooladdisland.cpp b/src/app/qgsmaptooladdisland.cpp
@@ -104,9 +104,8 @@ void QgsMapToolAddIsland::canvasReleaseEvent( QMouseEvent * e )
 
     //close polygon
     mCaptureList.push_back( *mCaptureList.begin() );
-    vlayer->beginEditCommand( tr( "Island added" ) );
+    vlayer->beginEditCommand( tr( "Part added" ) );
     int errorCode = vlayer->addIsland( mCaptureList );
-    vlayer->endEditCommand();
     QString errorMessage;
 
     if ( errorCode != 0 )
@@ -136,6 +135,8 @@ void QgsMapToolAddIsland::canvasReleaseEvent( QMouseEvent * e )
         errorMessage = tr( "Selected geometry could not be found" );
       }
       QMessageBox::critical( 0, tr( "Error, could not add island" ), errorMessage );
+
+      vlayer->destroyEditCommand();
     }
     else
     {
@@ -145,6 +146,8 @@ void QgsMapToolAddIsland::canvasReleaseEvent( QMouseEvent * e )
       {
         addTopologicalPoints( mCaptureList );
       }
+
+      vlayer->endEditCommand();
     }
 
     mCaptureList.clear();
diff --git a/src/app/qgsmaptooladdring.cpp b/src/app/qgsmaptooladdring.cpp
@@ -83,7 +83,6 @@ void QgsMapToolAddRing::canvasReleaseEvent( QMouseEvent * e )
 
     vlayer->beginEditCommand( tr( "Ring added" ) );
     int addRingReturnCode = vlayer->addRing( mCaptureList );
-    vlayer->endEditCommand();
     if ( addRingReturnCode != 0 )
     {
       QString errorMessage;
@@ -113,6 +112,11 @@ void QgsMapToolAddRing::canvasReleaseEvent( QMouseEvent * e )
         errorMessage = tr( "An unknown error occured" );
       }
       QMessageBox::critical( 0, tr( "Error, could not add ring" ), errorMessage );
+      vlayer->destroyEditCommand();
+    }
+    else
+    {
+      vlayer->endEditCommand();
     }
     mCaptureList.clear();
     mCanvas->refresh();

Original file line number	Diff line number	Diff line change
`@@ -104,9 +104,8 @@ void QgsMapToolAddIsland::canvasReleaseEvent( QMouseEvent * e )`
`104`	`104`
`105`	`105`	`//close polygon`
`106`	`106`	`mCaptureList.push_back( *mCaptureList.begin() );`
`107`		`- vlayer->beginEditCommand( tr( "Island added" ) );`
	`107`	`+ vlayer->beginEditCommand( tr( "Part added" ) );`
`108`	`108`	`int errorCode = vlayer->addIsland( mCaptureList );`
`109`		`- vlayer->endEditCommand();`
`110`	`109`	`QString errorMessage;`
`111`	`110`
`112`	`111`	`if ( errorCode != 0 )`
`@@ -136,6 +135,8 @@ void QgsMapToolAddIsland::canvasReleaseEvent( QMouseEvent * e )`
`136`	`135`	`errorMessage = tr( "Selected geometry could not be found" );`
`137`	`136`	`}`
`138`	`137`	`QMessageBox::critical( 0, tr( "Error, could not add island" ), errorMessage );`
	`138`	`+`
	`139`	`+ vlayer->destroyEditCommand();`
`139`	`140`	`}`
`140`	`141`	`else`
`141`	`142`	`{`
`@@ -145,6 +146,8 @@ void QgsMapToolAddIsland::canvasReleaseEvent( QMouseEvent * e )`
`145`	`146`	`{`
`146`	`147`	`addTopologicalPoints( mCaptureList );`
`147`	`148`	`}`
	`149`	`+`
	`150`	`+ vlayer->endEditCommand();`
`148`	`151`	`}`
`149`	`152`
`150`	`153`	`mCaptureList.clear();`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,6 @@ void QgsMapToolAddRing::canvasReleaseEvent( QMouseEvent * e )`
`83`	`83`
`84`	`84`	`vlayer->beginEditCommand( tr( "Ring added" ) );`
`85`	`85`	`int addRingReturnCode = vlayer->addRing( mCaptureList );`
`86`		`- vlayer->endEditCommand();`
`87`	`86`	`if ( addRingReturnCode != 0 )`
`88`	`87`	`{`
`89`	`88`	`QString errorMessage;`
`@@ -113,6 +112,11 @@ void QgsMapToolAddRing::canvasReleaseEvent( QMouseEvent * e )`
`113`	`112`	`errorMessage = tr( "An unknown error occured" );`
`114`	`113`	`}`
`115`	`114`	`QMessageBox::critical( 0, tr( "Error, could not add ring" ), errorMessage );`
	`115`	`+ vlayer->destroyEditCommand();`
	`116`	`+ }`
	`117`	`+ else`
	`118`	`+ {`
	`119`	`+ vlayer->endEditCommand();`
`116`	`120`	`}`
`117`	`121`	`mCaptureList.clear();`
`118`	`122`	`mCanvas->refresh();`