Stop conflicts

qgis · Dec 16, 2017 · 313417d · 313417d
1 parent 972e789
commit 313417d
Showing 1 changed file with 33 additions and 31 deletions.
diff --git a/python/core/geometry/qgsgeometryutils.sip b/python/core/geometry/qgsgeometryutils.sip
@@ -103,37 +103,39 @@ Returns the squared distance between a point and a line.
     static bool segmentIntersection( const QgsPoint &p1, const QgsPoint &p2, const QgsPoint &q1, const QgsPoint &q2, QgsPoint &intersectionPoint /Out/, bool &isIntersection /Out/, const double tolerance = 1e-8, bool acceptImproperIntersection = false );
 %Docstring
  Compute the intersection between two segments
- \param p1 First segment start point
- \param p2 First segment end point
- \param q1 Second segment start point
- \param q2 Second segment end point
- \param intersectionPoint Output parameter, the intersection point
- \param isIntersection Output parameter, return true if an intersection is found
- \param tolerance The tolerance to use
- \param acceptImproperIntersection By default, this method returns true only if segments have proper intersection. If set true, returns also true if segments have improper intersection (end of one segment on other segment ; continuous segments).
- :return:  Whether the segments intersect
- * Example:
- \code{.py}
-   ret = QgsGeometryUtils.segmentIntersection( QgsPoint( 0, 0 ), QgsPoint( 0, 1 ), QgsPoint( 1, 1 ), QgsPoint( 1, 0 ) )
-   ret[0], ret[1].asWkt(), ret[2]
-   # Whether the segments intersect, the intersection point, is intersect
-   # (False, 'Point (0 0)', False)
-   ret = QgsGeometryUtils.segmentIntersection( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 0, 5 ), QgsPoint( 1, 5 ) )
-   ret[0], ret[1].asWkt(), ret[2]
-   # (False, 'Point (0 5)', True)
-   ret = QgsGeometryUtils.segmentIntersection( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 0, 5 ), QgsPoint( 1, 5 ), acceptImproperIntersection=True )
-   ret[0], ret[1].asWkt(), ret[2]
-   # (True, 'Point (0 5)', True)
-   ret = QgsGeometryUtils.segmentIntersection( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 0, 2 ), QgsPoint( 1, 5 ) )
-   ret[0], ret[1].asWkt(), ret[2]
-   # (False, 'Point (0 2)', True)
-   ret = QgsGeometryUtils.segmentIntersection( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 0, 2 ), QgsPoint( 1, 5 ), acceptImproperIntersection=True )
-   ret[0], ret[1].asWkt(), ret[2]
-   # (True, 'Point (0 2)', True)
-   ret = QgsGeometryUtils.segmentIntersection( QgsPoint( 0, -5 ), QgsPoint( 0, 5 ), QgsPoint( 2, 0 ), QgsPoint( -1, 0 ) )
-   ret[0], ret[1].asWkt(), ret[2]
-   # (True, 'Point (0 0)', True)
- \endcode
+
+:param p1: First segment start point
+:param p2: First segment end point
+:param q1: Second segment start point
+:param q2: Second segment end point
+:param intersectionPoint: Output parameter, the intersection point
+:param isIntersection: Output parameter, return true if an intersection is found
+:param tolerance: The tolerance to use
+:param acceptImproperIntersection: By default, this method returns true only if segments have proper intersection. If set true, returns also true if segments have improper intersection (end of one segment on other segment ; continuous segments).
+
+:return:  Whether the segments intersect
+* Example:
+\code{.py}
+ret = QgsGeometryUtils.segmentIntersection( QgsPoint( 0, 0 ), QgsPoint( 0, 1 ), QgsPoint( 1, 1 ), QgsPoint( 1, 0 ) )
+ret[0], ret[1].asWkt(), ret[2]
+# Whether the segments intersect, the intersection point, is intersect
+# (False, 'Point (0 0)', False)
+ret = QgsGeometryUtils.segmentIntersection( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 0, 5 ), QgsPoint( 1, 5 ) )
+ret[0], ret[1].asWkt(), ret[2]
+# (False, 'Point (0 5)', True)
+ret = QgsGeometryUtils.segmentIntersection( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 0, 5 ), QgsPoint( 1, 5 ), acceptImproperIntersection=True )
+ret[0], ret[1].asWkt(), ret[2]
+# (True, 'Point (0 5)', True)
+ret = QgsGeometryUtils.segmentIntersection( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 0, 2 ), QgsPoint( 1, 5 ) )
+ret[0], ret[1].asWkt(), ret[2]
+# (False, 'Point (0 2)', True)
+ret = QgsGeometryUtils.segmentIntersection( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 0, 2 ), QgsPoint( 1, 5 ), acceptImproperIntersection=True )
+ret[0], ret[1].asWkt(), ret[2]
+# (True, 'Point (0 2)', True)
+ret = QgsGeometryUtils.segmentIntersection( QgsPoint( 0, -5 ), QgsPoint( 0, 5 ), QgsPoint( 2, 0 ), QgsPoint( -1, 0 ) )
+ret[0], ret[1].asWkt(), ret[2]
+# (True, 'Point (0 0)', True)
+\endcode
 %End
 
     static QgsPoint projPointOnSegment( const QgsPoint &p, const QgsPoint &s1, const QgsPoint &s2 );