Added changeGeometry() method as have been suggested on mailing list.

git-svn-id: http://svn.osgeo.org/qgis/trunk@10701 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · May 2, 2009 · c245c64 · c245c64
1 parent cbc57dc
commit c245c64
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 7 deletions.
diff --git a/python/core/qgsvectorlayer.sip b/python/core/qgsvectorlayer.sip
@@ -316,6 +316,10 @@ public:
   /** Make layer editable */
   bool startEditing();
 
+  /** change feature's geometry
+    @note added in version 1.2 */
+  bool changeGeometry(int fid, QgsGeometry* geom);
+
   /** changed an attribute value (but does not commit it */
   bool changeAttributeValue(int fid, int field, QVariant value, bool emitSignal = true);
 

diff --git a/src/app/qgsmaptooldeletehole.cpp b/src/app/qgsmaptooldeletehole.cpp
@@ -111,8 +111,7 @@ void QgsMapToolDeleteHole::deleteHole( int fId, int beforeVertexNr, QgsVectorLay
 
   if (g->deleteHole( ringNum, partNum ))
   {
-    vlayer->deleteFeature( fId );
-    vlayer->addFeature(f);
+    vlayer->changeGeometry( fId, g );
     mCanvas->refresh();
   }
 

diff --git a/src/app/qgsmaptooldeletepart.cpp b/src/app/qgsmaptooldeletepart.cpp
@@ -106,8 +106,7 @@ void QgsMapToolDeletePart::deletePart( int fId, int beforeVertexNr, QgsVectorLay
 
   if (g->deletePart( partNum ))
   {
-    vlayer->deleteFeature( fId );
-    vlayer->addFeature(f);
+    vlayer->changeGeometry( fId, g );
     mCanvas->refresh();
   }
   else

diff --git a/src/app/qgsmaptoolsimplify.cpp b/src/app/qgsmaptoolsimplify.cpp
@@ -90,9 +90,8 @@ void QgsMapToolSimplify::storeSimplified()
 {
   QgsVectorLayer * vlayer = currentVectorLayer();
   QgsSimplifyFeature::simplifyLine(mSelectedFeature, mTolerance);
-  // TODO(md): change geometry of feature instead of delete+add
-  vlayer->deleteFeature( mSelectedFeature.id() );
-  vlayer->addFeature(mSelectedFeature);
+
+  vlayer->changeGeometry( mSelectedFeature.id(), mSelectedFeature.geometry() );
 
   mCanvas->refresh();
 }

diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -2553,6 +2553,20 @@ bool QgsVectorLayer::writeSymbology( QDomNode& node, QDomDocument& doc, QString&
   return true;
 }
 
+
+bool QgsVectorLayer::changeGeometry(int fid, QgsGeometry* geom)
+{
+  if ( !mEditable || !mDataProvider )
+  {
+    return false;
+  }
+
+  mChangedGeometries[ fid ] = *geom;
+  setModified( true, true );
+  return true;
+}
+
+
 bool QgsVectorLayer::changeAttributeValue( int fid, int field, QVariant value, bool emitSignal )
 {
   if ( !isEditable() )

diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h
@@ -378,6 +378,10 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
     /** Make layer editable */
     bool startEditing();
 
+    /** change feature's geometry
+      @note added in version 1.2 */
+    bool changeGeometry(int fid, QgsGeometry* geom);
+
     /** changed an attribute value (but does not commit it) */
     bool changeAttributeValue( int fid, int field, QVariant value, bool emitSignal = true );