[bugfix] Fixes #17118 Reshape tool with z support

pblottiere · pblottiere · commit cfec1250a94e · 2017-10-16T07:07:52.000+02:00
diff --git a/src/app/qgsmaptoolreshape.cpp b/src/app/qgsmaptoolreshape.cpp
@@ -97,7 +97,7 @@ void QgsMapToolReshape::cadCanvasReleaseEvent( QgsMapMouseEvent * e )
       QgsGeometry* geom = f.geometry();
       if ( geom )
       {
-        reshapeReturn = geom->reshapeGeometry( points() );
+        reshapeReturn = geom->reshapeGeometry( pointsV2() );
         if ( reshapeReturn == 0 )
         {
           //avoid intersections on polygon layers
diff --git a/src/core/geometry/qgsgeometry.cpp b/src/core/geometry/qgsgeometry.cpp
@@ -800,28 +800,34 @@ int QgsGeometry::splitGeometry( const QList<QgsPoint>& splitLine, QList<QgsGeome
 
 /** Replaces a part of this geometry with another line*/
 int QgsGeometry::reshapeGeometry( const QList<QgsPoint>& reshapeWithLine )
+{
+  QgsPointSequenceV2 reshapeLine;
+  convertPointList( reshapeWithLine, reshapeLine );
+  return reshapeGeometry( reshapeLine );
+}
+
+int QgsGeometry::reshapeGeometry( const QList<QgsPointV2>& reshapeLine )
 {
   if ( !d->geometry )
   {
     return 0;
   }
 
-  QgsPointSequenceV2 reshapeLine;
-  convertPointList( reshapeWithLine, reshapeLine );
   QgsLineStringV2 reshapeLineString;
   reshapeLineString.setPoints( reshapeLine );
-
   QgsGeos geos( d->geometry );
   int errorCode = 0;
   QgsAbstractGeometryV2* geom = geos.reshapeGeometry( reshapeLineString, &errorCode );
+
   if ( errorCode == 0 && geom )
   {
-    detach( false );
+    detach( true );
     delete d->geometry;
-    d->geometry = geom;
     removeWkbGeos();
+    d->geometry = geom;
     return 0;
   }
+
   return errorCode;
 }
 
diff --git a/src/core/geometry/qgsgeometry.h b/src/core/geometry/qgsgeometry.h
@@ -438,6 +438,15 @@ class CORE_EXPORT QgsGeometry
      */
     int reshapeGeometry( const QList<QgsPoint>& reshapeWithLine );
 
+    /**
+     * Replaces a part of this geometry with another line with Z support
+     *
+     * @return 0 in case of success
+     *
+     * @note added in 2.18
+     */
+    int reshapeGeometry( const QList<QgsPointV2>& reshapeLine );
+
     /** Changes this geometry such that it does not intersect the other geometry
      * @param other geometry that should not be intersect
      * @return 0 in case of success
diff --git a/src/gui/qgsmaptoolcapture.cpp b/src/gui/qgsmaptoolcapture.cpp
@@ -722,6 +722,13 @@ QList<QgsPoint> QgsMapToolCapture::points()
   return points;
 }
 
+QgsPointSequenceV2 QgsMapToolCapture::pointsV2()
+{
+  QgsPointSequenceV2 pts;
+  mCaptureCurve.points( pts );
+  return pts;
+}
+
 void QgsMapToolCapture::setPoints( const QList<QgsPoint>& pointList )
 {
   QgsPointSequenceV2 pts;
diff --git a/src/gui/qgsmaptoolcapture.h b/src/gui/qgsmaptoolcapture.h
@@ -194,6 +194,15 @@ class GUI_EXPORT QgsMapToolCapture : public QgsMapToolAdvancedDigitizing
      */
     QList<QgsPoint> points();
 
+    /**
+     * List of digitized points with z support
+     *
+     * @return List of points
+     *
+     * @node added in 2.18
+     */
+    QgsPointSequenceV2 pointsV2();
+
     /**
      * Set the points on which to work
      *

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ void QgsMapToolReshape::cadCanvasReleaseEvent( QgsMapMouseEvent * e )`
`97`	`97`	`QgsGeometry* geom = f.geometry();`
`98`	`98`	`if ( geom )`
`99`	`99`	`{`
`100`		`- reshapeReturn = geom->reshapeGeometry( points() );`
	`100`	`+ reshapeReturn = geom->reshapeGeometry( pointsV2() );`
`101`	`101`	`if ( reshapeReturn == 0 )`
`102`	`102`	`{`
`103`	`103`	`//avoid intersections on polygon layers`
Original file line number	Diff line number	Diff line change
`@@ -722,6 +722,13 @@ QList<QgsPoint> QgsMapToolCapture::points()`
`722`	`722`	`return points;`
`723`	`723`	`}`
`724`	`724`
	`725`	`+QgsPointSequenceV2 QgsMapToolCapture::pointsV2()`
	`726`	`+{`
	`727`	`+ QgsPointSequenceV2 pts;`
	`728`	`+ mCaptureCurve.points( pts );`
	`729`	`+ return pts;`
	`730`	`+}`
	`731`	`+`
`725`	`732`	`void QgsMapToolCapture::setPoints( const QList<QgsPoint>& pointList )`
`726`	`733`	`{`
`727`	`734`	`QgsPointSequenceV2 pts;`