Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix qgsgeometry sip
  • Loading branch information
lbartoletti authored and m-kuhn committed Sep 8, 2017
1 parent 629f46d commit 5c3a720
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 14 deletions.
14 changes: 0 additions & 14 deletions python/core/geometry/qgsgeometry.sip
Expand Up @@ -577,13 +577,6 @@ Returns true if WKB of the geometry is of WKBMulti* type
:rtype: QgsGeometry
%End

QgsGeometry orientedMinimumBoundingBox( ) const;
%Docstring
Returns the oriented minimum bounding box for the geometry, which is the smallest (by area)
rotated rectangle which fully encompasses the geometry.
.. versionadded:: 3.0
:rtype: QgsGeometry
%End

QgsGeometry minimalEnclosingCircle( QgsPointXY &center /Out/, double &radius /Out/, unsigned int segments = 36 ) const;
%Docstring
Expand All @@ -595,13 +588,6 @@ Returns true if WKB of the geometry is of WKBMulti* type
:rtype: QgsGeometry
%End

QgsGeometry minimalEnclosingCircle( unsigned int segments = 36 ) const;
%Docstring
Returns the minimal enclosing circle for the geometry.
.. seealso:: QgsEllipse.toPolygon()
.. versionadded:: 3.0
:rtype: QgsGeometry
%End

QgsGeometry orthogonalize( double tolerance = 1.0E-8, int maxIterations = 1000, double angleThreshold = 15.0 ) const;
%Docstring
Expand Down
6 changes: 6 additions & 0 deletions src/core/geometry/qgsgeometry.h
Expand Up @@ -599,12 +599,15 @@ class CORE_EXPORT QgsGeometry
*/
QgsGeometry orientedMinimumBoundingBox( double &area SIP_OUT, double &angle SIP_OUT, double &width SIP_OUT, double &height SIP_OUT ) const;

#ifndef SIP_RUN

/**
* Returns the oriented minimum bounding box for the geometry, which is the smallest (by area)
* rotated rectangle which fully encompasses the geometry.
* \since QGIS 3.0
*/
QgsGeometry orientedMinimumBoundingBox( ) const;
#endif

/**
* Returns the minimal enclosing circle for the geometry.
Expand All @@ -615,12 +618,15 @@ class CORE_EXPORT QgsGeometry
*/
QgsGeometry minimalEnclosingCircle( QgsPointXY &center SIP_OUT, double &radius SIP_OUT, unsigned int segments = 36 ) const;

#ifndef SIP_RUN

/**
* Returns the minimal enclosing circle for the geometry.
* \param segments Number of segments used to segment geometry. \see QgsEllipse::toPolygon()
* \since QGIS 3.0
*/
QgsGeometry minimalEnclosingCircle( unsigned int segments = 36 ) const;
#endif

/**
* Attempts to orthogonalize a line or polygon geometry by shifting vertices to make the geometries
Expand Down

0 comments on commit 5c3a720

Please sign in to comment.