Skip to content

/ QGIS

Permalink
Browse files
Loading status checks…

Merge pull request #5491 from m-kuhn/dropV2 

Drop V2 suffix on all geometry classes
  • Loading branch information
@m-kuhn
m-kuhn committed Oct 30, 2017
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
2 parents 86d170b + d2c1011 commit 1d21072bf0b90da4562a09a7330dee12347f3c79
Unified Split
Showing with 1,226 additions and 1,208 deletions.
  1. +23 −8 doc/api_break.dox
  2. +8 −8 python/core/geometry/qgsabstractgeometry.sip
  3. +3 −3 python/core/geometry/qgscurvepolygon.sip
  4. +4 −4 python/core/geometry/qgsellipse.sip
  5. +37 −37 python/core/geometry/qgsgeometry.sip
  6. +5 −5 python/core/geometry/qgsmultipoint.sip
  7. +4 −4 python/core/geometry/qgsmultipolygon.sip
  8. +5 −5 python/core/geometry/qgspolygon.sip
  9. +2 −2 python/core/geometry/qgsregularpolygon.sip
  10. +2 −2 python/core/geometry/qgssurface.sip
  11. +2 −2 python/core/geometry/qgstriangle.sip
  12. +2 −2 python/core/symbology/qgssymbol.sip
  13. +1 −1 python/plugins/processing/algs/qgis/CheckValidity.py
  14. +1 −1 python/plugins/processing/algs/qgis/Delaunay.py
  15. +6 −6 python/plugins/processing/algs/qgis/GeometryConvert.py
  16. +3 −3 python/plugins/processing/algs/qgis/GridPolygon.py
  17. +1 −1 python/plugins/processing/algs/qgis/HubDistancePoints.py
  18. +4 −4 python/plugins/processing/algs/qgis/LinesToPolygons.py
  19. +2 −2 python/plugins/processing/algs/qgis/MinimumBoundingGeometry.py
  20. +1 −1 python/plugins/processing/algs/qgis/PointsFromLines.py
  21. +1 −1 python/plugins/processing/algs/qgis/RandomPointsAlongLines.py
  22. +1 −1 python/plugins/processing/algs/qgis/RandomPointsExtent.py
  23. +1 −1 python/plugins/processing/algs/qgis/RandomPointsLayer.py
  24. +1 −1 python/plugins/processing/algs/qgis/RandomPointsPolygons.py
  25. +6 −6 python/plugins/processing/algs/qgis/RectanglesOvalsDiamondsFixed.py
  26. +6 −6 python/plugins/processing/algs/qgis/RectanglesOvalsDiamondsVariable.py
  27. +2 −2 python/plugins/processing/algs/qgis/RegularPoints.py
  28. +2 −2 python/plugins/processing/algs/qgis/ServiceAreaFromLayer.py
  29. +4 −4 python/plugins/processing/algs/qgis/ServiceAreaFromPoint.py
  30. +1 −1 python/plugins/processing/algs/qgis/VoronoiPolygons.py
  31. +1 −1 python/plugins/processing/algs/qgis/scripts/Keep_n_biggest_parts.py
  32. +1 −1 src/3d/qgs3dutils.cpp
  33. +2 −2 src/3d/qgs3dutils.h
  34. +2 −2 src/3d/qgstessellatedpolygongeometry.cpp
  35. +2 −2 src/3d/qgstessellatedpolygongeometry.h
  36. +2 −2 src/3d/qgstessellator.cpp
  37. +2 −2 src/3d/qgstessellator.h
  38. +4 −4 src/3d/symbols/qgsline3dsymbol_p.cpp
  39. +5 −5 src/3d/symbols/qgspolygon3dsymbol_p.cpp
  40. +4 −4 src/analysis/network/qgsvectorlayerdirector.cpp
  41. +2 −2 src/analysis/processing/qgsalgorithmlineintersection.cpp
  42. +1 −1 src/analysis/processing/qgsalgorithmmeancoordinates.cpp
  43. +2 −2 src/analysis/raster/qgskde.cpp
  44. +1 −1 src/analysis/vector/geometry_checker/qgsgeometrycheckerutils.cpp
  45. +1 −1 src/analysis/vector/geometry_checker/qgsgeometrycheckerutils.h
  46. +1 −1 src/analysis/vector/geometry_checker/qgsgeometrylinelayerintersectioncheck.cpp
  47. +2 −2 src/analysis/vector/geometry_checker/qgsgeometryselfintersectioncheck.cpp
  48. +2 −2 src/analysis/vector/geometry_checker/qgsgeometrytypecheck.cpp
  49. +3 −3 src/app/dwg/qgsdwgimporter.cpp
  50. +1 −1 src/app/nodetool/qgsnodeeditor.cpp
  51. +2 −2 src/app/nodetool/qgsnodetool.cpp
  52. +5 −5 src/app/qgsmaptooladdfeature.cpp
  53. +2 −2 src/app/qgsmaptooladdrectangle.cpp
  54. +2 −2 src/app/qgsmaptooladdrectangle.h
  55. +1 −1 src/app/qgsmaptoolcircle2tangentspoint.cpp
  56. +6 −6 src/app/qgsmaptooldeletepart.cpp
  57. +8 −8 src/app/qgsmaptooldeletering.cpp
  58. +5 −5 src/app/qgsmaptoolfillring.cpp
  59. +1 −1 src/app/qgsmaptoollabel.cpp
  60. +1 −1 src/app/qgsmaptoolmovefeature.cpp
  61. +6 −6 src/app/qgsmaptooloffsetcurve.cpp
  62. +1 −1 src/app/qgsmaptoolrotatefeature.cpp
  63. +3 −3 src/app/qgsmaptoolselectutils.cpp
  64. +2 −2 src/app/qgsmaptoolsimplify.cpp
  65. +1 −1 src/core/composer/qgscomposermap.cpp
  66. +2 −2 src/core/expression/qgsexpressionfunction.cpp
  67. +9 −9 src/core/geometry/qgsabstractgeometry.h
  68. +1 −1 src/core/geometry/qgscurve.cpp
  69. +4 −4 src/core/geometry/qgscurvepolygon.cpp
  70. +3 −3 src/core/geometry/qgscurvepolygon.h
  71. +4 −4 src/core/geometry/qgsellipse.cpp
  72. +2 −2 src/core/geometry/qgsellipse.h
  73. +99 −99 src/core/geometry/qgsgeometry.cpp
  74. +40 −40 src/core/geometry/qgsgeometry.h
  75. +3 −3 src/core/geometry/qgsgeometrycollection.cpp
  76. +1 −1 src/core/geometry/qgsgeometryeditutils.cpp
  77. +20 −20 src/core/geometry/qgsgeometryfactory.cpp
  78. +14 −14 src/core/geometry/qgsgeometryfactory.h
  79. +5 −5 src/core/geometry/qgsgeometrymakevalid.cpp
  80. +6 −6 src/core/geometry/qgsgeos.cpp
  81. +2 −2 src/core/geometry/qgsgeos.h
  82. +12 −12 src/core/geometry/qgsinternalgeometryengine.cpp
  83. +1 −1 src/core/geometry/qgslinestring.h
  84. +1 −1 src/core/geometry/qgsmulticurve.cpp
  85. +18 −18 src/core/geometry/qgsmultipoint.cpp
  86. +8 −8 src/core/geometry/qgsmultipoint.h
  87. +24 −24 src/core/geometry/qgsmultipolygon.cpp
  88. +8 −8 src/core/geometry/qgsmultipolygon.h
  89. +3 −3 src/core/geometry/qgsmultisurface.cpp
  90. +15 −15 src/core/geometry/qgspolygon.cpp
  91. +9 −9 src/core/geometry/qgspolygon.h
  92. +1 −1 src/core/geometry/qgsrectangle.cpp
  93. +2 −2 src/core/geometry/qgsregularpolygon.cpp
  94. +1 −1 src/core/geometry/qgsregularpolygon.h
  95. +2 −2 src/core/geometry/qgssurface.h
  96. +1 −1 src/core/geometry/qgstriangle.cpp
  97. +2 −2 src/core/geometry/qgstriangle.h
  98. +2 −2 src/core/qgsdistancearea.cpp
  99. +1 −1 src/core/qgsexpressioncontext.cpp
  100. +3 −3 src/core/qgsgeometryvalidator.cpp
  101. +1 −1 src/core/qgsgeometryvalidator.h
  102. +2 −2 src/core/qgsmaptopixelgeometrysimplifier.cpp
  103. +9 −9 src/core/qgsogcutils.cpp
  104. +1 −1 src/core/qgspointlocator.cpp
  105. +4 −4 src/core/qgstracer.cpp
  106. +4 −4 src/core/qgsvectorlayereditutils.cpp
  107. +3 −3 src/core/qgsvectorlayerlabelprovider.cpp
  108. +4 −4 src/core/symbology/qgsheatmaprenderer.cpp
  109. +1 −1 src/core/symbology/qgsheatmaprenderer.h
  110. +6 −6 src/core/symbology/qgsinvertedpolygonrenderer.cpp
  111. +1 −1 src/core/symbology/qgsinvertedpolygonrenderer.h
  112. +1 −1 src/core/symbology/qgspointdistancerenderer.cpp
  113. +5 −5 src/core/symbology/qgssymbol.cpp
  114. +3 −3 src/core/symbology/qgssymbol.h
  115. +5 −5 src/core/symbology/qgssymbollayerutils.cpp
  116. +15 −12 src/gui/qgshighlight.cpp
  117. +1 −1 src/gui/qgshighlight.h
  118. +1 −1 src/gui/qgsmaptoolcapture.cpp
  119. +11 −11 src/gui/qgsrubberband.cpp
  120. +6 −6 src/plugins/globe/featuresource/qgsglobefeatureutils.h
  121. +15 −15 src/plugins/topology/topolTest.cpp
  122. +2 −2 src/providers/arcgisrest/qgsarcgisrestutils.cpp
  123. +1 −1 src/providers/delimitedtext/qgsdelimitedtextfeatureiterator.cpp
  124. +1 −1 src/providers/delimitedtext/qgsdelimitedtextprovider.cpp
  125. +6 −6 src/providers/grass/qgis.v.in.cpp
  126. +2 −2 src/providers/grass/qgsgrassgislib.cpp
  127. +2 −2 src/providers/grass/qgsgrassprovider.cpp
  128. +2 −2 src/providers/grass/qgsgrassvectormap.cpp
  129. +2 −2 tests/src/3d/testqgstessellator.cpp
  130. +2 −2 tests/src/app/testqgsattributetable.cpp
  131. +2 −2 tests/src/app/testqgsfieldcalculator.cpp
  132. +4 −4 tests/src/app/testqgsmaptoolidentifyaction.cpp
  133. +3 −3 tests/src/app/testqgsnodetool.cpp
  134. +2 −2 tests/src/core/testqgscadutils.cpp
  135. +3 −3 tests/src/core/testqgsdistancearea.cpp
  136. +52 −52 tests/src/core/testqgsexpression.cpp
  137. +231 −231 tests/src/core/testqgsgeometry.cpp
  138. +5 −5 tests/src/core/testqgsgeometryutils.cpp
  139. +13 −13 tests/src/core/testqgsgml.cpp
  140. +2 −2 tests/src/core/testqgslabelingengine.cpp
  141. +7 −7 tests/src/core/testqgslegendrenderer.cpp
  142. +2 −2 tests/src/core/testqgsmaprendererjob.cpp
  143. +1 −1 tests/src/core/testqgsogcutils.cpp
  144. +5 −5 tests/src/core/testqgspointlocator.cpp
  145. +2 −2 tests/src/core/testqgssnappingutils.cpp
  146. +3 −3 tests/src/core/testqgsspatialindex.cpp
  147. +8 −8 tests/src/core/testqgsvectorfilewriter.cpp
  148. +4 −4 tests/src/python/offlineditingtestbase.py
  149. +3 −3 tests/src/python/test_provider_memory.py
  150. +3 −3 tests/src/python/test_qgsatlascomposition.py
  151. +2 −2 tests/src/python/test_qgsattributetablemodel.py
  152. +6 −6 tests/src/python/test_qgsdistancearea.py
  153. +1 −1 tests/src/python/test_qgseditwidgets.py
  154. +2 −2 tests/src/python/test_qgsfeature.py
  155. +8 −8 tests/src/python/test_qgsfeaturesink.py
  156. +5 −5 tests/src/python/test_qgsfeaturesource.py
  157. +92 −92 tests/src/python/test_qgsgeometry.py
  158. +1 −1 tests/src/python/test_qgsgraduatedsymbolrenderer.py
  159. +1 −1 tests/src/python/test_qgsmapcanvasannotationitem.py
  160. +1 −1 tests/src/python/test_qgsmaprenderer.py
  161. +1 −1 tests/src/python/test_qgsrangewidgets.py
  162. +6 −6 tests/src/python/test_qgsrelation.py
  163. +2 −2 tests/src/python/test_qgsrenderer.py
  164. +7 −7 tests/src/python/test_qgsserver_wfst.py
  165. +1 −1 tests/src/python/test_qgsspatialindex.py
  166. +2 −2 tests/src/python/test_qgssymbollayer_readsld.py
  167. +3 −3 tests/src/python/test_qgsvectorfilewriter.py
  168. +1 −1 tests/src/python/test_qgsvectorfilewritertask.py
  169. +36 −36 tests/src/python/test_qgsvectorlayer.py
  170. +16 −16 tests/src/python/test_qgsvectorlayereditbuffer.py
  171. +1 −1 tests/src/python/test_qgsvectorlayerutils.py
