Add QgsRubberBand::copyPointsFrom to quickly copy all points from

one rubber band to another
qgis · Sep 1, 2021 · 26b536b · 26b536b
1 parent 08d0e98
commit 26b536b
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 0 deletions.
diff --git a/python/gui/auto_generated/qgsrubberband.sip.in b/python/gui/auto_generated/qgsrubberband.sip.in
@@ -272,6 +272,13 @@ By default, no reprojection is done.
 Sets this rubber band to a map canvas rectangle
 
 :param rect: rectangle in canvas coordinates
+%End
+
+    void copyPointsFrom( const QgsRubberBand *other );
+%Docstring
+Copies the points from another rubber band.
+
+.. versionadded:: 3.22
 %End
 
     void addGeometry( const QgsGeometry &geometry, QgsVectorLayer *layer, bool doUpdate = true );

diff --git a/src/gui/qgsrubberband.cpp b/src/gui/qgsrubberband.cpp
@@ -437,6 +437,14 @@ void QgsRubberBand::setToCanvasRectangle( QRect rect )
   addPoint( ul, true );
 }
 
+void QgsRubberBand::copyPointsFrom( const QgsRubberBand *other )
+{
+  reset( other->mGeometryType );
+  mPoints = other->mPoints;
+  updateRect();
+  update();
+}
+
 void QgsRubberBand::paint( QPainter *p )
 {
   if ( mPoints.isEmpty() )

diff --git a/src/gui/qgsrubberband.h b/src/gui/qgsrubberband.h
@@ -319,6 +319,13 @@ class GUI_EXPORT QgsRubberBand : public QgsMapCanvasItem
      */
     void setToCanvasRectangle( QRect rect );
 
+    /**
+     * Copies the points from another rubber band.
+     *
+     * \since QGIS 3.22
+     */
+    void copyPointsFrom( const QgsRubberBand *other );
+
     /**
      * Adds the geometry of an existing feature to a rubberband
      * This is useful for multi feature highlighting.

diff --git a/tests/src/gui/testqgsrubberband.cpp b/tests/src/gui/testqgsrubberband.cpp
@@ -45,6 +45,7 @@ class TestQgsRubberband : public QObject
     void testAddSingleMultiGeometries(); //test for #7728
     void pointGeometryAddPoints();
     void lineGeometryAddPoints();
+    void copyPointsFrom();
     void testBoundingRect(); //test for #12392
     void testVisibility(); //test for 12486
     void testClose(); //test closing geometry
@@ -163,6 +164,29 @@ void TestQgsRubberband::lineGeometryAddPoints()
   QCOMPARE( r1.asGeometry().asWkt(), QStringLiteral( "LineString (1 2, 1 2)" ) );
 }
 
+void TestQgsRubberband::copyPointsFrom()
+{
+  std::unique_ptr< QgsMapCanvas > canvas = std::make_unique< QgsMapCanvas >();
+  QgsRubberBand r1( canvas.get(), QgsWkbTypes::PointGeometry );
+  r1.addPoint( QgsPointXY( 1, 2 ) );
+  r1.addPoint( QgsPointXY( 3, 4 ) );
+  QCOMPARE( r1.asGeometry().asWkt(), QStringLiteral( "MultiPoint ((1 2),(3 4))" ) );
+
+  QgsRubberBand r2( canvas.get(), QgsWkbTypes::LineGeometry );
+  r2.copyPointsFrom( &r1 );
+  QCOMPARE( r2.asGeometry().asWkt(), QStringLiteral( "MultiPoint ((1 2),(3 4))" ) );
+
+  // line geometry band
+  r1.reset( QgsWkbTypes::LineGeometry );
+  r1.addPoint( QgsPointXY( 1, 2 ) );
+  r1.addPoint( QgsPointXY( 2, 3 ) );
+  r1.addPoint( QgsPointXY( 3, 4 ) );
+  QCOMPARE( r1.asGeometry().asWkt(), QStringLiteral( "LineString (1 2, 2 3, 3 4)" ) );
+
+  r2.copyPointsFrom( &r1 );
+  QCOMPARE( r2.asGeometry().asWkt(), QStringLiteral( "LineString (1 2, 2 3, 3 4)" ) );
+}
+
 void TestQgsRubberband::testBoundingRect()
 {
   // Set extent to match canvas size.