Fix QgsPoint(XY) sip bindings

qgis · Jun 14, 2017 · 4eae087 · 4eae087
1 parent e957224
commit 4eae087
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/python/core/core.sip b/python/core/core.sip
@@ -123,7 +123,7 @@
 %Include qgspathresolver.sip
 %Include qgspluginlayer.sip
 %Include qgspluginlayerregistry.sip
-%Include qgspoint.sip
+%Include qgspointxy.sip
 %Include qgspointlocator.sip
 %Include qgsproject.sip
 %Include qgsprojectbadlayerhandler.sip
@@ -398,7 +398,7 @@
 %Include geometry/qgsmultipoint.sip
 %Include geometry/qgsmultipolygon.sip
 %Include geometry/qgsmultisurface.sip
-%Include geometry/qgspointv2.sip
+%Include geometry/qgspoint.sip
 %Include geometry/qgspolygon.sip
 %Include geometry/qgsrectangle.sip
 %Include geometry/qgsregularpolygon.sip

diff --git a/python/core/geometry/qgspointv2.sip → python/core/geometry/qgspoint.sip b/python/core/geometry/qgspointv2.sip → python/core/geometry/qgspoint.sip
@@ -1,7 +1,7 @@
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/core/geometry/qgspointv2.h                                       *
+ * src/core/geometry/qgspoint.h                                         *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
@@ -22,11 +22,9 @@ class QgsPoint: QgsAbstractGeometry
 %End
   public:
 
-    QgsPoint( double x = 0.0, double y = 0.0 );
+    QgsPoint( double x = 0.0, double y = 0.0, double z = 0.0, double m = 0.0 );
 %Docstring
- Construct a 2 dimensional point with an initial x and y coordinate.
- \param x x-coordinate of point
- \param y y-coordinate of point
+ Construct a point with the provided initial coordinate values.
 %End
 
     explicit QgsPoint( const QgsPointXY &p );
@@ -369,7 +367,7 @@ class QgsPoint: QgsAbstractGeometry
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/core/geometry/qgspointv2.h                                       *
+ * src/core/geometry/qgspoint.h                                         *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
diff --git a/python/core/qgspoint.sip → python/core/qgspointxy.sip b/python/core/qgspoint.sip → python/core/qgspointxy.sip
@@ -1,7 +1,7 @@
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/core/qgspoint.h                                                  *
+ * src/core/qgspointxy.h                                                *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/
@@ -15,8 +15,13 @@
 class QgsPointXY
 {
 %Docstring
- A class to represent a point.
- For Z and M support prefer QgsPointV2.
+ A class to represent a 2D point.
+
+ A QgsPointXY represents a position with X and Y coordinates.
+ In most scenarios it is preferable to use a QgsPoint instead which also
+ supports Z and M values.
+
+.. versionadded:: 3.0
 %End
 
 %TypeHeaderCode
@@ -331,7 +336,7 @@ Divides the coordinates in this point by a scalar quantity in place
 /************************************************************************
  * This file has been generated automatically from                      *
  *                                                                      *
- * src/core/qgspoint.h                                                  *
+ * src/core/qgspointxy.h                                                *
  *                                                                      *
  * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
  ************************************************************************/