Add some tests for ellipse map tools

qgis · Feb 16, 2018 · 868c869 · 868c869
1 parent 58610b4
commit 868c869
Show file tree

Hide file tree

Showing 7 changed files with 217 additions and 5 deletions.
diff --git a/src/app/qgsmaptooladdellipse.h b/src/app/qgsmaptooladdellipse.h
@@ -19,10 +19,11 @@
 #include "qgsmaptoolcapture.h"
 #include "qgsellipse.h"
 #include "qgssettings.h"
+#include "qgis_app.h"
 
 class QgsGeometryRubberBand;
 
-class QgsMapToolAddEllipse: public QgsMapToolCapture
+class APP_EXPORT QgsMapToolAddEllipse: public QgsMapToolCapture
 {
     Q_OBJECT
   public:

diff --git a/src/app/qgsmaptoolellipsecenter2points.h b/src/app/qgsmaptoolellipsecenter2points.h
@@ -18,8 +18,9 @@
 #define QGSMAPTOOLELLIPSECENTER2POINTS_H
 
 #include "qgsmaptooladdellipse.h"
+#include "qgis_app.h"
 
-class QgsMapToolEllipseCenter2Points: public QgsMapToolAddEllipse
+class APP_EXPORT QgsMapToolEllipseCenter2Points: public QgsMapToolAddEllipse
 {
     Q_OBJECT
 

diff --git a/src/app/qgsmaptoolellipsecenterpoint.h b/src/app/qgsmaptoolellipsecenterpoint.h
@@ -18,8 +18,9 @@
 #define QGSMAPTOOLELLIPSECENTERPOINT_H
 
 #include "qgsmaptooladdellipse.h"
+#include "qgis_app.h"
 
-class QgsMapToolEllipseCenterPoint: public QgsMapToolAddEllipse
+class APP_EXPORT QgsMapToolEllipseCenterPoint: public QgsMapToolAddEllipse
 {
     Q_OBJECT
 

diff --git a/src/app/qgsmaptoolellipseextent.h b/src/app/qgsmaptoolellipseextent.h
@@ -18,8 +18,9 @@
 #define QGSMAPTOOLELLIPSEEXTENT_H
 
 #include "qgsmaptooladdellipse.h"
+#include "qgis_app.h"
 
-class QgsMapToolEllipseExtent: public QgsMapToolAddEllipse
+class APP_EXPORT QgsMapToolEllipseExtent: public QgsMapToolAddEllipse
 {
     Q_OBJECT
 

diff --git a/src/app/qgsmaptoolellipsefoci.h b/src/app/qgsmaptoolellipsefoci.h
@@ -18,8 +18,9 @@
 #define QGSMAPTOOLELLIPSEFOCI_H
 
 #include "qgsmaptooladdellipse.h"
+#include "qgis_app.h"
 
-class QgsMapToolEllipseFoci: public QgsMapToolAddEllipse
+class APP_EXPORT QgsMapToolEllipseFoci: public QgsMapToolAddEllipse
 {
     Q_OBJECT
 

diff --git a/tests/src/app/CMakeLists.txt b/tests/src/app/CMakeLists.txt
@@ -101,6 +101,7 @@ ADD_QGIS_TEST(maptoolselect testqgsmaptoolselect.cpp)
 ADD_QGIS_TEST(maptoolreshape testqgsmaptoolreshape.cpp)
 ADD_QGIS_TEST(maptoolcircularstringtest testqgsmaptoolcircularstring.cpp)
 ADD_QGIS_TEST(maptoolcircletest testqgsmaptoolcircle.cpp)
+ADD_QGIS_TEST(maptoolellipsetest testqgsmaptoolellipse.cpp)
 ADD_QGIS_TEST(measuretool testqgsmeasuretool.cpp)
 ADD_QGIS_TEST(vertextool testqgsvertextool.cpp)
 ADD_QGIS_TEST(vectorlayersaveasdialogtest testqgsvectorlayersaveasdialog.cpp)
diff --git a/tests/src/app/testqgsmaptoolellipse.cpp b/tests/src/app/testqgsmaptoolellipse.cpp
@@ -0,0 +1,206 @@
+/***************************************************************************
+     testqgsmaptoolellipse.cpp
+     ------------------------
+    Date                 : January 2018
+    Copyright            : (C) 2018 by Paul Blottiere
+    Email                : paul.blottiere@oslandia.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 "qgstest.h"
+
+#include "qgisapp.h"
+#include "qgsgeometry.h"
+#include "qgsmapcanvas.h"
+#include "qgssettings.h"
+#include "qgsvectorlayer.h"
+#include "qgsmaptooladdfeature.h"
+#include "qgsgeometryutils.h"
+
+#include "testqgsmaptoolutils.h"
+#include "qgsmaptoolellipsecenterpoint.h"
+#include "qgsmaptoolellipsecenter2points.h"
+#include "qgsmaptoolellipseextent.h"
+#include "qgsmaptoolellipsefoci.h"
+
+
+class TestQgsMapToolEllipse : public QObject
+{
+    Q_OBJECT
+
+  public:
+    TestQgsMapToolEllipse();
+
+  private slots:
+    void initTestCase();
+    void cleanupTestCase();
+
+    void testEllipseFromCenterAndPoint();
+    void testEllipseFromCenterAnd2Points();
+    void testEllipseFromExtent();
+    void testEllipseFromFoci();
+
+  private:
+    QgisApp *mQgisApp = nullptr;
+    QgsMapToolCapture *mParentTool = nullptr;
+    QgsMapCanvas *mCanvas = nullptr;
+    QgsVectorLayer *mLayer = nullptr;
+};
+
+TestQgsMapToolEllipse::TestQgsMapToolEllipse() = default;
+
+
+//runs before all tests
+void TestQgsMapToolEllipse::initTestCase()
+{
+  QgsApplication::init();
+  QgsApplication::initQgis();
+
+  mQgisApp = new QgisApp();
+
+  mCanvas = new QgsMapCanvas();
+  mCanvas->setDestinationCrs( QgsCoordinateReferenceSystem( QStringLiteral( "EPSG:27700" ) ) );
+
+  // make testing layers
+  mLayer = new QgsVectorLayer( QStringLiteral( "LineStringZ?crs=EPSG:27700" ), QStringLiteral( "layer line Z" ), QStringLiteral( "memory" ) );
+  QVERIFY( mLayer->isValid() );
+  QgsProject::instance()->addMapLayers( QList<QgsMapLayer *>() << mLayer );
+
+  // set layers in canvas
+  mCanvas->setLayers( QList<QgsMapLayer *>() << mLayer );
+  mCanvas->setCurrentLayer( mLayer );
+
+  mParentTool = new QgsMapToolAddFeature( mCanvas, QgsMapToolCapture::CaptureLine );
+}
+
+void TestQgsMapToolEllipse::cleanupTestCase()
+{
+  QgsApplication::exitQgis();
+}
+
+void TestQgsMapToolEllipse::testEllipseFromCenterAndPoint()
+{
+  QgsSettings().setValue( QStringLiteral( "/qgis/digitizing/default_z_value" ), 333 );
+  mLayer->startEditing();
+
+  QgsMapToolEllipseCenterPoint mapTool( mParentTool, mCanvas );
+  mCanvas->setMapTool( &mapTool );
+
+  TestQgsMapToolAdvancedDigitizingUtils utils( &mapTool );
+  utils.mouseClick( 0, 0, Qt::LeftButton );
+  utils.mouseMove( 1, -1 );
+  utils.mouseClick( 1, -1, Qt::RightButton );
+  QgsFeatureId newFid = utils.newFeatureId();
+
+  QCOMPARE( mLayer->featureCount(), ( long )1 );
+  QgsFeature f = mLayer->getFeature( newFid );
+
+  QString wkt = f.geometry().asWkt().replace( "LineStringZ (", "" ).replace( ")", "" );
+  QgsPointSequence pts = QgsGeometryUtils::pointsFromWKT( wkt, true, false );
+
+  for ( const QgsPoint &pt : pts )
+  {
+    QCOMPARE( pt.z(), ( double )333 );
+  }
+
+  mLayer->rollBack();
+  QgsSettings().setValue( QStringLiteral( "/qgis/digitizing/default_z_value" ), 0 );
+}
+
+void TestQgsMapToolEllipse::testEllipseFromCenterAnd2Points()
+{
+  QgsSettings().setValue( QStringLiteral( "/qgis/digitizing/default_z_value" ), 111 );
+  mLayer->startEditing();
+
+  QgsMapToolEllipseCenter2Points mapTool( mParentTool, mCanvas );
+  mCanvas->setMapTool( &mapTool );
+
+  TestQgsMapToolAdvancedDigitizingUtils utils( &mapTool );
+  utils.mouseClick( 0, 0, Qt::LeftButton );
+  utils.mouseClick( 0, 1, Qt::LeftButton );
+  utils.mouseMove( 0, -1 );
+  utils.mouseClick( 0, -1, Qt::RightButton );
+  QgsFeatureId newFid = utils.newFeatureId();
+
+  QCOMPARE( mLayer->featureCount(), ( long )1 );
+  QgsFeature f = mLayer->getFeature( newFid );
+
+  QString wkt = f.geometry().asWkt().replace( "LineStringZ (", "" ).replace( ")", "" );
+  QgsPointSequence pts = QgsGeometryUtils::pointsFromWKT( wkt, true, false );
+
+  for ( const QgsPoint &pt : pts )
+  {
+    QCOMPARE( pt.z(), ( double )111 );
+  }
+
+  mLayer->rollBack();
+  QgsSettings().setValue( QStringLiteral( "/qgis/digitizing/default_z_value" ), 0 );
+}
+
+void TestQgsMapToolEllipse::testEllipseFromExtent()
+{
+  QgsSettings().setValue( QStringLiteral( "/qgis/digitizing/default_z_value" ), 222 );
+  mLayer->startEditing();
+
+  QgsMapToolEllipseExtent mapTool( mParentTool, mCanvas );
+  mCanvas->setMapTool( &mapTool );
+
+  TestQgsMapToolAdvancedDigitizingUtils utils( &mapTool );
+  utils.mouseClick( 0, 0, Qt::LeftButton );
+  utils.mouseMove( 2, 2 );
+  utils.mouseClick( 2, 2, Qt::RightButton );
+  QgsFeatureId newFid = utils.newFeatureId();
+
+  QCOMPARE( mLayer->featureCount(), ( long )1 );
+  QgsFeature f = mLayer->getFeature( newFid );
+
+  QString wkt = f.geometry().asWkt().replace( "LineStringZ (", "" ).replace( ")", "" );
+  QgsPointSequence pts = QgsGeometryUtils::pointsFromWKT( wkt, true, false );
+
+  for ( const QgsPoint &pt : pts )
+  {
+    QCOMPARE( pt.z(), ( double )222 );
+  }
+
+  mLayer->rollBack();
+  QgsSettings().setValue( QStringLiteral( "/qgis/digitizing/default_z_value" ), 0 );
+}
+
+void TestQgsMapToolEllipse::testEllipseFromFoci()
+{
+  QgsSettings().setValue( QStringLiteral( "/qgis/digitizing/default_z_value" ), 444 );
+  mLayer->startEditing();
+
+  QgsMapToolEllipseFoci mapTool( mParentTool, mCanvas );
+  mCanvas->setMapTool( &mapTool );
+
+  TestQgsMapToolAdvancedDigitizingUtils utils( &mapTool );
+  utils.mouseClick( 0, 0, Qt::LeftButton );
+  utils.mouseClick( 0, 2, Qt::LeftButton );
+  utils.mouseMove( 0, -1 );
+  utils.mouseClick( 0, -1, Qt::RightButton );
+  QgsFeatureId newFid = utils.newFeatureId();
+
+  QCOMPARE( mLayer->featureCount(), ( long )1 );
+  QgsFeature f = mLayer->getFeature( newFid );
+
+  QString wkt = f.geometry().asWkt().replace( "LineStringZ (", "" ).replace( ")", "" );
+  QgsPointSequence pts = QgsGeometryUtils::pointsFromWKT( wkt, true, false );
+
+  for ( const QgsPoint &pt : pts )
+  {
+    QCOMPARE( pt.z(), ( double )444 );
+  }
+
+  mLayer->rollBack();
+  QgsSettings().setValue( QStringLiteral( "/qgis/digitizing/default_z_value" ), 0 );
+}
+
+QGSTEST_MAIN( TestQgsMapToolEllipse )
+#include "testqgsmaptoolellipse.moc"