Allow use of circular string digitizing in reshape tool

While the reshape operation itself requires geometry segmentization, this allows for easy reshaping of features to a curved path. (it's intended mostly as a test of the previous commit)
qgis · Mar 4, 2021 · d0f00ba · d0f00ba
1 parent aed7645
commit d0f00ba
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/src/app/qgsmaptoolreshape.cpp b/src/app/qgsmaptoolreshape.cpp
@@ -81,6 +81,17 @@ void QgsMapToolReshape::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
   }
 }
 
+bool QgsMapToolReshape::supportsTechnique( QgsMapToolCapture::CaptureTechnique technique ) const
+{
+  switch ( technique )
+  {
+    case QgsMapToolCapture::StraightSegments:
+    case QgsMapToolCapture::CircularString:
+      return true;
+  }
+  return false;
+}
+
 bool QgsMapToolReshape::isBindingLine( QgsVectorLayer *vlayer, const QgsRectangle &bbox ) const
 {
   if ( vlayer->geometryType() != QgsWkbTypes::LineGeometry )
@@ -121,9 +132,18 @@ void QgsMapToolReshape::reshape( QgsVectorLayer *vlayer )
     bbox.combineExtentWith( pointsZM().at( i ).x(), pointsZM().at( i ).y() );
   }
 
-
+  const bool hasCurvedSegments = captureCurve()->hasCurvedSegments();
   QgsPointSequence pts;
-  captureCurve()->points( pts );
+  if ( !hasCurvedSegments )
+  {
+    captureCurve()->points( pts );
+  }
+  else
+  {
+    std::unique_ptr< QgsLineString > segmented( captureCurve()->curveToLine() );
+    segmented->points( pts );
+  }
+
   QgsLineString reshapeLineString( pts );
 
   //query all the features that intersect bounding box of capture line

diff --git a/src/app/qgsmaptoolreshape.h b/src/app/qgsmaptoolreshape.h
@@ -27,6 +27,7 @@ class APP_EXPORT QgsMapToolReshape: public QgsMapToolCapture
   public:
     QgsMapToolReshape( QgsMapCanvas *canvas );
     void cadCanvasReleaseEvent( QgsMapMouseEvent *e ) override;
+    bool supportsTechnique( CaptureTechnique technique ) const override;
 
   private:
     void reshape( QgsVectorLayer *vlayer );