qgis · Oct 27, 2017
diff --git a/‎python/core/geometry/qgsabstractgeometry.sip
Lines changed: 5 additions & 18 deletions b/‎python/core/geometry/qgsabstractgeometry.sip
Lines changed: 5 additions & 18 deletions
diff --git a/‎python/core/geometry/qgscircularstring.sip
Lines changed: 25 additions & 6 deletions b/‎python/core/geometry/qgscircularstring.sip
Lines changed: 25 additions & 6 deletions
@@ -71,16 +71,6 @@ class QgsAbstractGeometry
     virtual ~QgsAbstractGeometry();
     QgsAbstractGeometry( const QgsAbstractGeometry &geom );
 
-    virtual QgsAbstractGeometry *createEmptyWithSameType() const = 0 /Factory/;
-%Docstring
- Makes a new geometry with the same class and same WKB and transfers ownership.
- To create it, the geometry is default constructedand then the WKB is changed.
- :return: the new empty geometry. Callee takes ownership.
-.. seealso:: clone
-.. versionadded:: 3.0
- :rtype: QgsAbstractGeometry
-%End
-
     virtual QgsAbstractGeometry *clone() const = 0 /Factory/;
 %Docstring
  Clones the geometry by performing a deep copy
@@ -412,14 +402,14 @@ Returns the centroid of the geometry
  :rtype: QgsAbstractGeometry
 %End
 
-    virtual QgsAbstractGeometry *snappedToGrid( double hSpacing, double vSpacing, double dSpacing = 0, double mSpacing = 0, double tolerance = M_PI / 180., SegmentationToleranceType toleranceType = MaximumAngle ) const = 0 /Factory/;
+    virtual QgsAbstractGeometry *snappedToGrid( double hSpacing, double vSpacing, double dSpacing = 0, double mSpacing = 0 ) const = 0 /Factory/;
 %Docstring
  Makes a new geometry with all the points or vertices snapped to the closest point of the grid.
- It transfers ownership to the callee.
- If it couldn't make the gridified geometry it returns None.
+ Ownership is transferred to the caller.
+
+ If the gridified geometry could not be calculated a None will be returned.
  It may generate an invalid geometry (in some corner cases).
  It can also be thought as rounding the edges and it may be useful for removing errors.
- If the geometry is curved, it will be segmentized before gridifying it.
  Example:
  \code
  geometry->snappedToGrid(1, 1);
@@ -430,10 +420,6 @@ Returns the centroid of the geometry
  \param vSpacing Vertical spacing of the grid (y axis). 0 to disable.
  \param dSpacing Depth spacing of the grid (z axis). 0 (default) to disable.
  \param mSpacing Custom dimension spacing of the grid (m axis). 0 (default) to disable.
- \param tolerance In case of segmentation, the tolerance to use (passed to segmentize as is).
- \param toleranceType In case of segmentation, the toleranceType to use (passed to segmentize as is).
- :return: the segmentized geometry or None if it wasn't possible to make. Caller takes ownership.
-.. seealso:: segmentize
 .. versionadded:: 3.0
  :rtype: QgsAbstractGeometry
 %End
@@ -528,6 +514,7 @@ Returns the centroid of the geometry
 
   protected:
 
+
     virtual bool hasChildGeometries() const;
 %Docstring
  Returns whether the geometry has any child geometries (false for point / curve, true otherwise)
 
@@ -25,17 +25,24 @@ class QgsCircularString: QgsCurve
     QgsCircularString();
 
     virtual bool operator==( const QgsCurve &other ) const;
+
     virtual bool operator!=( const QgsCurve &other ) const;
 
+
     virtual QString geometryType() const;
+
     virtual int dimension() const;
-    virtual QgsCircularString *createEmptyWithSameType() const /Factory/;
+
     virtual QgsCircularString *clone() const /Factory/;
+
     virtual void clear();
 
+
     virtual bool fromWkb( QgsConstWkbPtr &wkb );
+
     virtual bool fromWkt( const QString &wkt );
 
+
     virtual QByteArray asWkb() const;
 
     virtual QString asWkt( int precision = 17 ) const;
@@ -67,10 +74,14 @@ class QgsCircularString: QgsCurve
 %End
 
     virtual double length() const;
+
     virtual QgsPoint startPoint() const;
+
     virtual QgsPoint endPoint() const;
 
+
     virtual QgsLineString *curveToLine( double tolerance = M_PI_2 / 90, SegmentationToleranceType toleranceType = MaximumAngle ) const /Factory/;
+
 %Docstring
  Returns a new line string geometry corresponding to a segmentized approximation
  of the curve.
@@ -82,6 +93,9 @@ class QgsCircularString: QgsCurve
  :rtype: QgsLineString
 %End
 
+    virtual QgsCircularString *snappedToGrid( double hSpacing, double vSpacing, double dSpacing = 0, double mSpacing = 0 ) const /Factory/;
+
+
     virtual void draw( QPainter &p ) const;
 
      virtual void transform( const QgsCoordinateTransform &ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform,
@@ -90,17 +104,15 @@ class QgsCircularString: QgsCurve
 
     virtual void addToPainterPath( QPainterPath &path ) const;
 
-
     virtual void drawAsPolygon( QPainter &p ) const;
 
-
     virtual bool insertVertex( QgsVertexId position, const QgsPoint &vertex );
+
     virtual bool moveVertex( QgsVertexId position, const QgsPoint &newPos );
+
     virtual bool deleteVertex( QgsVertexId position );
 
-    virtual double closestSegment( const QgsPoint &pt, QgsPoint &segmentPt /Out/,
-                                   QgsVertexId &vertexAfter /Out/,
-                                   bool *leftOf /Out/ = 0, double epsilon = 4 * DBL_EPSILON ) const;
+    virtual double closestSegment( const QgsPoint &pt, QgsPoint &segmentPt /Out/, QgsVertexId &vertexAfter /Out/, bool *leftOf /Out/ = 0, double epsilon = 4 * DBL_EPSILON ) const;
 
     virtual bool pointAt( int node, QgsPoint &point, QgsVertexId::VertexType &type ) const;
 
@@ -120,21 +132,28 @@ class QgsCircularString: QgsCurve
 
     virtual QgsCircularString *reversed() const  /Factory/;
 
+
     virtual bool addZValue( double zValue = 0 );
+
     virtual bool addMValue( double mValue = 0 );
 
+
     virtual bool dropZValue();
+
     virtual bool dropMValue();
 
+
     virtual double xAt( int index ) const;
 
     virtual double yAt( int index ) const;
 
 
   protected:
+    virtual QgsCircularString *createEmptyWithSameType() const /Factory/;
 
     virtual QgsRectangle calculateBoundingBox() const;
 
+
 };