correctly delete last digitized point, fixes #8462

blazek · blazek · commit db07f2f90c48 · 2013-08-13T11:52:48.000+02:00
diff --git a/src/app/qgsmaptoolcapture.cpp b/src/app/qgsmaptoolcapture.cpp
@@ -209,8 +209,9 @@ int QgsMapToolCapture::addVertex( const QPoint &p )
   {
     mTempRubberBand = createRubberBand( mCaptureMode == CapturePolygon ? QGis::Polygon : QGis::Line , true );
   }
-  else{
-    mTempRubberBand->reset(CapturePolygon ? true : false);
+  else
+  {
+    mTempRubberBand->reset( mCaptureMode == CapturePolygon ? true : false );
   }
   if ( mCaptureMode == CaptureLine )
   {
@@ -234,14 +235,29 @@ void QgsMapToolCapture::undo()
   if ( mRubberBand )
   {
     int rubberBandSize = mRubberBand->numberOfVertices();
+    int tempRubberBandSize = mTempRubberBand->numberOfVertices();
     int captureListSize = mCaptureList.size();
 
     if ( rubberBandSize < 1 || captureListSize < 1 )
     {
       return;
     }
 
-    mRubberBand->removePoint( -2 ); // remove the one before the last one
+    mRubberBand->removePoint( -1 );
+
+    if ( mRubberBand->numberOfVertices() > 0 )
+    {
+      if ( mTempRubberBand->numberOfVertices() > 1 )
+      {
+        const QgsPoint *point = mRubberBand->getPoint( 0, mRubberBand->numberOfVertices() - 1 );
+        mTempRubberBand->movePoint( mTempRubberBand->numberOfVertices() - 2, *point );
+      }
+    }
+    else
+    {
+      mTempRubberBand->reset( mCaptureMode == CapturePolygon ? true : false );
+    }
+
     mCaptureList.removeLast();
 
     validateGeometry();
diff --git a/src/gui/qgsrubberband.cpp b/src/gui/qgsrubberband.cpp
@@ -536,6 +536,12 @@ int QgsRubberBand::size() const
   return mPoints.size();
 }
 
+int QgsRubberBand::partSize( int geometryIndex ) const
+{
+  if ( geometryIndex < 0 || geometryIndex >= mPoints.size() ) return 0;
+  return mPoints[geometryIndex].size();
+}
+
 int QgsRubberBand::numberOfVertices() const
 {
   int count = 0;
diff --git a/src/gui/qgsrubberband.h b/src/gui/qgsrubberband.h
@@ -163,6 +163,13 @@ class GUI_EXPORT QgsRubberBand: public QgsMapCanvasItem
      */
     void movePoint( int index, const QgsPoint& p, int geometryIndex = 0 );
 
+    /**
+     * Returns number of vertices in feature part
+     *  @param geometryIndex The index of the feature part (in case of multipart geometries)
+     *  @return number of vertices
+     */
+    int partSize( int geometryIndex ) const;
+
     /**
      * Sets this rubber band to the geometry of an existing feature.
      * This is useful for feature highlighting.

Original file line number	Diff line number	Diff line change
`@@ -209,8 +209,9 @@ int QgsMapToolCapture::addVertex( const QPoint &p )`
`209`	`209`	`{`
`210`	`210`	`mTempRubberBand = createRubberBand( mCaptureMode == CapturePolygon ? QGis::Polygon : QGis::Line , true );`
`211`	`211`	`}`
`212`		`- else{`
`213`		`- mTempRubberBand->reset(CapturePolygon ? true : false);`
	`212`	`+ else`
	`213`	`+ {`
	`214`	`+ mTempRubberBand->reset( mCaptureMode == CapturePolygon ? true : false );`
`214`	`215`	`}`
`215`	`216`	`if ( mCaptureMode == CaptureLine )`
`216`	`217`	`{`
`@@ -234,14 +235,29 @@ void QgsMapToolCapture::undo()`
`234`	`235`	`if ( mRubberBand )`
`235`	`236`	`{`
`236`	`237`	`int rubberBandSize = mRubberBand->numberOfVertices();`
	`238`	`+ int tempRubberBandSize = mTempRubberBand->numberOfVertices();`
`237`	`239`	`int captureListSize = mCaptureList.size();`
`238`	`240`
`239`	`241`	`if ( rubberBandSize < 1 \|\| captureListSize < 1 )`
`240`	`242`	`{`
`241`	`243`	`return;`
`242`	`244`	`}`
`243`	`245`
`244`		`- mRubberBand->removePoint( -2 ); // remove the one before the last one`
	`246`	`+ mRubberBand->removePoint( -1 );`
	`247`	`+`
	`248`	`+ if ( mRubberBand->numberOfVertices() > 0 )`
	`249`	`+ {`
	`250`	`+ if ( mTempRubberBand->numberOfVertices() > 1 )`
	`251`	`+ {`
	`252`	`+ const QgsPoint *point = mRubberBand->getPoint( 0, mRubberBand->numberOfVertices() - 1 );`
	`253`	`+ mTempRubberBand->movePoint( mTempRubberBand->numberOfVertices() - 2, *point );`
	`254`	`+ }`
	`255`	`+ }`
	`256`	`+ else`
	`257`	`+ {`
	`258`	`+ mTempRubberBand->reset( mCaptureMode == CapturePolygon ? true : false );`
	`259`	`+ }`
	`260`	`+`
`245`	`261`	`mCaptureList.removeLast();`
`246`	`262`
`247`	`263`	`validateGeometry();`
Original file line number	Diff line number	Diff line change
`@@ -536,6 +536,12 @@ int QgsRubberBand::size() const`
`536`	`536`	`return mPoints.size();`
`537`	`537`	`}`
`538`	`538`
	`539`	`+int QgsRubberBand::partSize( int geometryIndex ) const`
	`540`	`+{`
	`541`	`+ if ( geometryIndex < 0 \|\| geometryIndex >= mPoints.size() ) return 0;`
	`542`	`+ return mPoints[geometryIndex].size();`
	`543`	`+}`
	`544`	`+`
`539`	`545`	`int QgsRubberBand::numberOfVertices() const`
`540`	`546`	`{`
`541`	`547`	`int count = 0;`