fixed misleading error return code in addPart

qgis · Sep 26, 2017 · 45f041d · 45f041d
1 parent 8a4d32f
commit 45f041d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/app/qgsmaptooladdpart.cpp b/src/app/qgsmaptooladdpart.cpp
@@ -219,6 +219,10 @@ void QgsMapToolAddPart::cadCanvasReleaseEvent( QgsMapMouseEvent * e )
     case 6:
       errorMessage = tr( "Selected geometry could not be found" );
       break;
+
+    case 7:
+      errorMessage = tr( "Update geometry error" );
+      break;
   }
 
   emit messageEmitted( errorMessage, QgsMessageBar::WARNING );

diff --git a/src/core/qgsvectorlayereditutils.cpp b/src/core/qgsvectorlayereditutils.cpp
@@ -228,7 +228,7 @@ int QgsVectorLayerEditUtils::addPart( const QgsPointSequenceV2 &points, QgsFeatu
       geometry.convertToSingleType();
     }
     if ( !L->editBuffer()->changeGeometry( featureId, &geometry ) )
-      errorCode = 2; // ring is not a valid geometry
+      errorCode = 7; // update geometry error
   }
   return errorCode;
 }
@@ -268,7 +268,7 @@ int QgsVectorLayerEditUtils::addPart( QgsCurveV2* ring, QgsFeatureId featureId )
       geometry.convertToSingleType();
     }
     if ( !L->editBuffer()->changeGeometry( featureId, &geometry ) )
-      errorCode = 2; // ring is not a valid geometry
+      errorCode = 7; // update geometry error
   }
   return errorCode;
 }