31 doc/api_break.dox
View file
@@ -64,8 +64,9 @@ Renamed Classes {#qgis_api_break_3_0_renamed_classes}
<caption id="renamed_classes">Renamed classes</caption>
<tr><th>API 2.x<th>API 3.X
<tr><td>QgisGui<td>QgsGuiUtils
<tr><td>QgsAttributeAction<td>QgsActionManager
<tr><td>QgsAbstractGeometryV2<td>QgsAbstractGeometry
<tr><td>QgsArcProperter<td>QgsStrategy
<tr><td>QgsAttributeAction<td>QgsActionManager
<tr><td>QgsCategorizedSymbolRendererV2<td>QgsCategorizedSymbolRenderer
<tr><td>QgsCategorizedSymbolRendererV2Model<td>QgsCategorizedSymbolRendererModel
<tr><td>QgsCategorizedSymbolRendererV2ViewStyle<td>QgsCategorizedSymbolRendererViewStyle
@@ -86,6 +87,7 @@ Renamed Classes {#qgis_api_break_3_0_renamed_classes}
<tr><td>QgsCurveV2<td>QgsCurve
<tr><td>QgsDbFilterProxyModel<td>QgsDatabaseFilterProxyModel
<tr><td>QgsDiagramRendererV2<td>QgsDiagramRenderer
<tr><td>QgsDistanceArcProperter<td>QgsDistanceStrategy
<tr><td>QgsDoubleBoxBarStyle<td>QgsDoubleBoxScaleBarRenderer
<tr><td>QgsEditorWidgetV2<td>QgsEditorWidget
<tr><td>QgsEllipseSymbolLayerV2<td>QgsEllipseSymbolLayer
@@ -104,6 +106,7 @@ Renamed Classes {#qgis_api_break_3_0_renamed_classes}
<tr><td>QgsGraduatedSymbolRendererV2Model<td>QgsGraduatedSymbolRendererModel
<tr><td>QgsGraduatedSymbolRendererV2ViewStyle<td>QgsGraduatedSymbolRendererViewStyle
<tr><td>QgsGraduatedSymbolRendererV2Widget<td>QgsGraduatedSymbolRendererWidget
<tr><td>QgsGraphArc<td>QgsGraphEdge
<tr><td>QgsJSONExporter<td>QgsJsonExporter
<tr><td>QgsJSONUtils<td>QgsJsonUtils
<tr><td>QgsLabelingEngineV2<td>QgsLabelingEngine
@@ -118,11 +121,21 @@ Renamed Classes {#qgis_api_break_3_0_renamed_classes}
<tr><td>QgsMarkerSymbolV2<td>QgsMarkerSymbol
<tr><td>QgsMultiCurveV2<td>QgsMultiCurve
<tr><td>QgsMultiLineStringV2<td>QgsMultiLineString
<tr><td>QgsMultiPoint<td>QgsMultiPointXY
<tr><td>QgsMultiPointV2<td>QgsMultiPoint
<tr><td>QgsMultiPolygon<td>QgsPolygonXY
<tr><td>QgsMultiPolygonV2<td>QgsPolygon
<tr><td>QgsMultiPolyline<td>QgsPolylineXY
<tr><td>QgsMultiPolylineV2<td>QgsPolyline
<tr><td>QgsMultiSurfaceV2<td>QgsMultiSurface
<tr><td>QgsNumericScaleBarStyle<td>QgsNumericScaleBarRenderer
<tr><td>QgsPointV2<td>QgsPoint
<tr><td>QgsPoint<td>QgsPointXY
<tr><td>QgsPointSequenceV2<td>QgsPointSequence
<tr><td>QgsPointV2<td>QgsPoint
<tr><td>QgsPolygon<td>QgsPolygonXY
<tr><td>QgsPolygonV2<td>QgsPolygon
<tr><td>QgsPolyline<td>QgsPolylineXY
<tr><td>QgsPolylineV2<td>QgsPolyline
<tr><td>QgsProperty<td>QgsProjectProperty
<tr><td>QgsPropertyKey<td>QgsProjectPropertyKey
<tr><td>QgsPropertyValue<td>QgsProjectPropertyValue
@@ -175,6 +188,7 @@ Renamed Classes {#qgis_api_break_3_0_renamed_classes}
<tr><td>QgsSymbolLayerV2Utils<td>QgsSymbolLayerUtils
<tr><td>QgsSymbolLayerV2Widget<td>QgsSymbolLayerWidget
<tr><td>QgsSymbolLevelsV2Dialog<td>QgsSymbolLevelsDialog
<tr><td>QgsSymbolV2<td>QgsSymbol
<tr><td>QgsSymbolV2LegendNode<td>QgsSymbolLegendNode
<tr><td>QgsSymbolV2LevelItem<td>QgsSymbolLevelItem
<tr><td>QgsSymbolV2RenderContext<td>QgsSymbolRenderContext
@@ -196,10 +210,6 @@ Renamed Classes {#qgis_api_break_3_0_renamed_classes}
<tr><td>QgsVectorRandomColorRampV2<td>QgsLimitedRandomColorRamp
<tr><td>QgsVectorRandomColorRampV2Dialog<td>QgsLimitedRandomColorRampDialog
<tr><td>QgsVectorRandomColorRampV2DialogBase<td>QgsLimitedRandomColorRampDialogBase
<tr><td>QgsSymbolV2<td>QgsSymbol
<tr><td>QgsArcProperter<td>QgsStrategy
<tr><td>QgsDistanceArcProperter<td>QgsDistanceStrategy
<tr><td>QgsGraphArc<td>QgsGraphEdge
</table>

<table>
@@ -1301,8 +1311,8 @@ method if the geometry is not being modified.
empty geometry collection)
- wkbSize() and asWkb() has been replaced by exportToWkb(). WKB representation is no longer cached within QgsGeometry
- asGeos() has been replaced by exportToGeos(). GEOS representation is no longer cached within QgsGeometry
- int addPart( const QList<QgsPoint> &points, QgsWkbTypes::GeometryType geomType ) has been renamed to addPoints
- int addPart( const QList<QgsPointV2> &points, QgsWkbTypes::GeometryType geomType ) has been renamed to addPointsV2
- int addPart( const QList<QgsPoint> &points, QgsWkbTypes::GeometryType geomType ) has been renamed to addPointsXY
- int addPart( const QList<QgsPointV2> &points, QgsWkbTypes::GeometryType geomType ) has been renamed to addPoints
- static bool compare( const QgsPolyline& p1, const QgsPolyline& p2, double epsilon ) has been renamed to comparePolylines
- static bool compare( const QgsPolygon& p1, const QgsPolygon& p2, double epsilon ) has been renamed to comparePolygons
- static bool compare( const QgsMultiPolygon& p1, const QgsMultiPolygon& p2, double epsilon ) has been renamed to compareMultiPolygons
@@ -1314,6 +1324,11 @@ empty geometry collection)
- fromPolyline() now requires a list of QgsPoint objects, instead of QgsPointXY 2d points. A new method fromPolylineXY was
added which uses the old list of 2d QgsPointXY objects. Using the newer method with QgsPoint is greatly preferred, as it
maintains Z or M dimensions from the input points and is more efficient.
- fromPoint() was renamed to fromPointXY()
- fromMultiPoint() was renamed to fromMultiPointXY()
- fromMultiPolyline() was renamed to fromMultiPolylineXY()
- fromPolygon() was renamed to fromPolygonXY()
- fromMultiPolygon() was renamed to fromMultiPolygonXY()


QgsGeometryAnalyzer {#qgis_api_break_3_0_QgsGeometryAnalyzer}
16 python/core/geometry/qgsabstractgeometry.sip
View file
@@ -35,16 +35,16 @@ class QgsAbstractGeometry
sipType = sipType_QgsCompoundCurve;
else if ( qgsgeometry_cast<QgsTriangle *>( sipCpp ) != nullptr )
sipType = sipType_QgsTriangle;
else if ( qgsgeometry_cast<QgsPolygonV2 *>( sipCpp ) != nullptr )
sipType = sipType_QgsPolygonV2;
else if ( qgsgeometry_cast<QgsPolygon *>( sipCpp ) != nullptr )
sipType = sipType_QgsPolygon;
else if ( qgsgeometry_cast<QgsCurvePolygon *>( sipCpp ) != nullptr )
sipType = sipType_QgsCurvePolygon;
else if ( qgsgeometry_cast<QgsMultiPointV2 *>( sipCpp ) != nullptr )
sipType = sipType_QgsMultiPointV2;
else if ( qgsgeometry_cast<QgsMultiPoint *>( sipCpp ) != nullptr )
sipType = sipType_QgsMultiPoint;
else if ( qgsgeometry_cast<QgsMultiLineString *>( sipCpp ) != nullptr )
sipType = sipType_QgsMultiLineString;
else if ( qgsgeometry_cast<QgsMultiPolygonV2 *>( sipCpp ) != nullptr )
sipType = sipType_QgsMultiPolygonV2;
else if ( qgsgeometry_cast<QgsMultiPolygon *>( sipCpp ) != nullptr )
sipType = sipType_QgsMultiPolygon;
else if ( qgsgeometry_cast<QgsMultiSurface *>( sipCpp ) != nullptr )
sipType = sipType_QgsMultiSurface;
else if ( qgsgeometry_cast<QgsMultiCurve *>( sipCpp ) != nullptr )
@@ -396,8 +396,8 @@ Returns the centroid of the geometry
virtual QgsAbstractGeometry *toCurveType() const = 0 /Factory/;
%Docstring
Returns the geometry converted to the more generic curve type.
E.g. QgsLineString -> QgsCompoundCurve, QgsPolygonV2 -> QgsCurvePolygon,
QgsMultiLineString -> QgsMultiCurve, QgsMultiPolygonV2 -> QgsMultiSurface
E.g. QgsLineString -> QgsCompoundCurve, QgsPolygon -> QgsCurvePolygon,
QgsMultiLineString -> QgsMultiCurve, QgsMultiPolygon -> QgsMultiSurface
:return: the converted geometry. Caller takes ownership
:rtype: QgsAbstractGeometry
%End
6 python/core/geometry/qgscurvepolygon.sip
View file
@@ -61,7 +61,7 @@ class QgsCurvePolygon: QgsSurface

virtual double perimeter() const;

virtual QgsPolygonV2 *surfaceToPolygon() const /Factory/;
virtual QgsPolygon *surfaceToPolygon() const /Factory/;

virtual QgsAbstractGeometry *boundary() const /Factory/;

@@ -81,13 +81,13 @@ class QgsCurvePolygon: QgsSurface
:rtype: QgsCurve
%End

virtual QgsPolygonV2 *toPolygon( double tolerance = M_PI_2 / 90, SegmentationToleranceType toleranceType = MaximumAngle ) const /Factory/;
virtual QgsPolygon *toPolygon( double tolerance = M_PI_2 / 90, SegmentationToleranceType toleranceType = MaximumAngle ) const /Factory/;
%Docstring
Returns a new polygon geometry corresponding to a segmentized approximation
of the curve.
\param tolerance segmentation tolerance
\param toleranceType maximum segmentation angle or maximum difference between approximation and curve*
:rtype: QgsPolygonV2
:rtype: QgsPolygon
%End

virtual void setExteriorRing( QgsCurve *ring /Transfer/ );
8 python/core/geometry/qgsellipse.sip
View file
@@ -202,11 +202,11 @@ The circumference of the ellipse using first approximation of Ramanujan.
:rtype: QgsPointSequence
%End

virtual QgsPolygonV2 *toPolygon( unsigned int segments = 36 ) const /Factory/;
virtual QgsPolygon *toPolygon( unsigned int segments = 36 ) const /Factory/;
%Docstring
Returns a segmented polygon.
\param segments Number of segments used to segment geometry.
:rtype: QgsPolygonV2
:rtype: QgsPolygon
%End

virtual QgsLineString *toLineString( unsigned int segments = 36 ) const /Factory/;
@@ -216,10 +216,10 @@ The circumference of the ellipse using first approximation of Ramanujan.
:rtype: QgsLineString
%End

virtual QgsPolygonV2 *orientedBoundingBox() const /Factory/;
virtual QgsPolygon *orientedBoundingBox() const /Factory/;
%Docstring
Returns the oriented minimal bounding box for the ellipse.
:rtype: QgsPolygonV2
:rtype: QgsPolygon
%End

virtual QgsRectangle boundingBox() const;
74 python/core/geometry/qgsgeometry.sip
View file
@@ -19,13 +19,13 @@ typedef QVector<QgsPointXY> QgsPolylineXY;

typedef QVector<QgsPoint> QgsPolyline;

typedef QVector<QVector<QgsPointXY>> QgsPolygon;
typedef QVector<QVector<QgsPointXY>> QgsPolygonXY;

typedef QVector<QgsPointXY> QgsMultiPoint;
typedef QVector<QgsPointXY> QgsMultiPointXY;

typedef QVector<QVector<QgsPointXY>> QgsMultiPolyline;
typedef QVector<QVector<QgsPointXY>> QgsMultiPolylineXY;

typedef QVector<QVector<QVector<QgsPointXY>>> QgsMultiPolygon;
typedef QVector<QVector<QVector<QgsPointXY>>> QgsMultiPolygonXY;



@@ -145,14 +145,14 @@ Copy constructor will prompt a deep copy of the object
Creates a new geometry from a WKT string
:rtype: QgsGeometry
%End
static QgsGeometry fromPoint( const QgsPointXY &point );
static QgsGeometry fromPointXY( const QgsPointXY &point );
%Docstring
Creates a new geometry from a QgsPointXY object
:rtype: QgsGeometry
%End
static QgsGeometry fromMultiPoint( const QgsMultiPoint &multipoint );
static QgsGeometry fromMultiPointXY( const QgsMultiPointXY &multipoint );
%Docstring
Creates a new geometry from a QgsMultiPoint object
Creates a new geometry from a QgsMultiPointXY object
:rtype: QgsGeometry
%End

@@ -184,17 +184,17 @@ Creates a new geometry from a QgsMultiPoint object
:rtype: QgsGeometry
%End

static QgsGeometry fromMultiPolyline( const QgsMultiPolyline &multiline );
static QgsGeometry fromMultiPolylineXY( const QgsMultiPolylineXY &multiline );
%Docstring
Creates a new geometry from a QgsMultiPolyline object
Creates a new geometry from a QgsMultiPolylineXY object
:rtype: QgsGeometry
%End
static QgsGeometry fromPolygon( const QgsPolygon &polygon );
static QgsGeometry fromPolygonXY( const QgsPolygonXY &polygon );
%Docstring
Creates a new geometry from a QgsPolygon
:rtype: QgsGeometry
%End
static QgsGeometry fromMultiPolygon( const QgsMultiPolygon &multipoly );
static QgsGeometry fromMultiPolygonXY( const QgsMultiPolygonXY &multipoly );
%Docstring
Creates a new geometry from a QgsMultiPolygon
:rtype: QgsGeometry
@@ -519,7 +519,7 @@ Returns true if WKB of the geometry is of WKBMulti* type
:rtype: OperationResult
%End

OperationResult addPart( const QList<QgsPointXY> &points, QgsWkbTypes::GeometryType geomType = QgsWkbTypes::UnknownGeometry ) /PyName=addPoints/;
OperationResult addPart( const QList<QgsPointXY> &points, QgsWkbTypes::GeometryType geomType = QgsWkbTypes::UnknownGeometry ) /PyName=addPointsXY/;
%Docstring
Adds a new part to a the geometry.
\param points points describing part to add
@@ -528,7 +528,7 @@ Returns true if WKB of the geometry is of WKBMulti* type
:rtype: OperationResult
%End

OperationResult addPart( const QgsPointSequence &points, QgsWkbTypes::GeometryType geomType = QgsWkbTypes::UnknownGeometry ) /PyName=addPointsV2/;
OperationResult addPart( const QgsPointSequence &points, QgsWkbTypes::GeometryType geomType = QgsWkbTypes::UnknownGeometry ) /PyName=addPoints/;
%Docstring
Adds a new part to a the geometry.
\param points points describing part to add
@@ -1144,32 +1144,32 @@ Returns an extruded version of this geometry.
:rtype: QgsPolylineXY
%End

QgsPolygon asPolygon() const;
QgsPolygonXY asPolygon() const;
%Docstring
Returns contents of the geometry as a polygon
if wkbType is WKBPolygon, otherwise an empty list
:rtype: QgsPolygon
:rtype: QgsPolygonXY
%End

QgsMultiPoint asMultiPoint() const;
QgsMultiPointXY asMultiPoint() const;
%Docstring
Returns contents of the geometry as a multi point
if wkbType is WKBMultiPoint, otherwise an empty list
:rtype: QgsMultiPoint
:rtype: QgsMultiPointXY
%End

QgsMultiPolyline asMultiPolyline() const;
QgsMultiPolylineXY asMultiPolyline() const;
%Docstring
Returns contents of the geometry as a multi linestring
if wkbType is WKBMultiLineString, otherwise an empty list
:rtype: QgsMultiPolyline
:rtype: QgsMultiPolylineXY
%End

QgsMultiPolygon asMultiPolygon() const;
QgsMultiPolygonXY asMultiPolygon() const;
%Docstring
Returns contents of the geometry as a multi polygon
if wkbType is WKBMultiPolygon, otherwise an empty list
:rtype: QgsMultiPolygon
:rtype: QgsMultiPolygonXY
%End

QList<QgsGeometry> asGeometryCollection() const;
@@ -1430,20 +1430,20 @@ Returns an extruded version of this geometry.
:rtype: QgsPolylineXY
%End

static QgsPolygon createPolygonFromQPolygonF( const QPolygonF &polygon ) /Factory/;
static QgsPolygonXY createPolygonFromQPolygonF( const QPolygonF &polygon ) /Factory/;
%Docstring
Creates a QgsPolygon from a QPolygonF.
Creates a QgsPolygonXYfrom a QPolygonF.
\param polygon source polygon
:return: QgsPolygon
.. seealso:: createPolylineFromQPolygonF
:rtype: QgsPolygon
:rtype: QgsPolygonXY
%End


static bool compare( PyObject *obj1, PyObject *obj2, double epsilon = 4 * DBL_EPSILON );
%Docstring
Compares two geometry objects for equality within a specified tolerance.
The objects can be of type QgsPolylineXY, QgsPolygon or QgsMultiPolygon.
The objects can be of type QgsPolylineXY, QgsPolygonXYor QgsMultiPolygon.
The 2 types should match.
\param p1 first geometry object
\param p2 second geometry object
@@ -1507,10 +1507,10 @@ Returns an extruded version of this geometry.
sipCanConvertToType( a0, sipType_QVector_0600QVector_0100QgsPointXY, SIP_NOT_NONE ) &&
sipCanConvertToType( a1, sipType_QVector_0600QVector_0100QgsPointXY, SIP_NOT_NONE ) )
{
QgsPolygon *p0;
QgsPolygon *p1;
p0 = reinterpret_cast<QgsPolygon *>( sipConvertToType( a0, sipType_QVector_0600QVector_0100QgsPointXY, 0, SIP_NOT_NONE, &state0, &sipIsErr ) );
p1 = reinterpret_cast<QgsPolygon *>( sipConvertToType( a1, sipType_QVector_0600QVector_0100QgsPointXY, 0, SIP_NOT_NONE, &state1, &sipIsErr ) );
QgsPolygonXY *p0;
QgsPolygonXY *p1;
p0 = reinterpret_cast<QgsPolygonXY *>( sipConvertToType( a0, sipType_QVector_0600QVector_0100QgsPointXY, 0, SIP_NOT_NONE, &state0, &sipIsErr ) );
p1 = reinterpret_cast<QgsPolygonXY *>( sipConvertToType( a1, sipType_QVector_0600QVector_0100QgsPointXY, 0, SIP_NOT_NONE, &state1, &sipIsErr ) );
if ( sipIsErr )
{
sipReleaseType( p0, sipType_QVector_0600QVector_0100QgsPointXY, state0 );
@@ -1534,10 +1534,10 @@ Returns an extruded version of this geometry.
sipCanConvertToType( a0, sipType_QVector_0600QVector_0600QVector_0100QgsPointXY, SIP_NOT_NONE ) &&
sipCanConvertToType( a1, sipType_QVector_0600QVector_0600QVector_0100QgsPointXY, SIP_NOT_NONE ) )
{
QgsMultiPolygon *p0;
QgsMultiPolygon *p1;
p0 = reinterpret_cast<QgsMultiPolygon *>( sipConvertToType( a0, sipType_QVector_0600QVector_0600QVector_0100QgsPointXY, 0, SIP_NOT_NONE, &state0, &sipIsErr ) );
p1 = reinterpret_cast<QgsMultiPolygon *>( sipConvertToType( a1, sipType_QVector_0600QVector_0600QVector_0100QgsPointXY, 0, SIP_NOT_NONE, &state1, &sipIsErr ) );
QgsMultiPolygonXY *p0;
QgsMultiPolygonXY *p1;
p0 = reinterpret_cast<QgsMultiPolygonXY *>( sipConvertToType( a0, sipType_QVector_0600QVector_0600QVector_0100QgsPointXY, 0, SIP_NOT_NONE, &state0, &sipIsErr ) );
p1 = reinterpret_cast<QgsMultiPolygonXY *>( sipConvertToType( a1, sipType_QVector_0600QVector_0600QVector_0100QgsPointXY, 0, SIP_NOT_NONE, &state1, &sipIsErr ) );
if ( sipIsErr )
{
sipReleaseType( p0, sipType_QVector_0600QVector_0600QVector_0100QgsPointXY, state0 );
@@ -1581,16 +1581,16 @@ Returns an extruded version of this geometry.

static void convertPointList( const QList<QgsPointXY> &input, QgsPointSequence &output );
%Docstring
Upgrades a point list from QgsPointXY to QgsPointV2
Upgrades a point list from QgsPointXY to QgsPoint
\param input list of QgsPointXY objects to be upgraded
\param output destination for list of points converted to QgsPointV2
\param output destination for list of points converted to QgsPoint
%End

static void convertPointList( const QgsPointSequence &input, QList<QgsPointXY> &output );
%Docstring
Downgrades a point list from QgsPoint to QgsPoint
Downgrades a point list from QgsPoint to QgsPointXY
\param input list of QgsPoint objects to be downgraded
\param output destination for list of points converted to QgsPoint
\param output destination for list of points converted to QgsPointXY
%End

operator QVariant() const;

0 comments on commit 1d21072

Please sign in to comment.