changes to allow vertex editing of not commited features

git-svn-id: http://svn.osgeo.org/qgis/trunk@5359 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Apr 24, 2006 · bd1caa4 · bd1caa4
1 parent 8784ca4
commit bd1caa4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/gui/qgsmaptoolvertexedit.cpp b/src/gui/qgsmaptoolvertexedit.cpp
@@ -241,7 +241,9 @@ bool QgsMapToolVertexEdit::snapVertexWithContext(QgsPoint& point)
 void QgsMapToolVertexEdit::canvasReleaseEvent(QMouseEvent * e)
 {
   if (mSnappedAtFeatureId == -1)
-    return;
+    {
+      return;
+    }
 
   QgsVectorLayer* vlayer = dynamic_cast<QgsVectorLayer*>(mCanvas->currentLayer());
 

diff --git a/src/gui/qgsvectorlayer.cpp b/src/gui/qgsvectorlayer.cpp
@@ -896,6 +896,11 @@ void QgsVectorLayer::draw(QPainter * p, QgsRect * viewExtent, QgsMapToPixel * th
         m_renderer->renderFeature(p, *it, &marker, &markerScaleFactor, 
             sel, widthScale);
         double scale = markerScaleFactor * symbolScale;
+	if (mChangedGeometries.find((*it)->featureId()) != mChangedGeometries.end())
+	  {
+	    (*it)->setGeometry( mChangedGeometries[(*it)->featureId() ] );
+	  }
+	mCachedGeometries[(*it)->featureId()] = (*it)->geometryAndOwnership();
         drawFeature(p,*it,theMapToPixelTransform,&marker,scale, 
             projectionsEnabledFlag);
       }
@@ -1571,7 +1576,7 @@ std::vector<QgsField> const& QgsVectorLayer::fields() const
 
 bool QgsVectorLayer::addFeature(QgsFeature* f, bool alsoUpdateExtent)
 {
-  static int addedIdLowWaterMark = 0;
+  static int addedIdLowWaterMark = -1;
 
   if(dataProvider)
   {