Merge pull request #564 from vinayan/fixRubberband

[Fix #7728] - QgsRubberband addGeometry does not add multipart geometries to existing points
qgis · Apr 28, 2013 · 1a19947 · 1a19947
2 parents 6b9bc64 + 9d93514
commit 1a19947
Show file tree

Hide file tree

Showing 3 changed files with 106 additions and 2 deletions.
diff --git a/src/gui/qgsrubberband.cpp b/src/gui/qgsrubberband.cpp
@@ -298,7 +298,6 @@ void QgsRubberBand::addGeometry( QgsGeometry* geom, QgsVectorLayer* layer )
     case QGis::WKBMultiLineString:
     case QGis::WKBMultiLineString25D:
     {
-      mPoints.clear();
 
       QgsMultiPolyline mline = geom->asMultiPolyline();
       for ( int i = 0; i < mline.size(); ++i, ++idx )
@@ -347,7 +346,6 @@ void QgsRubberBand::addGeometry( QgsGeometry* geom, QgsVectorLayer* layer )
     case QGis::WKBMultiPolygon:
     case QGis::WKBMultiPolygon25D:
     {
-      mPoints.clear();
 
       QgsMultiPolygon multipoly = geom->asMultiPolygon();
       for ( int i = 0; i < multipoly.size(); ++i, ++idx )

diff --git a/tests/src/gui/CMakeLists.txt b/tests/src/gui/CMakeLists.txt
@@ -121,4 +121,5 @@ ADD_QGIS_TEST(histogramtest testqgsrasterhistogram.cpp)
 ADD_QGIS_TEST(projectionissues testprojectionissues.cpp)
 ADD_QGIS_TEST(scalecombobox testqgsscalecombobox.cpp)
 ADD_QGIS_TEST(dualviewtest testqgsdualview.cpp )
+ADD_QGIS_TEST(rubberbandtest testqgsrubberband.cpp )
 
diff --git a/tests/src/gui/testqgsrubberband.cpp b/tests/src/gui/testqgsrubberband.cpp
@@ -0,0 +1,105 @@
+/***************************************************************************
+    testqgsrubberband.cpp
+     --------------------------------------
+    Date                 : 28.4.2013
+    Copyright            : (C) 2013 Vinayan Parameswaran
+    Email                : vinayan123 at gmail dot com
+ ***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+
+#include <QtTest>
+#include <QObject>
+#include <QString>
+#include <QObject>
+#include <QCoreApplication>
+#include <QWidget>
+
+#include <qgsapplication.h>
+#include <qgsmapcanvas.h>
+#include <qgsvectorlayer.h>
+#include <qgsrubberband.h>
+#include <qgslogger.h>
+
+class TestQgsRubberband: public QObject
+{
+    Q_OBJECT;
+  private slots:
+    void initTestCase(); // will be called before the first testfunction is executed.
+    void cleanupTestCase(); // will be called after the last testfunction was executed.
+    void init(); // will be called before each testfunction is executed.
+    void cleanup(); // will be called after every testfunction.
+
+    void testAddSingleMultiGeometries(); //test for #7728
+
+  private:
+    QgsMapCanvas* mCanvas;
+    QgsVectorLayer* mPolygonLayer;
+    QString mTestDataDir;
+    QgsRubberBand* mRubberband;
+};
+
+void TestQgsRubberband::initTestCase()
+{
+  QgsApplication::init();
+  QgsApplication::initQgis();
+  QgsApplication::showSettings();
+
+  // Setup a map canvas with a vector layer loaded...
+  QString myDataDir( TEST_DATA_DIR ); //defined in CmakeLists.txt
+  mTestDataDir = myDataDir + QDir::separator();
+
+  //
+  // load a vector layer
+  //
+  QString myPolygonFileName = mTestDataDir + "polys.shp";
+  QFileInfo myPolygonFileInfo( myPolygonFileName );
+  mPolygonLayer = new QgsVectorLayer( myPolygonFileInfo.filePath(),
+                                     myPolygonFileInfo.completeBaseName(), "ogr" );
+
+  mCanvas = new QgsMapCanvas();
+  mRubberband = 0;
+}
+
+void TestQgsRubberband::cleanupTestCase()
+{
+  delete mRubberband;
+  delete mPolygonLayer;
+  delete mCanvas;
+}
+
+void TestQgsRubberband::init()
+{
+
+}
+
+void TestQgsRubberband::cleanup()
+{
+
+}
+
+void TestQgsRubberband::testAddSingleMultiGeometries()
+{
+  mRubberband = new QgsRubberBand( mCanvas, mPolygonLayer->geometryType() );
+  QgsGeometry* geomSinglePart = QgsGeometry::fromWkt( "POLYGON((-0.00022418 -0.00000279,-0.0001039 0.00002395,-0.00008677 -0.00005313,-0.00020705 -0.00007987,-0.00022418 -0.00000279))" );
+  QgsGeometry* geomMultiPart = QgsGeometry::fromWkt( "MULTIPOLYGON(((-0.00018203 0.00012178,-0.00009444 0.00014125,-0.00007861 0.00007001,-0.00016619 0.00005054,-0.00018203 0.00012178)),((-0.00030957 0.00009464,-0.00021849 0.00011489,-0.00020447 0.00005184,-0.00029555 0.00003158,-0.00030957 0.00009464)))" );
+
+  mRubberband->addGeometry( geomSinglePart, mPolygonLayer );
+  mRubberband->addGeometry( geomMultiPart, mPolygonLayer );
+
+  QVERIFY( mRubberband->numberOfVertices() == 15 );
+}
+
+QTEST_MAIN( TestQgsRubberband )
+#include "moc_testqgsrubberband.cxx"
+
+
+
+
+