Skip to content

Commit 20e1d72

Browse files
nyalldawsonnyalldawson
authoredSep 19, 2017
Merge pull request #5209 from nyalldawson/geometry_coverage
[WIP] Extend geometry classes unit test coverage
·
ltr-3_40final-3_0_0
2 parents 8d34023 + 38cc570 commit 20e1d72

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+5628
-2880
lines changed
 

‎python/core/geometry/qgsabstractgeometry.sip

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ class QgsAbstractGeometry
275275

276276
virtual double closestSegment( const QgsPoint &pt, QgsPoint &segmentPt /Out/,
277277
QgsVertexId &vertexAfter /Out/,
278-
bool *leftOf /Out/, double epsilon ) const = 0;
278+
bool *leftOf /Out/ = 0, double epsilon = 4 * DBL_EPSILON ) const = 0;
279279
%Docstring
280280
Searches for the closest segment of the geometry to a given point.
281281
\param pt specifies the point to find closest segment to
@@ -372,12 +372,12 @@ Returns the centroid of the geometry
372372
:rtype: QgsAbstractGeometry
373373
%End
374374

375-
virtual QgsAbstractGeometry *toCurveType() const /Factory/;
375+
virtual QgsAbstractGeometry *toCurveType() const = 0 /Factory/;
376376
%Docstring
377377
Returns the geometry converted to the more generic curve type.
378-
E.g. QgsLineString -> QgsCompoundCurve, QgsPolygonV2 -> QgsCurvePolygon,
379-
QgsMultiLineString -> QgsMultiCurve, QgsMultiPolygonV2 -> QgsMultiSurface
380-
:return: the converted geometry. Caller takes ownership*
378+
E.g. QgsLineString -> QgsCompoundCurve, QgsPolygonV2 -> QgsCurvePolygon,
379+
QgsMultiLineString -> QgsMultiCurve, QgsMultiPolygonV2 -> QgsMultiSurface
380+
:return: the converted geometry. Caller takes ownership
381381
:rtype: QgsAbstractGeometry
382382
%End
383383

‎python/core/geometry/qgscircle.sip

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,13 +133,15 @@ class QgsCircle : QgsEllipse
133133

134134

135135
virtual void setSemiMajorAxis( const double semiMajorAxis );
136+
136137
%Docstring
137138
Inherited method. Use setRadius instead.
138139
.. seealso:: radius()
139140
.. seealso:: setRadius()
140141
%End
141142

142143
virtual void setSemiMinorAxis( const double semiMinorAxis );
144+
143145
%Docstring
144146
Inherited method. Use setRadius instead.
145147
.. seealso:: radius()

0 commit comments

Comments
 (0)
Please sign in to comment.