sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-11-22 00:14:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Rename QgsPointV2 to QgsPoint and QgsPoint to QgsPointXY

Browse Source 
Because 3D coordinates should be the default.

References https://github.com/qgis/qgis3.0_api/issues/36
This commit is contained in:
Matthias Kuhn 2017-06-01 12:18:43 +02:00
parent 164e4640da
commit a9d7630a69
498 changed files with 5336 additions and 5336 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
python/analysis/network/qgsgraph.sip
View File

@ -71,7 +71,7 @@ class QgsGraphVertex
%End
QgsGraphVertex( const QgsPoint &point );
QgsGraphVertex( const QgsPointXY &point );
%Docstring
This constructor initializes QgsGraphVertex object and associates a vertex with a point
%End
@ -88,10 +88,10 @@ class QgsGraphVertex
:rtype: QgsGraphEdgeIds
%End
QgsPoint point() const;
QgsPointXY point() const;
%Docstring
Returns point associated with graph vertex
:rtype: QgsPoint
:rtype: QgsPointXY
%End
};
@ -110,7 +110,7 @@ class QgsGraph
QgsGraph();
int addVertex( const QgsPoint &pt );
int addVertex( const QgsPointXY &pt );
%Docstring
Add a vertex to the graph
:rtype: int
@ -146,7 +146,7 @@ class QgsGraph
:rtype: QgsGraphEdge
%End
int findVertex( const QgsPoint &pt ) const;
int findVertex( const QgsPointXY &pt ) const;
%Docstring
Find vertex by associated point
:return: vertex index

4
python/analysis/network/qgsgraphbuilder.sip
View File

@ -29,12 +29,12 @@ class QgsGraphBuilder : QgsGraphBuilderInterface
~QgsGraphBuilder();
virtual void addVertex( int id, const QgsPoint &pt );
virtual void addVertex( int id, const QgsPointXY &pt );
%Docstring
MANDATORY BUILDER PROPERTY DECLARATION
%End
virtual void addEdge( int pt1id, const QgsPoint &pt1, int pt2id, const QgsPoint &pt2, const QVector< QVariant > &prop );
virtual void addEdge( int pt1id, const QgsPointXY &pt1, int pt2id, const QgsPointXY &pt2, const QVector< QVariant > &prop );
QgsGraph *graph() /Factory/;
%Docstring

4
python/analysis/network/qgsgraphbuilderinterface.sip
View File

@ -67,7 +67,7 @@ Returns measurement tool
:rtype: QgsDistanceArea
%End
virtual void addVertex( int id, const QgsPoint &pt );
virtual void addVertex( int id, const QgsPointXY &pt );
%Docstring
Add vertex to the graph
\param id vertex identifier
@ -77,7 +77,7 @@ Returns measurement tool
id and pt are redundant. You can use pt or id to identify the vertex
%End
virtual void addEdge( int pt1id, const QgsPoint &pt1, int pt2id, const QgsPoint &pt2, const QVector< QVariant > &strategies );
virtual void addEdge( int pt1id, const QgsPointXY &pt1, int pt2id, const QgsPointXY &pt2, const QVector< QVariant > &strategies );
%Docstring
Add edge to the graph
\param pt1id first vertex identificator

6
python/analysis/network/qgsgraphdirector.sip
View File

@ -46,8 +46,8 @@ Emitted to report information about graph building
virtual ~QgsGraphDirector();
virtual void makeGraph( QgsGraphBuilderInterface *builder,
const QVector< QgsPoint > &additionalPoints,
QVector< QgsPoint > &snappedPoints /Out/ ) const;
const QVector< QgsPointXY > &additionalPoints,
QVector< QgsPointXY > &snappedPoints /Out/ ) const;
%Docstring
Make a graph using QgsGraphBuilder
@ -56,7 +56,7 @@ Emitted to report information about graph building
\param snappedPoints list of snapped points
.. note::
if snappedPoints[i] == QgsPoint(0.0,0.0) then snapping failed.
if snappedPoints[i] == QgsPointXY(0.0,0.0) then snapping failed.
%End
void addStrategy( QgsNetworkStrategy *prop /Transfer/ );

4
python/analysis/network/qgsvectorlayerdirector.sip
View File

@ -50,8 +50,8 @@ class QgsVectorLayerDirector : QgsGraphDirector
virtual ~QgsVectorLayerDirector();
virtual void makeGraph( QgsGraphBuilderInterface *builder,
const QVector< QgsPoint > &additionalPoints,
QVector< QgsPoint> &snappedPoints /Out/ ) const;
const QVector< QgsPointXY > &additionalPoints,
QVector< QgsPointXY> &snappedPoints /Out/ ) const;
%Docstring
MANDATORY DIRECTOR PROPERTY DECLARATION
%End

6
python/analysis/openstreetmap/qgsosmbase.sip
View File

@ -69,11 +69,11 @@ point features or be used to define the path of a way.
%End
public:
QgsOSMNode();
QgsOSMNode( QgsOSMId id, const QgsPoint &point );
QgsOSMNode( QgsOSMId id, const QgsPointXY &point );
QgsPoint point() const;
QgsPointXY point() const;
%Docstring
:rtype: QgsPoint
:rtype: QgsPointXY
%End
};

6
python/core/annotations/qgsannotation.sip
View File

@ -86,17 +86,17 @@ class QgsAnnotation : QObject
.. seealso:: hasFixedMapPosition()
%End
QgsPoint mapPosition() const;
QgsPointXY mapPosition() const;
%Docstring
Returns the map position of the annotation, if it is attached to a fixed map
position.
.. seealso:: setMapPosition()
.. seealso:: hasFixedMapPosition()
.. seealso:: mapPositionCrs()
:rtype: QgsPoint
:rtype: QgsPointXY
%End
void setMapPosition( const QgsPoint &position );
void setMapPosition( const QgsPointXY &position );
%Docstring
Sets the map position of the annotation, if it is attached to a fixed map
position.

32
python/core/conversions.sip
View File

@ -41,7 +41,7 @@ template <TYPE>
if ((l = PyList_New(sipCpp->size())) == NULL)
return NULL;
const sipMappedType *qvector_qgspoint = sipFindMappedType("QVector<QgsPoint>");
const sipMappedType *qvector_qgspoint = sipFindMappedType("QVector<QgsPointXY>");
// Set the list elements.
for (int i = 0; i < sipCpp->size(); ++i)
@ -62,7 +62,7 @@ template <TYPE>
%End
%ConvertToTypeCode
const sipMappedType *qvector_qgspoint = sipFindMappedType("QVector<QgsPoint>");
const sipMappedType *qvector_qgspoint = sipFindMappedType("QVector<QgsPointXY>");
// Check the type if that is all that is required.
if (sipIsErr == NULL)
@ -118,7 +118,7 @@ template <TYPE>
if ((l = PyList_New(sipCpp->size())) == NULL)
return NULL;
const sipMappedType *qvector_qgspoint = sipFindMappedType("QVector<QVector<QgsPoint> >");
const sipMappedType *qvector_qgspoint = sipFindMappedType("QVector<QVector<QgsPointXY> >");
// Set the list elements.
for (int i = 0; i < sipCpp->size(); ++i)
@ -139,7 +139,7 @@ template <TYPE>
%ConvertToTypeCode
const sipMappedType *qvector_qgspoint = sipFindMappedType("QVector<QVector<QgsPoint> >");
const sipMappedType *qvector_qgspoint = sipFindMappedType("QVector<QVector<QgsPointXY> >");
// Check the type if that is all that is required.
if (sipIsErr == NULL)
@ -255,7 +255,7 @@ template <TYPE>
};
%MappedType QList< QList<QgsPointV2> >
%MappedType QList< QList<QgsPoint> >
{
%TypeHeaderCode
#include <QList>
@ -269,12 +269,12 @@ template <TYPE>
if ((l = PyList_New(sipCpp->size())) == NULL)
return NULL;
const sipMappedType *qlist_type = sipFindMappedType("QList<QgsPointV2>");
const sipMappedType *qlist_type = sipFindMappedType("QList<QgsPoint>");
// Set the list elements.
for (int i = 0; i < sipCpp->size(); ++i)
{
QList<QgsPointV2> *t = new QList<QgsPointV2>(sipCpp->at(i));
QList<QgsPoint> *t = new QList<QgsPoint>(sipCpp->at(i));
PyObject *tobj;
if ((tobj = sipConvertFromMappedType(t, qlist_type, sipTransferObj)) == NULL)
@ -290,7 +290,7 @@ template <TYPE>
%End
%ConvertToTypeCode
const sipMappedType *qlist_type = sipFindMappedType("QList<QgsPointV2>");
const sipMappedType *qlist_type = sipFindMappedType("QList<QgsPoint>");
// Check the type if that is all that is required.
if (sipIsErr == NULL)
@ -306,13 +306,13 @@ template <TYPE>
}
QList< QList<QgsPointV2> > *ql = new QList< QList<QgsPointV2> >;
QList< QList<QgsPoint> > *ql = new QList< QList<QgsPoint> >;
for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
{
int state;
//TYPE *t = reinterpret_cast<TYPE *>(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
QList<QgsPointV2> *t = reinterpret_cast< QList<QgsPointV2> * >(sipConvertToMappedType(PyList_GET_ITEM(sipPy, i), qlist_type, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
QList<QgsPoint> *t = reinterpret_cast< QList<QgsPoint> * >(sipConvertToMappedType(PyList_GET_ITEM(sipPy, i), qlist_type, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
if (*sipIsErr)
{
@ -329,7 +329,7 @@ template <TYPE>
%End
};
%MappedType QList< QList< QList<QgsPointV2> > >
%MappedType QList< QList< QList<QgsPoint> > >
{
%TypeHeaderCode
#include <QList>
@ -342,7 +342,7 @@ template <TYPE>
{
return NULL;
}
const sipMappedType *qlist_type = sipFindMappedType("QList<QList<QgsPointV2> >");
const sipMappedType *qlist_type = sipFindMappedType("QList<QList<QgsPoint> >");
if(!qlist_type )
{
Py_DECREF(l); return NULL;
@ -350,7 +350,7 @@ template <TYPE>
for (int i = 0; i < sipCpp->size(); ++i)
{
QList< QList<QgsPointV2> > *t = new QList<QList<QgsPointV2> >(sipCpp->at(i));
QList< QList<QgsPoint> > *t = new QList<QList<QgsPoint> >(sipCpp->at(i));
PyObject *tobj;
if ((tobj = sipConvertFromMappedType(t, qlist_type, sipTransferObj)) == NULL)
{
@ -363,16 +363,16 @@ template <TYPE>
return l;
%End
%ConvertToTypeCode
const sipMappedType *qlist_type = sipFindMappedType("QList<QList<QgsPointV2> >");
const sipMappedType *qlist_type = sipFindMappedType("QList<QList<QgsPoint> >");
if (sipIsErr == NULL)
{
return 0;
}
QList< QList< QList<QgsPointV2> > > *ql = new QList< QList< QList<QgsPointV2> > >();
QList< QList< QList<QgsPoint> > > *ql = new QList< QList< QList<QgsPoint> > >();
for( int i = 0;i < PyList_GET_SIZE(sipPy); ++i)
{
int state;
QList<QList<QgsPointV2> > *t = reinterpret_cast< QList< QList<QgsPointV2> > * >(sipConvertToMappedType(PyList_GET_ITEM(sipPy, i), qlist_type, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
QList<QList<QgsPoint> > *t = reinterpret_cast< QList< QList<QgsPoint> > * >(sipConvertToMappedType(PyList_GET_ITEM(sipPy, i), qlist_type, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
if( *sipIsErr )
{
sipReleaseMappedType(t, qlist_type, state);

14
python/core/dxf/qgsdxfexport.sip
View File

@ -174,7 +174,7 @@ class QgsDxfExport
* @note available in python bindings as writeGroupPointV2
* @note added in 2.15
*/
void writeGroup( int code, const QgsPointV2 &p ) /PyName=writeGroupPointV2/;
void writeGroup( int code, const QgsPoint &p ) /PyName=writeGroupPointV2/;
/**
* Write a group code with color value
@ -243,32 +243,32 @@ class QgsDxfExport
//! Write line (as a polyline)
//! @note added in 2.15
void writeLine( const QgsPointV2 &pt1, const QgsPointV2 &pt2, const QString &layer, const QString &lineStyleName, const QColor &color, double width = -1 );
void writeLine( const QgsPoint &pt1, const QgsPoint &pt2, const QString &layer, const QString &lineStyleName, const QColor &color, double width = -1 );
//! Write point
//! @note available in Python bindings as writePointV2
//! @note added in 2.15
void writePoint( const QString &layer, const QColor &color, const QgsPointV2 &pt ) /PyName=writePointV2/;
void writePoint( const QString &layer, const QColor &color, const QgsPoint &pt ) /PyName=writePointV2/;
//! Write filled circle (as hatch)
//! @note available in Python bindings as writePointV2
//! @note added in 2.15
void writeFilledCircle( const QString &layer, const QColor &color, const QgsPointV2 &pt, double radius ) /PyName=writeFillCircleV2/;
void writeFilledCircle( const QString &layer, const QColor &color, const QgsPoint &pt, double radius ) /PyName=writeFillCircleV2/;
//! Write circle (as polyline)
//! @note available in Python bindings as writeCircleV2
//! @note added in 2.15
void writeCircle( const QString &layer, const QColor &color, const QgsPointV2 &pt, double radius, const QString &lineStyleName, double width ) /PyName=writeCircleV2/;
void writeCircle( const QString &layer, const QColor &color, const QgsPoint &pt, double radius, const QString &lineStyleName, double width ) /PyName=writeCircleV2/;
//! Write text (TEXT)
//! @note available in Python bindings as writeTextV2
//! @note added in 2.15
void writeText( const QString &layer, const QString &text, const QgsPointV2 &pt, double size, double angle, const QColor &color ) /PyName=writeTextV2/;
void writeText( const QString &layer, const QString &text, const QgsPoint &pt, double size, double angle, const QColor &color ) /PyName=writeTextV2/;
//! Write mtext (MTEXT)
//! @note available in Python bindings as writeMTextV2
//! @note added in 2.15
void writeMText( const QString &layer, const QString &text, const QgsPointV2 &pt, double width, double angle, const QColor &color );
void writeMText( const QString &layer, const QString &text, const QgsPoint &pt, double width, double angle, const QColor &color );
//! Calculates a scaling factor to convert from map units to a specified symbol unit.
static double mapUnitScaleFactor( double scaleDenominator, QgsUnitTypes::RenderUnit symbolUnits, QgsUnitTypes::DistanceUnit mapUnits );

26
python/core/geometry/qgsabstractgeometry.sip
View File

@ -10,9 +10,9 @@
typedef QList< QgsPointV2 > QgsPointSequence;
typedef QList< QList< QgsPointV2 > > QgsRingSequence;
typedef QList< QList< QList< QgsPointV2 > > > QgsCoordinateSequence;
typedef QList< QgsPoint > QgsPointSequence;
typedef QList< QList< QgsPoint > > QgsRingSequence;
typedef QList< QList< QList< QgsPoint > > > QgsCoordinateSequence;
class QgsAbstractGeometry
{
@ -26,8 +26,8 @@ class QgsAbstractGeometry
%End
%ConvertToSubClassCode
if ( dynamic_cast<QgsPointV2 *>( sipCpp ) != NULL )
sipType = sipType_QgsPointV2;
if ( dynamic_cast<QgsPoint *>( sipCpp ) != NULL )
sipType = sipType_QgsPoint;
else if ( dynamic_cast<QgsLineString *>( sipCpp ) != NULL )
sipType = sipType_QgsLineString;
else if ( dynamic_cast<QgsCircularString *>( sipCpp ) != NULL )
@ -242,7 +242,7 @@ class QgsAbstractGeometry
\param p destination QPainter
%End
virtual bool nextVertex( QgsVertexId &id, QgsPointV2 &vertex /Out/ ) const = 0;
virtual bool nextVertex( QgsVertexId &id, QgsPoint &vertex /Out/ ) const = 0;
%Docstring
Returns next vertex id and coordinates
\param id initial value should be the starting vertex id. The next vertex id will be stored
@ -265,13 +265,13 @@ class QgsAbstractGeometry
:rtype: int
%End
virtual QgsPointV2 vertexAt( QgsVertexId id ) const = 0;
virtual QgsPoint vertexAt( QgsVertexId id ) const = 0;
%Docstring
Returns the point corresponding to a specified vertex id
:rtype: QgsPointV2
:rtype: QgsPoint
%End
virtual double closestSegment( const QgsPointV2 &pt, QgsPointV2 &segmentPt /Out/,
virtual double closestSegment( const QgsPoint &pt, QgsPoint &segmentPt /Out/,
QgsVertexId &vertexAfter /Out/,
bool *leftOf /Out/, double epsilon ) const = 0;
%Docstring
@ -287,7 +287,7 @@ class QgsAbstractGeometry
%End
virtual bool insertVertex( QgsVertexId position, const QgsPointV2 &vertex ) = 0;
virtual bool insertVertex( QgsVertexId position, const QgsPoint &vertex ) = 0;
%Docstring
Inserts a vertex into the geometry
\param position vertex id for position of inserted vertex
@ -298,7 +298,7 @@ class QgsAbstractGeometry
:rtype: bool
%End
virtual bool moveVertex( QgsVertexId position, const QgsPointV2 &newPos ) = 0;
virtual bool moveVertex( QgsVertexId position, const QgsPoint &newPos ) = 0;
%Docstring
Moves a vertex within the geometry
\param position vertex id for vertex to move
@ -343,10 +343,10 @@ class QgsAbstractGeometry
:rtype: float
%End
virtual QgsPointV2 centroid() const;
virtual QgsPoint centroid() const;
%Docstring
Returns the centroid of the geometry
:rtype: QgsPointV2
:rtype: QgsPoint
%End
virtual bool isEmpty() const;

4
python/core/geometry/qgsbox3d.sip
View File

@ -31,7 +31,7 @@ class QgsBox3d
Constructor for QgsBox3D which accepts the ranges of x/y/z coordinates.
%End
QgsBox3d( const QgsPointV2 &p1, const QgsPointV2 &p2 );
QgsBox3d( const QgsPoint &p1, const QgsPoint &p2 );
%Docstring
Constructs a QgsBox3D from two points representing opposite corners of the box.
The box is normalized after construction.
@ -187,7 +187,7 @@ class QgsBox3d
:rtype: bool
%End
bool contains( const QgsPointV2 &point ) const;
bool contains( const QgsPoint &point ) const;
%Docstring
Returns true when box contains a ``point``.

22
python/core/geometry/qgscircle.sip
View File

@ -29,7 +29,7 @@ class QgsCircle : QgsEllipse
public:
QgsCircle();
QgsCircle( const QgsPointV2 &center, double radius, double azimuth = 0 );
QgsCircle( const QgsPoint &center, double radius, double azimuth = 0 );
%Docstring
Constructs a circle by defining all the members.
\param center The center of the circle.
@ -37,7 +37,7 @@ class QgsCircle : QgsEllipse
\param azimuth Angle in degrees started from the North to the first quadrant.
%End
static QgsCircle from2Points( const QgsPointV2 &pt1, const QgsPointV2 &pt2 );
static QgsCircle from2Points( const QgsPoint &pt1, const QgsPoint &pt2 );
%Docstring
Constructs a circle by 2 points on the circle.
The center point can have z and m values which are the result from the midpoint operation between ``pt1`` and ``pt2``.
@ -48,7 +48,7 @@ class QgsCircle : QgsEllipse
:rtype: QgsCircle
%End
static QgsCircle from3Points( const QgsPointV2 &pt1, const QgsPointV2 &pt2, const QgsPointV2 &pt3, double epsilon = 1E-8 );
static QgsCircle from3Points( const QgsPoint &pt1, const QgsPoint &pt2, const QgsPoint &pt3, double epsilon = 1E-8 );
%Docstring
Constructs a circle by 3 points on the circle.
Z and m values are dropped for the center point.
@ -61,7 +61,7 @@ class QgsCircle : QgsEllipse
:rtype: QgsCircle
%End
static QgsCircle fromCenterDiameter( const QgsPointV2 &center, double diameter, double azimuth = 0 );
static QgsCircle fromCenterDiameter( const QgsPoint &center, double diameter, double azimuth = 0 );
%Docstring
Constructs a circle by a center point and a diameter.
The center point keeps z and m values from ``center``.
@ -72,7 +72,7 @@ class QgsCircle : QgsEllipse
%End
static QgsCircle fromCenterPoint( const QgsPointV2 &center, const QgsPointV2 &pt1 );
static QgsCircle fromCenterPoint( const QgsPoint &center, const QgsPoint &pt1 );
%Docstring
Constructs a circle by a center point and another point.
The center point keeps z and m values from ``center``.
@ -84,9 +84,9 @@ class QgsCircle : QgsEllipse
%End
static QgsCircle from3Tangents( const QgsPointV2 &pt1_tg1, const QgsPointV2 &pt2_tg1,
const QgsPointV2 &pt1_tg2, const QgsPointV2 &pt2_tg2,
const QgsPointV2 &pt1_tg3, const QgsPointV2 &pt2_tg3, double epsilon = 1E-8 );
static QgsCircle from3Tangents( const QgsPoint &pt1_tg1, const QgsPoint &pt2_tg1,
const QgsPoint &pt1_tg2, const QgsPoint &pt2_tg2,
const QgsPoint &pt1_tg3, const QgsPoint &pt2_tg3, double epsilon = 1E-8 );
%Docstring
Constructs a circle by 3 tangents on the circle (aka inscribed circle of a triangle).
Z and m values are dropped for the center point.
@ -101,7 +101,7 @@ class QgsCircle : QgsEllipse
:rtype: QgsCircle
%End
static QgsCircle fromExtent( const QgsPointV2 &pt1, const QgsPointV2 &pt2 );
static QgsCircle fromExtent( const QgsPoint &pt1, const QgsPoint &pt2 );
%Docstring
Constructs a circle by an extent (aka bounding box / QgsRectangle).
The center point can have z and m values which are the result from the midpoint operation between ``pt1`` and ``pt2``.
@ -143,13 +143,13 @@ Returns the radius of the circle
Set the radius of the circle
%End
QVector<QgsPointV2> northQuadrant() const /Factory/;
QVector<QgsPoint> northQuadrant() const /Factory/;
%Docstring
The four quadrants of the ellipse.
They are oriented and started from North.
:return: quadrants defined by four points.
.. seealso:: quadrant()
:rtype: list of QgsPointV2
:rtype: list of QgsPoint
%End
QgsCircularString *toCircularString( bool oriented = false ) const;

16
python/core/geometry/qgscircularstring.sip
View File

@ -51,10 +51,10 @@ class QgsCircularString: QgsCurve
virtual int numPoints() const;
QgsPointV2 pointN( int i ) const;
QgsPoint pointN( int i ) const;
%Docstring
Returns the point at index i within the circular string.
:rtype: QgsPointV2
:rtype: QgsPoint
%End
virtual void points( QgsPointSequence &pts /Out/ ) const;
@ -66,8 +66,8 @@ class QgsCircularString: QgsCurve
%End
virtual double length() const;
virtual QgsPointV2 startPoint() const;
virtual QgsPointV2 endPoint() const;
virtual QgsPoint startPoint() const;
virtual QgsPoint endPoint() const;
virtual QgsLineString *curveToLine( double tolerance = M_PI_2 / 90, SegmentationToleranceType toleranceType = MaximumAngle ) const /Factory/;
%Docstring
@ -90,15 +90,15 @@ class QgsCircularString: QgsCurve
virtual void drawAsPolygon( QPainter &p ) const;
virtual bool insertVertex( QgsVertexId position, const QgsPointV2 &vertex );
virtual bool moveVertex( QgsVertexId position, const QgsPointV2 &newPos );
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 QgsPointV2 &pt, QgsPointV2 &segmentPt /Out/,
virtual double closestSegment( const QgsPoint &pt, QgsPoint &segmentPt /Out/,
QgsVertexId &vertexAfter /Out/,
bool *leftOf /Out/, double epsilon ) const;
virtual bool pointAt( int node, QgsPointV2 &point, QgsVertexId::VertexType &type ) const;
virtual bool pointAt( int node, QgsPoint &point, QgsVertexId::VertexType &type ) const;
virtual void sumUpArea( double &sum /Out/ ) const;

14
python/core/geometry/qgscompoundcurve.sip
View File

@ -47,8 +47,8 @@ class QgsCompoundCurve: QgsCurve
virtual double length() const;
virtual QgsPointV2 startPoint() const;
virtual QgsPointV2 endPoint() const;
virtual QgsPoint startPoint() const;
virtual QgsPoint endPoint() const;
virtual void points( QgsPointSequence &pts /Out/ ) const;
virtual int numPoints() const;
virtual bool isEmpty() const;
@ -86,7 +86,7 @@ class QgsCompoundCurve: QgsCurve
\param i index of curve to remove
%End
void addVertex( const QgsPointV2 &pt );
void addVertex( const QgsPoint &pt );
%Docstring
Adds a vertex to the end of the geometry.
%End
@ -102,15 +102,15 @@ class QgsCompoundCurve: QgsCurve
virtual void drawAsPolygon( QPainter &p ) const;
virtual bool insertVertex( QgsVertexId position, const QgsPointV2 &vertex );
virtual bool moveVertex( QgsVertexId position, const QgsPointV2 &newPos );
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 QgsPointV2 &pt, QgsPointV2 &segmentPt /Out/,
virtual double closestSegment( const QgsPoint &pt, QgsPoint &segmentPt /Out/,
QgsVertexId &vertexAfter /Out/, bool *leftOf /Out/,
double epsilon ) const;
virtual bool pointAt( int node, QgsPointV2 &point, QgsVertexId::VertexType &type ) const;
virtual bool pointAt( int node, QgsPoint &point, QgsVertexId::VertexType &type ) const;
virtual void sumUpArea( double &sum /Out/ ) const;

14
python/core/geometry/qgscurve.sip
View File

@ -31,18 +31,18 @@ class QgsCurve: QgsAbstractGeometry
virtual QgsCurve *clone() const = 0 /Factory/;
virtual QgsPointV2 startPoint() const = 0;
virtual QgsPoint startPoint() const = 0;
%Docstring
Returns the starting point of the curve.
.. seealso:: endPoint
:rtype: QgsPointV2
:rtype: QgsPoint
%End
virtual QgsPointV2 endPoint() const = 0;
virtual QgsPoint endPoint() const = 0;
%Docstring
Returns the end point of the curve.
.. seealso:: startPoint
:rtype: QgsPointV2
:rtype: QgsPoint
%End
virtual bool isClosed() const;
@ -94,9 +94,9 @@ class QgsCurve: QgsAbstractGeometry
%End
virtual QgsCoordinateSequence coordinateSequence() const;
virtual bool nextVertex( QgsVertexId &id, QgsPointV2 &vertex /Out/ ) const;
virtual bool nextVertex( QgsVertexId &id, QgsPoint &vertex /Out/ ) const;
virtual bool pointAt( int node, QgsPointV2 &point /Out/, QgsVertexId::VertexType &type /Out/ ) const = 0;
virtual bool pointAt( int node, QgsPoint &point /Out/, QgsVertexId::VertexType &type /Out/ ) const = 0;
%Docstring
Returns the point and vertex id of a point within the curve.
\param node node number, where the first node is 0
@ -127,7 +127,7 @@ class QgsCurve: QgsAbstractGeometry
virtual int vertexCount( int part = 0, int ring = 0 ) const;
virtual int ringCount( int part = 0 ) const;
virtual int partCount() const;
virtual QgsPointV2 vertexAt( QgsVertexId id ) const;
virtual QgsPoint vertexAt( QgsVertexId id ) const;
virtual QgsRectangle boundingBox() const;

10
python/core/geometry/qgscurvepolygon.sip
View File

@ -116,19 +116,19 @@ Adds an interior ring to the geometry (takes ownership)
virtual void transform( const QTransform &t );
virtual bool insertVertex( QgsVertexId position, const QgsPointV2 &vertex );
virtual bool moveVertex( QgsVertexId position, const QgsPointV2 &newPos );
virtual bool insertVertex( QgsVertexId position, const QgsPoint &vertex );
virtual bool moveVertex( QgsVertexId position, const QgsPoint &newPos );
virtual bool deleteVertex( QgsVertexId position );
virtual QgsCoordinateSequence coordinateSequence() const;
virtual int nCoordinates() const;
virtual bool isEmpty() const;
virtual double closestSegment( const QgsPointV2 &pt, QgsPointV2 &segmentPt /Out/,
virtual double closestSegment( const QgsPoint &pt, QgsPoint &segmentPt /Out/,
QgsVertexId &vertexAfter /Out/, bool *leftOf /Out/,
double epsilon ) const;
virtual bool nextVertex( QgsVertexId &id, QgsPointV2 &vertex /Out/ ) const;
virtual bool nextVertex( QgsVertexId &id, QgsPoint &vertex /Out/ ) const;
virtual bool hasCurvedSegments() const;
@ -155,7 +155,7 @@ Adds an interior ring to the geometry (takes ownership)
virtual int vertexCount( int /*part*/ = 0, int ring = 0 ) const;
virtual int ringCount( int /*part*/ = 0 ) const;
virtual int partCount() const;
virtual QgsPointV2 vertexAt( QgsVertexId id ) const;
virtual QgsPoint vertexAt( QgsVertexId id ) const;
virtual bool addZValue( double zValue = 0 );
virtual bool addMValue( double mValue = 0 );

24
python/core/geometry/qgsellipse.sip
View File

@ -27,7 +27,7 @@ class QgsEllipse
public:
QgsEllipse();
QgsEllipse( const QgsPointV2 &center, const double semiMajorAxis, const double semiMinorAxis, const double azimuth = 90 );
QgsEllipse( const QgsPoint &center, const double semiMajorAxis, const double semiMinorAxis, const double azimuth = 90 );
%Docstring
Constructs an ellipse by defining all the members.
\param center The center of the ellipse.
@ -36,7 +36,7 @@ class QgsEllipse
\param azimuth Angle in degrees started from the North to the first quadrant.
%End
static QgsEllipse fromFoci( const QgsPointV2 &pt1, const QgsPointV2 &pt2, const QgsPointV2 &pt3 );
static QgsEllipse fromFoci( const QgsPoint &pt1, const QgsPoint &pt2, const QgsPoint &pt3 );
%Docstring
Constructs an ellipse by foci (``pt1`` and ``pt2``) and a point ``pt3``.
The center point can have z and m values which are the result from the midpoint operation between ``pt1`` and ``pt2``.
@ -48,7 +48,7 @@ class QgsEllipse
:rtype: QgsEllipse
%End
static QgsEllipse fromExtent( const QgsPointV2 &pt1, const QgsPointV2 &pt2 );
static QgsEllipse fromExtent( const QgsPoint &pt1, const QgsPoint &pt2 );
%Docstring
Constructs an ellipse by an extent (aka bounding box / QgsRectangle).
The center point can have z and m values which are the result from the midpoint operation between ``pt1`` and ``pt2``.
@ -59,7 +59,7 @@ class QgsEllipse
:rtype: QgsEllipse
%End
static QgsEllipse fromCenterPoint( const QgsPointV2 &ptc, const QgsPointV2 &pt1 );
static QgsEllipse fromCenterPoint( const QgsPoint &ptc, const QgsPoint &pt1 );
%Docstring
Constructs an ellipse by a center point and a another point.
The center point keeps z and m values from ``ptc``.
@ -70,7 +70,7 @@ class QgsEllipse
:rtype: QgsEllipse
%End
static QgsEllipse fromCenter2Points( const QgsPointV2 &ptc, const QgsPointV2 &pt1, const QgsPointV2 &pt2 );
static QgsEllipse fromCenter2Points( const QgsPoint &ptc, const QgsPoint &pt1, const QgsPoint &pt2 );
%Docstring
Constructs an ellipse by a central point and two other points.
The center point keeps z and m values from ``ptc``.
@ -91,12 +91,12 @@ An ellipse is empty if axes are equal to 0
:rtype: bool
%End
QgsPointV2 center() const;
QgsPoint center() const;
%Docstring
Returns the center point.
.. seealso:: setCenter()
.. seealso:: rcenter()
:rtype: QgsPointV2
:rtype: QgsPoint
%End
double semiMajorAxis() const;
@ -121,7 +121,7 @@ An ellipse is empty if axes are equal to 0
%End
void setCenter( const QgsPointV2 &center );
void setCenter( const QgsPoint &center );
%Docstring
Sets the center point.
.. seealso:: center()
@ -155,13 +155,13 @@ An ellipse is empty if axes are equal to 0
:rtype: float
%End
virtual QVector<QgsPointV2> foci() const;
virtual QVector<QgsPoint> foci() const;
%Docstring
Two foci of the ellipse. The axes are oriented by the azimuth and are on the semi-major axis.
.. seealso:: fromFoci()
.. seealso:: focusDistance()
:return: the two foci.
:rtype: list of QgsPointV2
:rtype: list of QgsPoint
%End
virtual double eccentricity() const;
@ -181,12 +181,12 @@ The circumference of the ellipse using first approximation of Ramanujan.
:rtype: float
%End
virtual QVector<QgsPointV2> quadrant() const;
virtual QVector<QgsPoint> quadrant() const;
%Docstring
The four quadrants of the ellipse.
They are oriented and started always from semi-major axis.
:return: quadrants defined by four points.
:rtype: list of QgsPointV2
:rtype: list of QgsPoint
%End
virtual QgsPointSequence points( unsigned int segments = 36 ) const;

118
python/core/geometry/qgsgeometry.sip
View File

@ -15,15 +15,15 @@
typedef QVector<QgsPoint> QgsPolyline;
typedef QVector<QgsPointXY> QgsPolyline;
typedef QVector<QVector<QgsPoint>> QgsPolygon;
typedef QVector<QVector<QgsPointXY>> QgsPolygon;
typedef QVector<QgsPoint> QgsMultiPoint;
typedef QVector<QgsPointXY> QgsMultiPoint;
typedef QVector<QVector<QgsPoint>> QgsMultiPolyline;
typedef QVector<QVector<QgsPointXY>> QgsMultiPolyline;
typedef QVector<QVector<QVector<QgsPoint>>> QgsMultiPolygon;
typedef QVector<QVector<QVector<QgsPointXY>>> QgsMultiPolygon;
@ -95,9 +95,9 @@ 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 QgsPoint &point );
static QgsGeometry fromPoint( const QgsPointXY &point );
%Docstring
Creates a new geometry from a QgsPoint object
Creates a new geometry from a QgsPointXY object
:rtype: QgsGeometry
%End
static QgsGeometry fromMultiPoint( const QgsMultiPoint &multipoint );
@ -224,9 +224,9 @@ Returns true if WKB of the geometry is of WKBMulti* type
:rtype: float
%End
QgsPoint closestVertex( const QgsPoint &point, int &atVertex /Out/, int &beforeVertex /Out/, int &afterVertex /Out/, double &sqrDist /Out/ ) const;
QgsPointXY closestVertex( const QgsPointXY &point, int &atVertex /Out/, int &beforeVertex /Out/, int &afterVertex /Out/, double &sqrDist /Out/ ) const;
%Docstring
:rtype: QgsPoint
:rtype: QgsPointXY
%End
double distanceToVertex( int vertex ) const;
@ -277,7 +277,7 @@ Returns true if WKB of the geometry is of WKBMulti* type
:rtype: bool
%End
bool insertVertex( const QgsPointV2 &point, int beforeVertex );
bool insertVertex( const QgsPoint &point, int beforeVertex );
%Docstring
Insert a new vertex before the given vertex index,
ring and item (first number is index 0)
@ -302,7 +302,7 @@ Returns true if WKB of the geometry is of WKBMulti* type
:rtype: bool
%End
bool moveVertex( const QgsPointV2 &p, int atVertex );
bool moveVertex( const QgsPoint &p, int atVertex );
%Docstring
Moves the vertex at the given position number
and item (first number is index 0)
@ -326,15 +326,15 @@ Returns true if WKB of the geometry is of WKBMulti* type
:rtype: bool
%End
QgsPoint vertexAt( int atVertex ) const;
QgsPointXY vertexAt( int atVertex ) const;
%Docstring
Returns coordinates of a vertex.
\param atVertex index of the vertex
:return: Coordinates of the vertex or QgsPoint(0,0) on error
:rtype: QgsPoint
:return: Coordinates of the vertex or QgsPointXY(0,0) on error
:rtype: QgsPointXY
%End
double sqrDistToVertexAt( QgsPoint &point /In/, int atVertex ) const;
double sqrDistToVertexAt( QgsPointXY &point /In/, int atVertex ) const;
%Docstring
Returns the squared cartesian distance between the given point
to the given vertex index (vertex at the given position number,
@ -358,7 +358,7 @@ Returns true if WKB of the geometry is of WKBMulti* type
:rtype: QgsGeometry
%End
double closestVertexWithContext( const QgsPoint &point, int &atVertex /Out/ ) const;
double closestVertexWithContext( const QgsPointXY &point, int &atVertex /Out/ ) const;
%Docstring
Searches for the closest vertex in this geometry to the given point.
\param point Specifiest the point for search
@ -367,7 +367,7 @@ Returns true if WKB of the geometry is of WKBMulti* type
:rtype: float
%End
double closestSegmentWithContext( const QgsPoint &point, QgsPoint &minDistPoint /Out/, int &afterVertex /Out/ ) const;
double closestSegmentWithContext( const QgsPointXY &point, QgsPointXY &minDistPoint /Out/, int &afterVertex /Out/ ) const;
%Docstring
Searches for the closest segment of geometry to the given point
\param point Specifies the point for search
@ -380,7 +380,7 @@ Returns true if WKB of the geometry is of WKBMulti* type
:rtype: float
%End
int addRing( const QList<QgsPoint> &ring );
int addRing( const QList<QgsPointXY> &ring );
%Docstring
Adds a new ring to this geometry. This makes only sense for polygon and multipolygons.
:return: 0 in case of success (ring added), 1 problem with geometry type, 2 ring not closed,
@ -396,7 +396,7 @@ Returns true if WKB of the geometry is of WKBMulti* type
:rtype: int
%End
int addPart( const QList<QgsPoint> &points, QgsWkbTypes::GeometryType geomType = QgsWkbTypes::UnknownGeometry ) /PyName=addPoints/;
int addPart( const QList<QgsPointXY> &points, QgsWkbTypes::GeometryType geomType = QgsWkbTypes::UnknownGeometry ) /PyName=addPoints/;
%Docstring
Adds a new part to a the geometry.
\param points points describing part to add
@ -470,7 +470,7 @@ not disjoint with existing polygons of the feature
:rtype: int
%End
int rotate( double rotation, const QgsPoint &center );
int rotate( double rotation, const QgsPointXY &center );
%Docstring
Rotate this geometry around the Z axis
.. versionadded:: 2.8
@ -480,15 +480,15 @@ not disjoint with existing polygons of the feature
:rtype: int
%End
int splitGeometry( const QList<QgsPoint> &splitLine,
int splitGeometry( const QList<QgsPointXY> &splitLine,
QList<QgsGeometry> &newGeometries /Out/,
bool topological,
QList<QgsPoint> &topologyTestPoints /Out/ );
QList<QgsPointXY> &topologyTestPoints /Out/ );
%Docstring
:rtype: int
%End
int reshapeGeometry( const QList<QgsPoint> &reshapeWithLine );
int reshapeGeometry( const QList<QgsPointXY> &reshapeWithLine );
%Docstring
Replaces a part of this geometry with another line
:return: 0 in case of success
@ -554,7 +554,7 @@ Test for intersection with a geometry (uses GEOS)
:rtype: bool
%End
bool contains( const QgsPoint *p ) const;
bool contains( const QgsPointXY *p ) const;
%Docstring
Test for containment of a point (uses GEOS)
:rtype: bool
@ -916,11 +916,11 @@ Returns an extruded version of this geometry.
%End
QgsPoint asPoint() const;
QgsPointXY asPoint() const;
%Docstring
Return contents of the geometry as a point
if wkbType is WKBPoint, otherwise returns [0,0]
:rtype: QgsPoint
:rtype: QgsPointXY
%End
QgsPolyline asPolyline() const;
@ -1062,14 +1062,14 @@ Ring 0 is outer ring and can't be deleted.
public:
Error();
explicit Error( const QString &m );
Error( const QString &m, const QgsPoint &p );
Error( const QString &m, const QgsPointXY &p );
QString what();
%Docstring
:rtype: str
%End
QgsPoint where();
QgsPointXY where();
%Docstring
:rtype: QgsPoint
:rtype: QgsPointXY
%End
bool hasWhere();
%Docstring
@ -1231,19 +1231,19 @@ Ring 0 is outer ring and can't be deleted.
if ( o0 && o1 )
{
// compare polyline - polyline
if ( sipCanConvertToType( o0, sipType_QgsPoint, SIP_NOT_NONE ) &&
sipCanConvertToType( o1, sipType_QgsPoint, SIP_NOT_NONE ) &&
sipCanConvertToType( a0, sipType_QVector_0100QgsPoint, SIP_NOT_NONE ) &&
sipCanConvertToType( a1, sipType_QVector_0100QgsPoint, SIP_NOT_NONE ) )
if ( sipCanConvertToType( o0, sipType_QgsPointXY, SIP_NOT_NONE ) &&
sipCanConvertToType( o1, sipType_QgsPointXY, SIP_NOT_NONE ) &&
sipCanConvertToType( a0, sipType_QVector_0100QgsPointXY, SIP_NOT_NONE ) &&
sipCanConvertToType( a1, sipType_QVector_0100QgsPointXY, SIP_NOT_NONE ) )
{
QgsPolyline *p0;
QgsPolyline *p1;
p0 = reinterpret_cast<QgsPolyline *>( sipConvertToType( a0, sipType_QVector_0100QgsPoint, 0, SIP_NOT_NONE, &state0, &sipIsErr ) );
p1 = reinterpret_cast<QgsPolyline *>( sipConvertToType( a1, sipType_QVector_0100QgsPoint, 0, SIP_NOT_NONE, &state1, &sipIsErr ) );
p0 = reinterpret_cast<QgsPolyline *>( sipConvertToType( a0, sipType_QVector_0100QgsPointXY, 0, SIP_NOT_NONE, &state0, &sipIsErr ) );
p1 = reinterpret_cast<QgsPolyline *>( sipConvertToType( a1, sipType_QVector_0100QgsPointXY, 0, SIP_NOT_NONE, &state1, &sipIsErr ) );
if ( sipIsErr )
{
sipReleaseType( p0, sipType_QVector_0100QgsPoint, state0 );
sipReleaseType( p1, sipType_QVector_0100QgsPoint, state1 );
sipReleaseType( p0, sipType_QVector_0100QgsPointXY, state0 );
sipReleaseType( p1, sipType_QVector_0100QgsPointXY, state1 );
}
else
{
@ -1258,19 +1258,19 @@ Ring 0 is outer ring and can't be deleted.
if ( oo0 && oo1 )
{
// compare polygon - polygon
if ( sipCanConvertToType( oo0, sipType_QgsPoint, SIP_NOT_NONE ) &&
sipCanConvertToType( oo1, sipType_QgsPoint, SIP_NOT_NONE ) &&
sipCanConvertToType( a0, sipType_QVector_0600QVector_0100QgsPoint, SIP_NOT_NONE ) &&
sipCanConvertToType( a1, sipType_QVector_0600QVector_0100QgsPoint, SIP_NOT_NONE ) )
if ( sipCanConvertToType( oo0, sipType_QgsPointXY, SIP_NOT_NONE ) &&
sipCanConvertToType( oo1, sipType_QgsPointXY, SIP_NOT_NONE ) &&
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_0100QgsPoint, 0, SIP_NOT_NONE, &state0, &sipIsErr ) );
p1 = reinterpret_cast<QgsPolygon *>( sipConvertToType( a1, sipType_QVector_0600QVector_0100QgsPoint, 0, SIP_NOT_NONE, &state1, &sipIsErr ) );
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 ) );
if ( sipIsErr )
{
sipReleaseType( p0, sipType_QVector_0600QVector_0100QgsPoint, state0 );
sipReleaseType( p1, sipType_QVector_0600QVector_0100QgsPoint, state1 );
sipReleaseType( p0, sipType_QVector_0600QVector_0100QgsPointXY, state0 );
sipReleaseType( p1, sipType_QVector_0600QVector_0100QgsPointXY, state1 );
}
else
{
@ -1285,19 +1285,19 @@ Ring 0 is outer ring and can't be deleted.
if ( ooo0 && ooo1 )
{
// compare multipolygon - multipolygon
if ( sipCanConvertToType( ooo0, sipType_QgsPoint, SIP_NOT_NONE ) &&
sipCanConvertToType( ooo1, sipType_QgsPoint, SIP_NOT_NONE ) &&
sipCanConvertToType( a0, sipType_QVector_0600QVector_0600QVector_0100QgsPoint, SIP_NOT_NONE ) &&
sipCanConvertToType( a1, sipType_QVector_0600QVector_0600QVector_0100QgsPoint, SIP_NOT_NONE ) )
if ( sipCanConvertToType( ooo0, sipType_QgsPointXY, SIP_NOT_NONE ) &&
sipCanConvertToType( ooo1, sipType_QgsPointXY, SIP_NOT_NONE ) &&
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_0100QgsPoint, 0, SIP_NOT_NONE, &state0, &sipIsErr ) );
p1 = reinterpret_cast<QgsMultiPolygon *>( sipConvertToType( a1, sipType_QVector_0600QVector_0600QVector_0100QgsPoint, 0, SIP_NOT_NONE, &state1, &sipIsErr ) );
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 ) );
if ( sipIsErr )
{
sipReleaseType( p0, sipType_QVector_0600QVector_0600QVector_0100QgsPoint, state0 );
sipReleaseType( p1, sipType_QVector_0600QVector_0600QVector_0100QgsPoint, state1 );
sipReleaseType( p0, sipType_QVector_0600QVector_0600QVector_0100QgsPointXY, state0 );
sipReleaseType( p1, sipType_QVector_0600QVector_0600QVector_0100QgsPointXY, state1 );
}
else
{
@ -1335,17 +1335,17 @@ Ring 0 is outer ring and can't be deleted.
:rtype: QgsGeometryEngine
%End
static void convertPointList( const QList<QgsPoint> &input, QgsPointSequence &output );
static void convertPointList( const QList<QgsPointXY> &input, QgsPointSequence &output );
%Docstring
Upgrades a point list from QgsPoint to QgsPointV2
\param input list of QgsPoint objects to be upgraded
Upgrades a point list from QgsPointXY to QgsPointV2
\param input list of QgsPointXY objects to be upgraded
\param output destination for list of points converted to QgsPointV2
%End
static void convertPointList( const QgsPointSequence &input, QList<QgsPoint> &output );
static void convertPointList( const QgsPointSequence &input, QList<QgsPointXY> &output );
%Docstring
Downgrades a point list from QgsPointV2 to QgsPoint
\param input list of QgsPointV2 objects to be downgraded
Downgrades a point list from QgsPoint to QgsPoint
\param input list of QgsPoint objects to be downgraded
\param output destination for list of points converted to QgsPoint
%End

10
python/core/geometry/qgsgeometrycollection.sip
View File

@ -96,14 +96,14 @@ Adds a geometry and takes ownership. Returns true in case of success.
virtual QgsCoordinateSequence coordinateSequence() const;
virtual int nCoordinates() const;
virtual double closestSegment( const QgsPointV2 &pt, QgsPointV2 &segmentPt /Out/,
virtual double closestSegment( const QgsPoint &pt, QgsPoint &segmentPt /Out/,
QgsVertexId &vertexAfter /Out/, bool *leftOf /Out/,
double epsilon ) const;
virtual bool nextVertex( QgsVertexId &id, QgsPointV2 &vertex /Out/ ) const;
virtual bool nextVertex( QgsVertexId &id, QgsPoint &vertex /Out/ ) const;
virtual bool insertVertex( QgsVertexId position, const QgsPointV2 &vertex );
virtual bool moveVertex( QgsVertexId position, const QgsPointV2 &newPos );
virtual bool insertVertex( QgsVertexId position, const QgsPoint &vertex );
virtual bool moveVertex( QgsVertexId position, const QgsPoint &newPos );
virtual bool deleteVertex( QgsVertexId position );
virtual double length() const;
@ -134,7 +134,7 @@ Adds a geometry and takes ownership. Returns true in case of success.
virtual int vertexCount( int part = 0, int ring = 0 ) const;
virtual int ringCount( int part = 0 ) const;
virtual int partCount() const;
virtual QgsPointV2 vertexAt( QgsVertexId id ) const;
virtual QgsPoint vertexAt( QgsVertexId id ) const;
virtual bool addZValue( double zValue = 0 );
virtual bool addMValue( double mValue = 0 );

4
python/core/geometry/qgsgeometryengine.sip
View File

@ -66,11 +66,11 @@ class QgsGeometryEngine
%Docstring
:rtype: QgsAbstractGeometry
%End
virtual bool centroid( QgsPointV2 &pt, QString *errorMsg = 0 ) const = 0;
virtual bool centroid( QgsPoint &pt, QString *errorMsg = 0 ) const = 0;
%Docstring
:rtype: bool
%End
virtual bool pointOnSurface( QgsPointV2 &pt, QString *errorMsg = 0 ) const = 0;
virtual bool pointOnSurface( QgsPoint &pt, QString *errorMsg = 0 ) const = 0;
%Docstring
:rtype: bool
%End

50
python/core/geometry/qgsgeometryutils.sip
View File

@ -30,11 +30,11 @@ class QgsGeometryUtils
:rtype: list of QgsLineString
%End
static QgsPointV2 closestVertex( const QgsAbstractGeometry &geom, const QgsPointV2 &pt, QgsVertexId &id /Out/ );
static QgsPoint closestVertex( const QgsAbstractGeometry &geom, const QgsPoint &pt, QgsVertexId &id /Out/ );
%Docstring
Returns the closest vertex to a geometry for a specified point.
On error null point will be returned and "id" argument will be invalid.
:rtype: QgsPointV2
:rtype: QgsPoint
%End
static double distanceToVertex( const QgsAbstractGeometry &geom, QgsVertexId id );
@ -71,7 +71,7 @@ class QgsGeometryUtils
Returns vertices adjacent to a specified vertex within a geometry.
%End
static double sqrDistance2D( const QgsPointV2 &pt1, const QgsPointV2 &pt2 );
static double sqrDistance2D( const QgsPoint &pt1, const QgsPoint &pt2 );
%Docstring
Returns the squared 2D distance between two points.
:rtype: float
@ -83,7 +83,7 @@ class QgsGeometryUtils
:rtype: float
%End
static bool lineIntersection( const QgsPointV2 &p1, QgsVector v, const QgsPointV2 &q1, QgsVector w, QgsPointV2 &inter /Out/ );
static bool lineIntersection( const QgsPoint &p1, QgsVector v, const QgsPoint &q1, QgsVector w, QgsPoint &inter /Out/ );
%Docstring
Compute the intersection between two lines
\param p1 Point on the first line
@ -95,7 +95,7 @@ class QgsGeometryUtils
:rtype: bool
%End
static bool segmentIntersection( const QgsPointV2 &p1, const QgsPointV2 &p2, const QgsPointV2 &q1, const QgsPointV2 &q2, QgsPointV2 &inter /Out/, double tolerance );
static bool segmentIntersection( const QgsPoint &p1, const QgsPoint &p2, const QgsPoint &q1, const QgsPoint &q2, QgsPoint &inter /Out/, double tolerance );
%Docstring
Compute the intersection between two segments
\param p1 First segment start point
@ -108,14 +108,14 @@ class QgsGeometryUtils
:rtype: bool
%End
static QgsPointV2 projPointOnSegment( const QgsPointV2 &p, const QgsPointV2 &s1, const QgsPointV2 &s2 );
static QgsPoint projPointOnSegment( const QgsPoint &p, const QgsPoint &s1, const QgsPoint &s2 );
%Docstring
Project the point on a segment
\param p The point
\param s1 The segment start point
\param s2 The segment end point
:return: The projection of the point on the segment
:rtype: QgsPointV2
:rtype: QgsPoint
%End
@ -126,10 +126,10 @@ Returns < 0 if point(x/y) is left of the line x1,y1 -> x2,y2
:rtype: float
%End
static QgsPointV2 pointOnLineWithDistance( const QgsPointV2 &startPoint, const QgsPointV2 &directionPoint, double distance );
static QgsPoint pointOnLineWithDistance( const QgsPoint &startPoint, const QgsPoint &directionPoint, double distance );
%Docstring
Returns a point a specified distance toward a second point.
:rtype: QgsPointV2
:rtype: QgsPoint
%End
static double ccwAngle( double dy, double dx );
@ -138,7 +138,7 @@ Returns the counter clockwise angle between a line with components dx, dy and th
:rtype: float
%End
static void circleCenterRadius( const QgsPointV2 &pt1, const QgsPointV2 &pt2, const QgsPointV2 &pt3, double &radius /Out/,
static void circleCenterRadius( const QgsPoint &pt1, const QgsPoint &pt2, const QgsPoint &pt3, double &radius /Out/,
double &centerX /Out/, double &centerY /Out/ );
%Docstring
Returns radius and center of the circle through pt1, pt2, pt3
@ -175,20 +175,20 @@ Calculates angle of a circular string part defined by pt1, pt2, pt3
:rtype: float
%End
static bool segmentMidPoint( const QgsPointV2 &p1, const QgsPointV2 &p2, QgsPointV2 &result /Out/, double radius, const QgsPointV2 &mousePos );
static bool segmentMidPoint( const QgsPoint &p1, const QgsPoint &p2, QgsPoint &result /Out/, double radius, const QgsPoint &mousePos );
%Docstring
Calculates midpoint on circle passing through p1 and p2, closest to given coordinate
:rtype: bool
%End
static double circleTangentDirection( const QgsPointV2 &tangentPoint, const QgsPointV2 &cp1, const QgsPointV2 &cp2, const QgsPointV2 &cp3 );
static double circleTangentDirection( const QgsPoint &tangentPoint, const QgsPoint &cp1, const QgsPoint &cp2, const QgsPoint &cp3 );
%Docstring
Calculates the direction angle of a circle tangent (clockwise from north in radians)
:rtype: float
%End
static void segmentizeArc( const QgsPointV2 &p1, const QgsPointV2 &p2, const QgsPointV2 &p3,
QList<QgsPointV2> &points /Out/, double tolerance = M_PI_2 / 90,
static void segmentizeArc( const QgsPoint &p1, const QgsPointV2 &p2, const QgsPoint &p3,
QList<QgsPoint> &points /Out/, double tolerance = M_PI_2 / 90,
QgsAbstractGeometry::SegmentationToleranceType toleranceType = QgsAbstractGeometry::MaximumAngle,
bool hasZ = false, bool hasM = false );
%Docstring
@ -197,7 +197,7 @@ Calculates the direction angle of a circle tangent (clockwise from north in radi
:rtype: QgsPointSequence
%End
static int segmentSide( const QgsPointV2 &pt1, const QgsPointV2 &pt3, const QgsPointV2 &pt2 );
static int segmentSide( const QgsPoint &pt1, const QgsPoint &pt3, const QgsPoint &pt2 );
%Docstring
For line defined by points pt1 and pt3, find out on which side of the line is point pt3.
Returns -1 if pt3 on the left side, 1 if pt3 is on the right side or 0 if pt3 lies on the line.
@ -281,7 +281,7 @@ Angle between two linear segments
static QgsPointV2 midpoint( const QgsPointV2 &pt1, const QgsPointV2 &pt2 );
static QgsPoint midpoint( const QgsPoint &pt1, const QgsPoint &pt2 );
%Docstring
Returns a middle point between points pt1 and pt2.
Z value is computed if one of this point have Z.
@ -291,21 +291,21 @@ Angle between two linear segments
:return: New point at middle between points pt1 and pt2.
* Example:
\code{.py}
p = QgsPointV2( 4, 6 ) # 2D point
pr = midpoint ( p, QgsPointV2( 2, 2 ) )
p = QgsPoint( 4, 6 ) # 2D point
pr = midpoint ( p, QgsPoint( 2, 2 ) )
# pr is a 2D point: 'Point (3 4)'
pr = midpoint ( p, QgsPointV2( QgsWkbTypes.PointZ, 2, 2, 2 ) )
pr = midpoint ( p, QgsPoint( QgsWkbTypes.PointZ, 2, 2, 2 ) )
# pr is a 3D point: 'PointZ (3 4 1)'
pr = midpoint ( p, QgsPointV2( QgsWkbTypes.PointM, 2, 2, 0, 2 ) )
pr = midpoint ( p, QgsPoint( QgsWkbTypes.PointM, 2, 2, 0, 2 ) )
# pr is a 3D point: 'PointM (3 4 1)'
pr = midpoint ( p, QgsPointV2( QgsWkbTypes.PointZM, 2, 2, 2, 2 ) )
pr = midpoint ( p, QgsPoint( QgsWkbTypes.PointZM, 2, 2, 2, 2 ) )
# pr is a 3D point: 'PointZM (3 4 1 1)'
\endcode
.. versionadded:: 3.0
:rtype: QgsPointV2
:rtype: QgsPoint
%End
static double gradient( const QgsPointV2 &pt1, const QgsPointV2 &pt2 );
static double gradient( const QgsPoint &pt1, const QgsPoint &pt2 );
%Docstring
Return the gradient of a line defined by points ``pt1`` and ``pt2``.
\param pt1 first point.
@ -315,7 +315,7 @@ Angle between two linear segments
:rtype: float
%End
static void coefficients( const QgsPointV2 &pt1, const QgsPointV2 &pt2,
static void coefficients( const QgsPoint &pt1, const QgsPoint &pt2,
double &a /Out/, double &b /Out/, double &c /Out/ );
%Docstring
Return the coefficients (a, b, c for equation "ax + by + c = 0") of a line defined by points ``pt1`` and ``pt2``.
@ -327,7 +327,7 @@ Angle between two linear segments
.. versionadded:: 3.0
%End
static QgsLineString perpendicularSegment( const QgsPointV2 &p, const QgsPointV2 &s1, const QgsPointV2 &s2 );
static QgsLineString perpendicularSegment( const QgsPoint &p, const QgsPoint &s1, const QgsPoint &s2 );
%Docstring
Create a perpendicular line segment from p to segment [s1, s2]
\param p The point

22
python/core/geometry/qgslinestring.sip
View File

@ -38,7 +38,7 @@ class QgsLineString: QgsCurve
.. versionadded:: 3.0
%End
QgsLineString( const QList<QgsPoint> &points );
QgsLineString( const QList<QgsPointXY> &points );
%Docstring
Construct a linestring from list of points.
This constructor is more efficient then calling setPoints()
@ -51,11 +51,11 @@ class QgsLineString: QgsCurve
virtual bool operator!=( const QgsCurve &other ) const;
QgsPointV2 pointN( int i ) const;
QgsPoint pointN( int i ) const;
%Docstring
Returns the specified point from inside the line string.
\param i index of point, starting at 0 for the first point
:rtype: QgsPointV2
:rtype: QgsPoint
%End
virtual double xAt( int index ) const;
@ -132,7 +132,7 @@ class QgsLineString: QgsCurve
\param line line to append. Ownership is not transferred.
%End
void addVertex( const QgsPointV2 &pt );
void addVertex( const QgsPoint &pt );
%Docstring
Adds a new vertex to the end of the line string.
\param pt vertex to add
@ -182,8 +182,8 @@ Closes the line string by appending the first point to the end of the line, if i
virtual double length() const;
virtual QgsPointV2 startPoint() const;
virtual QgsPointV2 endPoint() const;
virtual QgsPoint startPoint() const;
virtual QgsPoint endPoint() const;
virtual QgsLineString *curveToLine( double tolerance = M_PI_2 / 90, SegmentationToleranceType toleranceType = MaximumAngle ) const /Factory/;
%Docstring
@ -213,19 +213,19 @@ Closes the line string by appending the first point to the end of the line, if i
virtual void drawAsPolygon( QPainter &p ) const;
virtual bool insertVertex( QgsVertexId position, const QgsPointV2 &vertex );
virtual bool moveVertex( QgsVertexId position, const QgsPointV2 &newPos );
virtual bool insertVertex( QgsVertexId position, const QgsPoint &vertex );
virtual bool moveVertex( QgsVertexId position, const QgsPoint &newPos );
virtual bool deleteVertex( QgsVertexId position );
virtual QgsLineString *reversed() const /Factory/;
virtual double closestSegment( const QgsPointV2 &pt, QgsPointV2 &segmentPt /Out/,
virtual double closestSegment( const QgsPoint &pt, QgsPoint &segmentPt /Out/,
QgsVertexId &vertexAfter /Out/, bool *leftOf /Out/,
double epsilon ) const;
virtual bool pointAt( int node, QgsPointV2 &point, QgsVertexId::VertexType &type ) const;
virtual bool pointAt( int node, QgsPoint &point, QgsVertexId::VertexType &type ) const;
virtual QgsPointV2 centroid() const;
virtual QgsPoint centroid() const;
virtual void sumUpArea( double &sum /Out/ ) const;

70
python/core/geometry/qgspointv2.sip
View File

@ -10,7 +10,7 @@
class QgsPointV2: QgsAbstractGeometry
class QgsPoint: QgsAbstractGeometry
{
%Docstring
Point geometry type, with support for z-dimension and m-values.
@ -22,24 +22,24 @@ class QgsPointV2: QgsAbstractGeometry
%End
public:
QgsPointV2( double x = 0.0, double y = 0.0 );
QgsPoint( double x = 0.0, double y = 0.0 );
%Docstring
Construct a 2 dimensional point with an initial x and y coordinate.
\param x x-coordinate of point
\param y y-coordinate of point
%End
explicit QgsPointV2( const QgsPoint &p );
explicit QgsPoint( const QgsPointXY &p );
%Docstring
Construct a QgsPointV2 from a QgsPoint object
Construct a QgsPoint from a QgsPointXY object
%End
explicit QgsPointV2( QPointF p );
explicit QgsPoint( QPointF p );
%Docstring
Construct a QgsPointV2 from a QPointF
Construct a QgsPoint from a QPointF
%End
QgsPointV2( QgsWkbTypes::Type type, double x = 0.0, double y = 0.0, double z = 0.0, double m = 0.0 );
QgsPoint( QgsWkbTypes::Type type, double x = 0.0, double y = 0.0, double z = 0.0, double m = 0.0 );
%Docstring
Construct a point with a specified type (e.g., PointZ, PointM) and initial x, y, z, and m values.
\param type point type
@ -57,12 +57,12 @@ class QgsPointV2: QgsAbstractGeometry
}
else
{
sipCpp = new sipQgsPointV2( a0, a1, a2, a3, a4 );
sipCpp = new sipQgsPoint( a0, a1, a2, a3, a4 );
}
%End
bool operator==( const QgsPointV2 &pt ) const;
bool operator!=( const QgsPointV2 &pt ) const;
bool operator==( const QgsPoint &pt ) const;
bool operator!=( const QgsPoint &pt ) const;
%Docstring
:rtype: bool
%End
@ -156,7 +156,7 @@ class QgsPointV2: QgsAbstractGeometry
:rtype: float
%End
double distance( const QgsPointV2 &other ) const;
double distance( const QgsPoint &other ) const;
%Docstring
Returns the 2D distance between this point and another point. In certain
cases it may be more appropriate to call the faster distanceSquared() method, e.g.,
@ -175,7 +175,7 @@ class QgsPointV2: QgsAbstractGeometry
:rtype: float
%End
double distanceSquared( const QgsPointV2 &other ) const;
double distanceSquared( const QgsPoint &other ) const;
%Docstring
Returns the squared distance between this point another point. Calling
this is faster than calling distance(), and may be useful in use cases such as comparing
@ -195,7 +195,7 @@ class QgsPointV2: QgsAbstractGeometry
:rtype: float
%End
double distance3D( const QgsPointV2 &other ) const;
double distance3D( const QgsPoint &other ) const;
%Docstring
Returns the 3D distance between this point and another point. In certain
cases it may be more appropriate to call the faster distanceSquared() method, e.g.,
@ -214,7 +214,7 @@ class QgsPointV2: QgsAbstractGeometry
:rtype: float
%End
double distanceSquared3D( const QgsPointV2 &other ) const;
double distanceSquared3D( const QgsPoint &other ) const;
%Docstring
Returns the 3D squared distance between this point another point. Calling
this is faster than calling distance(), and may be useful in use cases such as comparing
@ -224,14 +224,14 @@ class QgsPointV2: QgsAbstractGeometry
:rtype: float
%End
double azimuth( const QgsPointV2 &other ) const;
double azimuth( const QgsPoint &other ) const;
%Docstring
Calculates azimuth between this point and other one (clockwise in degree, starting from north)
.. versionadded:: 3.0
:rtype: float
%End
double inclination( const QgsPointV2 &other ) const;
double inclination( const QgsPoint &other ) const;
%Docstring
Calculates inclination between this point and other one (starting from zenith = 0 to nadir = 180. Horizon = 90)
Returns 90.0 if the distance between this point and other one is equal to 0 (same point).
@ -239,7 +239,7 @@ class QgsPointV2: QgsAbstractGeometry
:rtype: float
%End
QgsPointV2 project( double distance, double azimuth, double inclination = 90.0 ) const;
QgsPoint project( double distance, double azimuth, double inclination = 90.0 ) const;
%Docstring
Returns a new point which correspond to this point projected by a specified distance
with specified angles (azimuth and inclination).
@ -251,14 +251,14 @@ class QgsPointV2: QgsAbstractGeometry
inclination is 90. A 3D point is always returned if a 3D point is projected.
Example:
\code{.py}
p = QgsPointV2( 1, 2 ) # 2D point
p = QgsPoint( 1, 2 ) # 2D point
pr = p.project ( 1, 0 )
# pr is a 2D point: 'Point (1 3)'
pr = p.project ( 1, 0, 90 )
# pr is a 2D point: 'Point (1 3)'
pr = p.project (1, 0, 0 )
# pr is a 3D point: 'PointZ (1 2 1)'
p = QgsPointV2( QgsWkbTypes.PointZ, 1, 2, 2 ) # 3D point
p = QgsPoint( QgsWkbTypes.PointZ, 1, 2, 2 ) # 3D point
pr = p.project ( 1, 0 )
# pr is a 3D point: 'PointZ (1 3 2)'
pr = p.project ( 1, 0, 90 )
@ -267,49 +267,49 @@ class QgsPointV2: QgsAbstractGeometry
# pr is a 3D point: 'PointZ (1 2 3)'
\endcode
.. versionadded:: 3.0
:rtype: QgsPointV2
:rtype: QgsPoint
%End
QgsVector operator-( const QgsPointV2 &p ) const;
QgsVector operator-( const QgsPoint &p ) const;
%Docstring
Calculates the vector obtained by subtracting a point from this point.
.. versionadded:: 3.0
:rtype: QgsVector
%End
QgsPointV2 &operator+=( QgsVector v );
QgsPoint &operator+=( QgsVector v );
%Docstring
Adds a vector to this point in place.
.. versionadded:: 3.0
:rtype: QgsPointV2
:rtype: QgsPoint
%End
QgsPointV2 &operator-=( QgsVector v );
QgsPoint &operator-=( QgsVector v );
%Docstring
Subtracts a vector from this point in place.
.. versionadded:: 3.0
:rtype: QgsPointV2
:rtype: QgsPoint
%End
QgsPointV2 operator+( QgsVector v ) const;
QgsPoint operator+( QgsVector v ) const;
%Docstring
Adds a vector to this point.
.. versionadded:: 3.0
:rtype: QgsPointV2
:rtype: QgsPoint
%End
QgsPointV2 operator-( QgsVector v ) const;
QgsPoint operator-( QgsVector v ) const;
%Docstring
Subtracts a vector from this point.
.. versionadded:: 3.0
:rtype: QgsPointV2
:rtype: QgsPoint
%End
virtual bool isEmpty() const;
virtual QgsRectangle boundingBox() const;
virtual QString geometryType() const;
virtual int dimension() const;
virtual QgsPointV2 *clone() const /Factory/;
virtual QgsPoint *clone() const /Factory/;
virtual void clear();
virtual bool fromWkb( QgsConstWkbPtr &wkb );
@ -334,14 +334,14 @@ class QgsPointV2: QgsAbstractGeometry
virtual int nCoordinates() const;
virtual QgsAbstractGeometry *boundary() const /Factory/;
virtual bool insertVertex( QgsVertexId position, const QgsPointV2 &vertex );
virtual bool moveVertex( QgsVertexId position, const QgsPointV2 &newPos );
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 QgsPointV2 &pt, QgsPointV2 &segmentPt /Out/,
virtual double closestSegment( const QgsPoint &pt, QgsPoint &segmentPt /Out/,
QgsVertexId &vertexAfter /Out/, bool *leftOf /Out/,
double epsilon ) const;
virtual bool nextVertex( QgsVertexId &id, QgsPointV2 &vertex /Out/ ) const;
virtual bool nextVertex( QgsVertexId &id, QgsPoint &vertex /Out/ ) const;
virtual double vertexAngle( QgsVertexId vertex ) const;
@ -355,7 +355,7 @@ class QgsPointV2: QgsAbstractGeometry
virtual int vertexCount( int /*part*/ = 0, int /*ring*/ = 0 ) const;
virtual int ringCount( int /*part*/ = 0 ) const;
virtual int partCount() const;
virtual QgsPointV2 vertexAt( QgsVertexId /*id*/ ) const;
virtual QgsPoint vertexAt( QgsVertexId /*id*/ ) const;
virtual bool addZValue( double zValue = 0 );
virtual bool addMValue( double mValue = 0 );

14
python/core/geometry/qgsrectangle.sip
View File

@ -29,7 +29,7 @@ class QgsRectangle
%Docstring
Constructor
%End
QgsRectangle( const QgsPoint &p1, const QgsPoint &p2 );
QgsRectangle( const QgsPointXY &p1, const QgsPointXY &p2 );
%Docstring
Construct a rectangle from two points. The rectangle is normalized after construction.
%End
@ -42,7 +42,7 @@ Construct a rectangle from a QRectF. The rectangle is normalized after construct
Copy constructor
%End
void set( const QgsPoint &p1, const QgsPoint &p2 );
void set( const QgsPointXY &p1, const QgsPointXY &p2 );
%Docstring
Sets the rectangle from two QgsPoints. The rectangle is
normalised after construction.
@ -143,13 +143,13 @@ Copy constructor
:rtype: float
%End
QgsPoint center() const;
QgsPointXY center() const;
%Docstring
Returns the center point of the rectangle.
:rtype: QgsPoint
:rtype: QgsPointXY
%End
void scale( double scaleFactor, const QgsPoint *c = 0 );
void scale( double scaleFactor, const QgsPointXY *c = 0 );
%Docstring
Scale the rectangle around its center point.
%End
@ -164,7 +164,7 @@ Copy constructor
Grows the rectangle by the specified amount.
%End
void include( const QgsPoint &p );
void include( const QgsPointXY &p );
%Docstring
Updates the rectangle to include the specified point.
%End
@ -194,7 +194,7 @@ Copy constructor
:rtype: bool
%End
bool contains( const QgsPoint &p ) const;
bool contains( const QgsPointXY &p ) const;
%Docstring
Return true when rectangle contains a point.
:rtype: bool

18
python/core/geometry/qgsregularpolygon.sip
View File

@ -35,7 +35,7 @@ class QgsRegularPolygon
QgsRegularPolygon();
QgsRegularPolygon( const QgsPointV2 &center, const double radius, const double azimuth, const int numberSides, const ConstructionOption circle );
QgsRegularPolygon( const QgsPoint &center, const double radius, const double azimuth, const int numberSides, const ConstructionOption circle );
%Docstring
Constructs a regular polygon by ``center`` and parameters for the first vertex. An empty regular polygon is returned if ``numberSides`` < 3 or ``ConstructionOption`` isn't valid.
\param center The center of the regular polygon.
@ -45,7 +45,7 @@ class QgsRegularPolygon
.. seealso:: ConstructionOption
%End
QgsRegularPolygon( const QgsPointV2 &center, const QgsPointV2 &pt1, const int numberSides, const ConstructionOption circle );
QgsRegularPolygon( const QgsPoint &center, const QgsPoint &pt1, const int numberSides, const ConstructionOption circle );
%Docstring
Constructs a regular polygon by ``center`` and another point.
\param center The center of the regular polygon.
@ -54,7 +54,7 @@ class QgsRegularPolygon
\param circle Option to create the polygon inscribed in circle (the radius is the distance between the center and vertices) or circumscribed about circle (the radius is the distance from the center to the midpoints of the sides).
%End
QgsRegularPolygon( const QgsPointV2 &pt1, const QgsPointV2 &pt2, const int numberSides );
QgsRegularPolygon( const QgsPoint &pt1, const QgsPoint &pt2, const int numberSides );
%Docstring
Constructs a regular polygon by two points of the first side.
\param pt1 The first vertex of the first side, also first vertex of the regular polygon.
@ -71,11 +71,11 @@ A regular polygon is empty if radius equal to 0 or number of sides < 3
:rtype: bool
%End
QgsPointV2 center() const;
QgsPoint center() const;
%Docstring
Returns the center point of the regular polygon.
.. seealso:: setCenter()
:rtype: QgsPointV2
:rtype: QgsPoint
%End
double radius() const;
@ -87,11 +87,11 @@ A regular polygon is empty if radius equal to 0 or number of sides < 3
:rtype: float
%End
QgsPointV2 firstVertex() const;
QgsPoint firstVertex() const;
%Docstring
Returns the first vertex (corner) of the regular polygon.
.. seealso:: setFirstVertex()
:rtype: QgsPointV2
:rtype: QgsPoint
%End
double apothem() const;
@ -109,7 +109,7 @@ A regular polygon is empty if radius equal to 0 or number of sides < 3
:rtype: int
%End
void setCenter( const QgsPointV2 &center );
void setCenter( const QgsPoint &center );
%Docstring
Sets the center point.
Radius is unchanged. The first vertex is reprojected from the new center.
@ -123,7 +123,7 @@ A regular polygon is empty if radius equal to 0 or number of sides < 3
.. seealso:: radius()
%End
void setFirstVertex( const QgsPointV2 &firstVertex );
void setFirstVertex( const QgsPoint &firstVertex );
%Docstring
Sets the first vertex.
Radius is unchanged. The center is reprojected from the new first vertex.

60
python/core/geometry/qgstriangle.sip
View File

@ -22,7 +22,7 @@ class QgsTriangle : QgsPolygonV2
public:
QgsTriangle();
QgsTriangle( const QgsPointV2 &p1, const QgsPointV2 &p2, const QgsPointV2 &p3 );
QgsTriangle( const QgsPoint &p1, const QgsPoint &p2, const QgsPoint &p3 );
%Docstring
Construct a QgsTriangle from three QgsPointV2.
An empty triangle is returned if there are identical points or if the points are collinear.
@ -31,7 +31,7 @@ class QgsTriangle : QgsPolygonV2
\param p3 third point
%End
explicit QgsTriangle( const QgsPoint &p1, const QgsPoint &p2, const QgsPoint &p3 );
explicit QgsTriangle( const QgsPointXY &p1, const QgsPointXY &p2, const QgsPointXY &p3 );
%Docstring
Construct a QgsTriangle from three QgsPoint.
An empty triangle is returned if there are identical points or if the points are collinear.
@ -84,13 +84,13 @@ Inherited method not used. You cannot add an interior ring into a triangle.
Inherited method not used. You cannot delete or insert a vertex directly. Returns always false.
:rtype: bool
%End
virtual bool insertVertex( QgsVertexId position, const QgsPointV2 &vertex );
virtual bool insertVertex( QgsVertexId position, const QgsPoint &vertex );
%Docstring
Inherited method not used. You cannot delete or insert a vertex directly. Returns always false.
:rtype: bool
%End
virtual bool moveVertex( QgsVertexId vId, const QgsPointV2 &newPos );
virtual bool moveVertex( QgsVertexId vId, const QgsPoint &newPos );
virtual void setExteriorRing( QgsCurve *ring /Transfer/ );
@ -98,12 +98,12 @@ Inherited method not used. You cannot delete or insert a vertex directly. Return
virtual QgsAbstractGeometry *boundary() const /Factory/;
QgsPointV2 vertexAt( int atVertex ) const;
QgsPoint vertexAt( int atVertex ) const;
%Docstring
Returns coordinates of a vertex.
\param atVertex index of the vertex
:return: Coordinates of the vertex or QgsPointV2(0,0) on error (``atVertex`` < 0 or > 3).
:rtype: QgsPointV2
:return: Coordinates of the vertex or QgsPoint(0,0) on error (``atVertex`` < 0 or > 3).
:rtype: QgsPoint
%End
QVector<double> lengths() const;
@ -112,7 +112,7 @@ Inherited method not used. You cannot delete or insert a vertex directly. Return
:return: Lengths of triangle ABC where [AB] is at 0, [BC] is at 1, [CA] is at 2
* Example:
\code{.py}
tri = QgsTriangle( QgsPointV2( 0, 0 ), QgsPointV2( 0, 5 ), QgsPointV2( 5, 5 ) )
tri = QgsTriangle( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 5, 5 ) )
tri.lengths()
# [5.0, 5.0, 7.0710678118654755]
\endcode
@ -125,7 +125,7 @@ Inherited method not used. You cannot delete or insert a vertex directly. Return
:return: Angles in radians of triangle ABC where angle BAC is at 0, angle ABC is at 1, angle BCA is at 2
* Example:
\code{.py}
tri = QgsTriangle( QgsPointV2( 0, 0 ), QgsPointV2( 0, 5 ), QgsPointV2( 5, 5 ) )
tri = QgsTriangle( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 5, 5 ) )
[math.degrees(i) for i in tri.angles()]
# [45.0, 90.0, 45.0]
\endcode
@ -139,7 +139,7 @@ Inherited method not used. You cannot delete or insert a vertex directly. Return
:return: True or False
* Example:
\code{.py}
tri = QgsTriangle( QgsPointV2( 0, 0 ), QgsPointV2( 0, 5 ), QgsPointV2( 5, 5 ) )
tri = QgsTriangle( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 5, 5 ) )
tri.lengths()
# [5.0, 5.0, 7.0710678118654755]
tri.isIsocele()
@ -156,7 +156,7 @@ Inherited method not used. You cannot delete or insert a vertex directly. Return
:return: True or False
* Example:
\code{.py}
tri = QgsTriangle( QgsPointV2( 10, 10 ), QgsPointV2( 16, 10 ), QgsPointV2( 13, 15.1962 ) )
tri = QgsTriangle( QgsPoint( 10, 10 ), QgsPoint( 16, 10 ), QgsPoint( 13, 15.1962 ) )
tri.lengths()
# [6.0, 6.0000412031918575, 6.0000412031918575]
tri.isEquilateral()
@ -173,7 +173,7 @@ Inherited method not used. You cannot delete or insert a vertex directly. Return
:return: True or False
* Example:
\code{.py}
tri = QgsTriangle( QgsPointV2( 0, 0 ), QgsPointV2( 0, 5 ), QgsPointV2( 5, 5 ) )
tri = QgsTriangle( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 5, 5 ) )
[math.degrees(i) for i in tri.angles()]
# [45.0, 90.0, 45.0]
tri.isRight()
@ -191,7 +191,7 @@ Inherited method not used. You cannot delete or insert a vertex directly. Return
:return: True or False
* Example:
\code{.py}
tri = QgsTriangle( QgsPointV2( 7.2825, 4.2368 ), QgsPointV2( 13.0058, 3.3218 ), QgsPointV2( 9.2145, 6.5242 ) )
tri = QgsTriangle( QgsPoint( 7.2825, 4.2368 ), QgsPoint( 13.0058, 3.3218 ), QgsPoint( 9.2145, 6.5242 ) )
tri.lengths()
# [5.795980321740233, 4.962793714229921, 2.994131386562721]
tri.isScalene()
@ -207,7 +207,7 @@ Inherited method not used. You cannot delete or insert a vertex directly. Return
:return: Three altitudes from this triangle
* Example:
\code{.py}
tri = QgsTriangle( QgsPointV2( 0, 0 ), QgsPointV2( 0, 5 ), QgsPointV2( 5, 5 ) )
tri = QgsTriangle( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 5, 5 ) )
[alt.asWkt() for alt in tri.altitudes()]
# ['LineString (0 0, 0 5)', 'LineString (0 5, 2.5 2.5)', 'LineString (5 5, 0 5)']
\endcode
@ -220,7 +220,7 @@ Inherited method not used. You cannot delete or insert a vertex directly. Return
:return: Three medians from this triangle
* Example:
\code{.py}
tri = QgsTriangle( QgsPointV2( 0, 0 ), QgsPointV2( 0, 5 ), QgsPointV2( 5, 5 ) )
tri = QgsTriangle( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 5, 5 ) )
[med.asWkt() for med in tri.medians()]
# ['LineString (0 0, 2.5 5)', 'LineString (0 5, 2.5 2.5)', 'LineString (5 5, 0 2.5)']
\endcode
@ -234,7 +234,7 @@ Inherited method not used. You cannot delete or insert a vertex directly. Return
:return: Three angle bisector from this triangle
* Example:
\code{.py}
tri = QgsTriangle( QgsPointV2( 0, 0 ), QgsPointV2( 0, 5 ), QgsPointV2( 5, 5 ) )
tri = QgsTriangle( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 5, 5 ) )
[bis.asWkt() for bis in tri.bisectors()]
# ['LineString (0 0, 2.07106781186547462 5)', 'LineString (0 5, 2.5 2.5)', 'LineString (5 5, 0 2.92893218813452538)']
\endcode
@ -247,38 +247,38 @@ Inherited method not used. You cannot delete or insert a vertex directly. Return
:return: The medial from this triangle
* Example:
\code{.py}
tri = QgsTriangle( QgsPointV2( 0, 0 ), QgsPointV2( 0, 5 ), QgsPointV2( 5, 5 ) )
tri = QgsTriangle( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 5, 5 ) )
tri.medial().asWkt()
# 'Triangle ((0 2.5, 2.5 5, 2.5 2.5, 0 2.5))'
\endcode
:rtype: QgsTriangle
%End
QgsPointV2 orthocenter( double lengthTolerance = 0.0001 ) const;
QgsPoint orthocenter( double lengthTolerance = 0.0001 ) const;
%Docstring
An orthocenter is the point of intersection of the altitudes of a triangle.
\param lengthTolerance The tolerance to use
:return: The orthocenter of the triangle.
* Example:
\code{.py}
tri = QgsTriangle( QgsPointV2( 0, 0 ), QgsPointV2( 0, 5 ), QgsPointV2( 5, 5 ) )
tri = QgsTriangle( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 5, 5 ) )
tri.orthocenter().asWkt()
# 'Point (0 5)'
\endcode
:rtype: QgsPointV2
:rtype: QgsPoint
%End
QgsPointV2 circumscribedCenter( ) const;
QgsPoint circumscribedCenter( ) const;
%Docstring
Center of the circumscribed circle of the triangle.
:return: The center of the circumscribed circle of the triangle
* Example:
\code{.py}
tri = QgsTriangle( QgsPointV2( 0, 0 ), QgsPointV2( 0, 5 ), QgsPointV2( 5, 5 ) )
tri = QgsTriangle( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 5, 5 ) )
tri.circumscribedCenter().asWkt()
# 'Point (2.5 2.5)'
\endcode
:rtype: QgsPointV2
:rtype: QgsPoint
%End
double circumscribedRadius( ) const;
@ -287,7 +287,7 @@ Inherited method not used. You cannot delete or insert a vertex directly. Return
:return: The radius of the circumscribed circle of the triangle
* Example:
\code{.py}
tri = QgsTriangle( QgsPointV2( 0, 0 ), QgsPointV2( 0, 5 ), QgsPointV2( 5, 5 ) )
tri = QgsTriangle( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 5, 5 ) )
tri.circumscribedRadius()
# 3.5355339059327378
\endcode
@ -300,24 +300,24 @@ Inherited method not used. You cannot delete or insert a vertex directly. Return
@return The circumbscribed of the triangle with a QgsCircle.
Example:
\code{.py}
tri = QgsTriangle( QgsPointV2( 0, 0 ), QgsPointV2( 0, 5 ), QgsPointV2( 5, 5 ) )
tri = QgsTriangle( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 5, 5 ) )
tri.circumscribedCircle()
# QgsCircle(Point (2.5 2.5), 3.5355339059327378, 0)
\endcode
:rtype: QgsCircle
%End
QgsPointV2 inscribedCenter( ) const;
QgsPoint inscribedCenter( ) const;
%Docstring
Center of the inscribed circle of the triangle.
:return: The center of the inscribed circle of the triangle
* Example:
\code{.py}
tri = QgsTriangle( QgsPointV2( 0, 0 ), QgsPointV2( 0, 5 ), QgsPointV2( 5, 5 ) )
tri = QgsTriangle( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 5, 5 ) )
tri.inscribedCenter().asWkt()
# 'Point (1.46446609406726225 3.53553390593273775)'
\endcode
:rtype: QgsPointV2
:rtype: QgsPoint
%End
double inscribedRadius( ) const;
@ -326,7 +326,7 @@ Inherited method not used. You cannot delete or insert a vertex directly. Return
:return: The radius of the inscribed circle of the triangle
* Example:
\code{.py}
tri = QgsTriangle( QgsPointV2( 0, 0 ), QgsPointV2( 0, 5 ), QgsPointV2( 5, 5 ) )
tri = QgsTriangle( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 5, 5 ) )
tri.inscribedRadius()
# 1.4644660940672622
\endcode
@ -339,7 +339,7 @@ Inherited method not used. You cannot delete or insert a vertex directly. Return
@return The inscribed of the triangle with a QgsCircle.
Example:
\code{.py}
tri = QgsTriangle( QgsPointV2( 0, 0 ), QgsPointV2( 0, 5 ), QgsPointV2( 5, 5 ) )
tri = QgsTriangle( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 5, 5 ) )
tri.inscribedCircle()
# QgsCircle(Point (1.46446609406726225 3.53553390593273775), 1.4644660940672622, 0)
\endcode

4
python/core/processing/qgsprocessingalgorithm.sip
View File

@ -239,10 +239,10 @@ class QgsProcessingAlgorithm
:rtype: QgsRectangle
%End
QgsPoint parameterAsPoint( const QVariantMap &parameters, const QString &name, QgsProcessingContext &context ) const;
QgsPointXY parameterAsPoint( const QVariantMap &parameters, const QString &name, QgsProcessingContext &context ) const;
%Docstring
Evaluates the parameter with matching ``name`` to a point.
:rtype: QgsPoint
:rtype: QgsPointXY
%End
QString parameterAsFile( const QVariantMap &parameters, const QString &name, QgsProcessingContext &context ) const;

4
python/core/processing/qgsprocessingparameters.sip
View File

@ -249,10 +249,10 @@ class QgsProcessingParameters
:rtype: QgsRectangle
%End
static QgsPoint parameterAsPoint( const QgsProcessingParameterDefinition *definition, const QVariantMap &parameters, const QString &name, QgsProcessingContext &context );
static QgsPointXY parameterAsPoint( const QgsProcessingParameterDefinition *definition, const QVariantMap &parameters, const QString &name, QgsProcessingContext &context );
%Docstring
Evaluates the parameter with matching ``name`` to a point.
:rtype: QgsPoint
:rtype: QgsPointXY
%End
static QString parameterAsFile( const QgsProcessingParameterDefinition *definition, const QVariantMap &parameters, const QString &name, QgsProcessingContext &context );

2
python/core/qgsbearingutils.sip
View File

@ -23,7 +23,7 @@ class QgsBearingUtils
public:
static double bearingTrueNorth( const QgsCoordinateReferenceSystem &crs,
const QgsPoint &point );
const QgsPointXY &point );
%Docstring
Returns the direction to true north from a specified point and for a specified
coordinate reference system. The returned value is in degrees clockwise from

8
python/core/qgscoordinatetransform.sip
View File

@ -106,7 +106,7 @@ Default constructor, creates an invalid QgsCoordinateTransform.
:rtype: QgsCoordinateReferenceSystem
%End
QgsPoint transform( const QgsPoint &point, TransformDirection direction = ForwardTransform ) const;
QgsPointXY transform( const QgsPointXY &point, TransformDirection direction = ForwardTransform ) const;
%Docstring
Transform the point from the source CRS to the destination CRS.
If the direction is ForwardTransform then coordinates are transformed from source to destination,
@ -114,10 +114,10 @@ Default constructor, creates an invalid QgsCoordinateTransform.
\param point point to transform
\param direction transform direction (defaults to ForwardTransform)
:return: transformed point
:rtype: QgsPoint
:rtype: QgsPointXY
%End
QgsPoint transform( const double x, const double y, TransformDirection direction = ForwardTransform ) const;
QgsPointXY transform( const double x, const double y, TransformDirection direction = ForwardTransform ) const;
%Docstring
Transform the point specified by x,y from the source CRS to the destination CRS.
If the direction is ForwardTransform then coordinates are transformed from source to destination,
@ -126,7 +126,7 @@ Default constructor, creates an invalid QgsCoordinateTransform.
\param y y coordinate of point to transform
\param direction transform direction (defaults to ForwardTransform)
:return: transformed point
:rtype: QgsPoint
:rtype: QgsPointXY
%End
QgsRectangle transformBoundingBox( const QgsRectangle &rectangle, TransformDirection direction = ForwardTransform, const bool handle180Crossover = false ) const;

14
python/core/qgsdistancearea.sip
View File

@ -160,7 +160,7 @@ Constructor
:rtype: float
%End
double measureLine( const QList<QgsPoint> &points ) const;
double measureLine( const QList<QgsPointXY> &points ) const;
%Docstring
Measures the length of a line with multiple segments.
\param points list of points in line
@ -169,7 +169,7 @@ Constructor
:rtype: float
%End
double measureLine( const QgsPoint &p1, const QgsPoint &p2 ) const;
double measureLine( const QgsPointXY &p1, const QgsPointXY &p2 ) const;
%Docstring
Measures the distance between two points.
\param p1 start of line
@ -179,7 +179,7 @@ Constructor
:rtype: float
%End
double measureLineProjected( const QgsPoint &p1, double distance = 1, double azimuth = M_PI / 2, QgsPoint *projectedPoint /Out/ = 0 ) const;
double measureLineProjected( const QgsPointXY &p1, double distance = 1, double azimuth = M_PI / 2, QgsPointXY *projectedPoint /Out/ = 0 ) const;
%Docstring
Calculates the distance from one point with distance in meters and azimuth (direction)
When the sourceCrs() is geographic, computeSpheroidProject() will be called
@ -213,13 +213,13 @@ Constructor
:rtype: QgsUnitTypes.AreaUnit
%End
double measurePolygon( const QList<QgsPoint> &points ) const;
double measurePolygon( const QList<QgsPointXY> &points ) const;
%Docstring
Measures the area of the polygon described by a set of points.
:rtype: float
%End
double bearing( const QgsPoint &p1, const QgsPoint &p2 ) const;
double bearing( const QgsPointXY &p1, const QgsPointXY &p2 ) const;
%Docstring
Computes the bearing (in radians) between two points.
:rtype: float
@ -279,7 +279,7 @@ Constructor
:rtype: float
%End
QgsPoint computeSpheroidProject( const QgsPoint &p1, double distance = 1, double azimuth = M_PI / 2 ) const;
QgsPointXY computeSpheroidProject( const QgsPointXY &p1, double distance = 1, double azimuth = M_PI / 2 ) const;
%Docstring
Given a location, an azimuth and a distance, computes the
location of the projected point. Based on Vincenty's formula
@ -295,7 +295,7 @@ Constructor
\param distance - distance in meters.
\param azimuth - azimuth in radians, clockwise from North
:return: p2 - location of projected point as longitude/latitude.
:rtype: QgsPoint
:rtype: QgsPointXY
%End
};

8
python/core/qgsmapsettings.sip
View File

@ -297,11 +297,11 @@ Return the calculated scale of the map
:rtype: QgsRectangle
%End
QgsPoint layerToMapCoordinates( const QgsMapLayer *layer, QgsPoint point ) const;
QgsPointXY layerToMapCoordinates( const QgsMapLayer *layer, QgsPointXY point ) const;
%Docstring
transform point coordinates from layer's CRS to output CRS
:return: the transformed point
:rtype: QgsPoint
:rtype: QgsPointXY
%End
QgsRectangle layerToMapCoordinates( const QgsMapLayer *layer, QgsRectangle rect ) const;
@ -312,11 +312,11 @@ Return the calculated scale of the map
:rtype: QgsRectangle
%End
QgsPoint mapToLayerCoordinates( const QgsMapLayer *layer, QgsPoint point ) const;
QgsPointXY mapToLayerCoordinates( const QgsMapLayer *layer, QgsPointXY point ) const;
%Docstring
transform point coordinates from output CRS to layer's CRS
:return: the transformed point
:rtype: QgsPoint
:rtype: QgsPointXY
%End
QgsRectangle mapToLayerCoordinates( const QgsMapLayer *layer, QgsRectangle rect ) const;

32
python/core/qgsmaptopixel.sip
View File

@ -58,24 +58,24 @@ class QgsMapToPixel
Use setParameters to fill
%End
QgsPoint transform( const QgsPoint &p ) const;
QgsPointXY transform( const QgsPointXY &p ) const;
%Docstring
Transform the point from map (world) coordinates to device coordinates
\param p Point to transform
:return: QgsPoint in device coordinates
:rtype: QgsPoint
:return: QgsPointXY in device coordinates
:rtype: QgsPointXY
%End
void transform( QgsPoint *p ) const;
void transform( QgsPointXY *p ) const;
QgsPoint transform( qreal x, qreal y ) const;
QgsPointXY transform( qreal x, qreal y ) const;
%Docstring
Transform the point specified by x,y from map (world)
coordinates to device coordinates
\param x x cordinate o point to transform
\param y y coordinate of point to transform
:return: QgsPoint in device coordinates
:rtype: QgsPoint
:return: QgsPointXY in device coordinates
:rtype: QgsPointXY
%End
void transformInPlace( double &x, double &y ) const;
@ -87,28 +87,28 @@ class QgsMapToPixel
QgsPoint toMapCoordinates( int x, int y ) const;
QgsPointXY toMapCoordinates( int x, int y ) const;
%Docstring
:rtype: QgsPoint
:rtype: QgsPointXY
%End
QgsPoint toMapCoordinatesF( double x, double y ) const;
QgsPointXY toMapCoordinatesF( double x, double y ) const;
%Docstring
Transform device coordinates to map (world) coordinates
:rtype: QgsPoint
:rtype: QgsPointXY
%End
QgsPoint toMapCoordinates( QPoint p ) const;
QgsPointXY toMapCoordinates( QPoint p ) const;
%Docstring
Transform device coordinates to map (world) coordinates
\param p Point to be converted to map cooordinates
:return: QgsPoint in map coorndiates
:rtype: QgsPoint
:return: QgsPointXY in map coorndiates
:rtype: QgsPointXY
%End
QgsPoint toMapPoint( double x, double y ) const;
QgsPointXY toMapPoint( double x, double y ) const;
%Docstring
:rtype: QgsPoint
:rtype: QgsPointXY
%End
void setMapUnitsPerPixel( double mapUnitsPerPixel );

10
python/core/qgspallabeling.sip
View File

@ -19,11 +19,11 @@ class QgsLabelPosition
#include "qgspallabeling.h"
%End
public:
QgsLabelPosition( int id, double r, const QVector< QgsPoint > &corners, const QgsRectangle &rect, double w, double h, const QString &layer, const QString &labeltext, const QFont &labelfont, bool upside_down, bool diagram = false, bool pinned = false, const QString &providerId = QString() );
QgsLabelPosition( int id, double r, const QVector< QgsPointXY > &corners, const QgsRectangle &rect, double w, double h, const QString &layer, const QString &labeltext, const QFont &labelfont, bool upside_down, bool diagram = false, bool pinned = false, const QString &providerId = QString() );
QgsLabelPosition();
int featureId;
double rotation;
QVector< QgsPoint > cornerPoints;
QVector< QgsPointXY > cornerPoints;
QgsRectangle labelRect;
double width;
double height;
@ -467,8 +467,8 @@ Z-Index of label, where labels with a higher z-index are rendered on top of labe
const QgsMapToPixel *xform;
QgsCoordinateTransform ct;
QgsPoint ptZero;
QgsPoint ptOne;
QgsPointXY ptZero;
QgsPointXY ptOne;
QgsGeometry extentGeom;
int mFeaturesToLabel; // total features that will probably be labeled, may be less (figured before PAL)
int mFeatsSendingToPal; // total features tested for sending into PAL (relative to maxNumLabels)
@ -507,7 +507,7 @@ class QgsLabelingResults
~QgsLabelingResults();
QList<QgsLabelPosition> labelsAtPosition( const QgsPoint &p ) const;
QList<QgsLabelPosition> labelsAtPosition( const QgsPointXY &p ) const;
%Docstring
return infos about labels at a given (map) position
:rtype: list of QgsLabelPosition

68
python/core/qgspoint.sip
View File

@ -12,7 +12,7 @@
class QgsPoint
class QgsPointXY
{
%Docstring
A class to represent a point.
@ -23,35 +23,35 @@ class QgsPoint
#include "qgspoint.h"
%End
public:
QgsPoint();
QgsPointXY();
QgsPoint( const QgsPoint &p );
QgsPointXY( const QgsPointXY &p );
%Docstring
Create a point from another point
%End
QgsPoint( double x, double y );
QgsPointXY( double x, double y );
%Docstring
Create a point from x,y coordinates
\param x x coordinate
\param y y coordinate
%End
QgsPoint( QPointF point );
QgsPointXY( QPointF point );
%Docstring
Create a point from a QPointF
\param point QPointF source
.. versionadded:: 2.7
%End
QgsPoint( QPoint point );
QgsPointXY( QPoint point );
%Docstring
Create a point from a QPoint
\param point QPoint source
.. versionadded:: 2.7
%End
QgsPoint( const QgsPointV2 &point );
QgsPointXY( const QgsPoint &point );
%Docstring
Create a new point.
Z and M values will be dropped.
@ -59,7 +59,7 @@ Create a point from another point
.. versionadded:: 3.0
%End
~QgsPoint();
~QgsPointXY();
void setX( double x );
%Docstring
@ -154,7 +154,7 @@ As above but with precision for string representation of a point
:rtype: float
%End
double sqrDist( const QgsPoint &other ) const;
double sqrDist( const QgsPointXY &other ) const;
%Docstring
Returns the squared distance between this point another point.
.. seealso:: distance()
@ -171,7 +171,7 @@ As above but with precision for string representation of a point
:rtype: float
%End
double distance( const QgsPoint &other ) const;
double distance( const QgsPointXY &other ) const;
%Docstring
Returns the distance between this point and another point.
\param other other point
@ -180,29 +180,29 @@ As above but with precision for string representation of a point
:rtype: float
%End
double sqrDistToSegment( double x1, double y1, double x2, double y2, QgsPoint &minDistPoint /Out/, double epsilon = DEFAULT_SEGMENT_EPSILON ) const;
double sqrDistToSegment( double x1, double y1, double x2, double y2, QgsPointXY &minDistPoint /Out/, double epsilon = DEFAULT_SEGMENT_EPSILON ) const;
%Docstring
Returns the minimum distance between this point and a segment
:rtype: float
%End
double azimuth( const QgsPoint &other ) const;
double azimuth( const QgsPointXY &other ) const;
%Docstring
Calculates azimuth between this point and other one (clockwise in degree, starting from north)
:rtype: float
%End
QgsPoint project( double distance, double bearing ) const;
QgsPointXY project( double distance, double bearing ) const;
%Docstring
Returns a new point which corresponds to this point projected by a specified distance
in a specified bearing.
\param distance distance to project
\param bearing angle to project in, clockwise in degrees starting from north
.. versionadded:: 2.16
:rtype: QgsPoint
:rtype: QgsPointXY
%End
bool compare( const QgsPoint &other, double epsilon = 4 * DBL_EPSILON ) const;
bool compare( const QgsPointXY &other, double epsilon = 4 * DBL_EPSILON ) const;
%Docstring
Compares this point with another point with a fuzzy tolerance
\param other point to compare with
@ -212,9 +212,9 @@ Calculates azimuth between this point and other one (clockwise in degree, starti
:rtype: bool
%End
bool operator==( const QgsPoint &other );
bool operator==( const QgsPointXY &other );
bool operator!=( const QgsPoint &other ) const;
bool operator!=( const QgsPointXY &other ) const;
%Docstring
Inequality operator
:rtype: bool
@ -226,58 +226,58 @@ Multiply x and y by the given value
%End
QgsVector operator-( const QgsPoint &p ) const;
QgsVector operator-( const QgsPointXY &p ) const;
%Docstring
Calculates the vector obtained by subtracting a point from this point
:rtype: QgsVector
%End
QgsPoint &operator+=( QgsVector v );
QgsPointXY &operator+=( QgsVector v );
%Docstring
Adds a vector to this point in place
:rtype: QgsPoint
:rtype: QgsPointXY
%End
QgsPoint &operator-=( QgsVector v );
QgsPointXY &operator-=( QgsVector v );
%Docstring
Subtracts a vector from this point in place
:rtype: QgsPoint
:rtype: QgsPointXY
%End
QgsPoint operator+( QgsVector v ) const;
QgsPointXY operator+( QgsVector v ) const;
%Docstring
Adds a vector to this point
:rtype: QgsPoint
:rtype: QgsPointXY
%End
QgsPoint operator-( QgsVector v ) const;
QgsPointXY operator-( QgsVector v ) const;
%Docstring
Subtracts a vector from this point
:rtype: QgsPoint
:rtype: QgsPointXY
%End
QgsPoint operator*( double scalar ) const;
QgsPointXY operator*( double scalar ) const;
%Docstring
Multiplies the coordinates in this point by a scalar quantity
:rtype: QgsPoint
:rtype: QgsPointXY
%End
QgsPoint operator/( double scalar ) const;
QgsPointXY operator/( double scalar ) const;
%Docstring
Divides the coordinates in this point by a scalar quantity
:rtype: QgsPoint
:rtype: QgsPointXY
%End
QgsPoint &operator*=( double scalar );
QgsPointXY &operator*=( double scalar );
%Docstring
Multiplies the coordinates in this point by a scalar quantity in place
:rtype: QgsPoint
:rtype: QgsPointXY
%End
QgsPoint &operator/=( double scalar );
QgsPointXY &operator/=( double scalar );
%Docstring
Divides the coordinates in this point by a scalar quantity in place
:rtype: QgsPoint
:rtype: QgsPointXY
%End
SIP_PYOBJECT __repr__();

16
python/core/qgspointlocator.sip
View File

@ -94,7 +94,7 @@ Indicate whether the data have been already indexed
construct invalid match
%End
Match( QgsPointLocator::Type t, QgsVectorLayer *vl, QgsFeatureId fid, double dist, const QgsPoint &pt, int vertexIndex = 0, QgsPoint *edgePoints = 0 );
Match( QgsPointLocator::Type t, QgsVectorLayer *vl, QgsFeatureId fid, double dist, const QgsPointXY &pt, int vertexIndex = 0, QgsPointXY *edgePoints = 0 );
QgsPointLocator::Type type() const;
%Docstring
@ -124,10 +124,10 @@ units depending on what class returns it (geom.cache: layer units, map canvas sn
:rtype: float
%End
QgsPoint point() const;
QgsPointXY point() const;
%Docstring
coords depending on what class returns it (geom.cache: layer coords, map canvas snapper: dest coords)
:rtype: QgsPoint
:rtype: QgsPointXY
%End
int vertexIndex() const;
@ -149,7 +149,7 @@ for vertex / edge match (first vertex of the edge)
:rtype: QgsFeatureId
%End
void edgePoints( QgsPoint &pt1 /Out/, QgsPoint &pt2 /Out/ ) const;
void edgePoints( QgsPointXY &pt1 /Out/, QgsPointXY &pt2 /Out/ ) const;
%Docstring
Only for a valid edge match - obtain endpoints of the edge
%End
@ -171,12 +171,12 @@ Only for a valid edge match - obtain endpoints of the edge
};
Match nearestVertex( const QgsPoint &point, double tolerance, QgsPointLocator::MatchFilter *filter = 0 );
Match nearestVertex( const QgsPointXY &point, double tolerance, QgsPointLocator::MatchFilter *filter = 0 );
%Docstring
Optional filter may discard unwanted matches.
:rtype: Match
%End
Match nearestEdge( const QgsPoint &point, double tolerance, QgsPointLocator::MatchFilter *filter = 0 );
Match nearestEdge( const QgsPointXY &point, double tolerance, QgsPointLocator::MatchFilter *filter = 0 );
%Docstring
Optional filter may discard unwanted matches.
:rtype: Match
@ -186,14 +186,14 @@ Optional filter may discard unwanted matches.
Optional filter may discard unwanted matches.
:rtype: MatchList
%End
MatchList edgesInRect( const QgsPoint &point, double tolerance, QgsPointLocator::MatchFilter *filter = 0 );
MatchList edgesInRect( const QgsPointXY &point, double tolerance, QgsPointLocator::MatchFilter *filter = 0 );
%Docstring
Override of edgesInRect that construct rectangle from a center point and tolerance
:rtype: MatchList
%End
MatchList pointInPolygon( const QgsPoint &point );
MatchList pointInPolygon( const QgsPointXY &point );
%Docstring
find out if the point is in any polygons
:rtype: MatchList

8
python/core/qgspropertytransformer.sip
View File

@ -42,7 +42,7 @@ class QgsCurveTransform
between 0 and 1 unchanged. I.e. y == x.
%End
QgsCurveTransform( const QList< QgsPoint > &controlPoints );
QgsCurveTransform( const QList< QgsPointXY > &controlPoints );
%Docstring
Constructs a QgsCurveTransform using a specified list of ``controlPoints``.
Behavior is undefined if duplicate x values exist in the control points
@ -57,14 +57,14 @@ class QgsCurveTransform
%End
QList< QgsPoint > controlPoints() const;
QList< QgsPointXY > controlPoints() const;
%Docstring
Returns a list of the control points for the transform.
.. seealso:: setControlPoints()
:rtype: list of QgsPoint
:rtype: list of QgsPointXY
%End
void setControlPoints( const QList< QgsPoint > &points );
void setControlPoints( const QList< QgsPointXY > &points );
%Docstring
Sets the list of control points for the transform. Any existing
points are removed.

2
python/core/qgssnappingutils.sip
View File

@ -49,7 +49,7 @@ Get a point locator for the given layer. If such locator does not exist, it will
Snap to map according to the current configuration (mode). Optional filter allows discarding unwanted matches.
:rtype: QgsPointLocator.Match
%End
QgsPointLocator::Match snapToMap( const QgsPoint &pointMap, QgsPointLocator::MatchFilter *filter = 0 );
QgsPointLocator::Match snapToMap( const QgsPointXY &pointMap, QgsPointLocator::MatchFilter *filter = 0 );
%Docstring
:rtype: QgsPointLocator.Match
%End

2
python/core/qgsspatialindex.sip
View File

@ -76,7 +76,7 @@ Returns features that intersect the specified rectangle
:rtype: list of QgsFeatureId
%End
QList<QgsFeatureId> nearestNeighbor( const QgsPoint &point, int neighbors ) const;
QList<QgsFeatureId> nearestNeighbor( const QgsPointXY &point, int neighbors ) const;
%Docstring
Returns nearest neighbors (their count is specified by second parameter)
:rtype: list of QgsFeatureId

6
python/core/qgstracer.sip
View File

@ -95,13 +95,13 @@ Whether the internal data structures have been initialized
ErrNoPath,
};
QVector<QgsPoint> findShortestPath( const QgsPoint &p1, const QgsPoint &p2, PathError *error /Out/ = 0 );
QVector<QgsPointXY> findShortestPath( const QgsPointXY &p1, const QgsPointXY &p2, PathError *error /Out/ = 0 );
%Docstring
:return: array of points - trace of linestrings of other features (empty array one error)
:rtype: list of QgsPoint
:rtype: list of QgsPointXY
%End
bool isPointSnapped( const QgsPoint &pt );
bool isPointSnapped( const QgsPointXY &pt );
%Docstring
Find out whether the point is snapped to a vertex or edge (i.e. it can be used for tracing start/stop)
:rtype: bool

14
python/core/qgsvectorlayer.sip
View File

@ -949,7 +949,7 @@ changeGeometry() instead.
:rtype: bool
%End
bool insertVertex( const QgsPointV2 &point, QgsFeatureId atFeatureId, int beforeVertex );
bool insertVertex( const QgsPoint &point, QgsFeatureId atFeatureId, int beforeVertex );
%Docstring
Insert a new vertex before the given vertex number,
in the given ring, item (first number is index 0), and feature
@ -965,7 +965,7 @@ changeGeometry() instead.
:rtype: bool
%End
bool moveVertex( const QgsPointV2 &p, QgsFeatureId atFeatureId, int atVertex ) /PyName=moveVertexV2/;
bool moveVertex( const QgsPoint &p, QgsFeatureId atFeatureId, int atVertex ) /PyName=moveVertexV2/;
%Docstring
Moves the vertex at the given position number,
ring and item (first number is index 0), and feature
@ -992,7 +992,7 @@ changeGeometry() instead.
:rtype: bool
%End
int addRing( const QList<QgsPoint> &ring, QgsFeatureId *featureId = 0 );
int addRing( const QList<QgsPointXY> &ring, QgsFeatureId *featureId = 0 );
%Docstring
:rtype: int
%End
@ -1002,7 +1002,7 @@ changeGeometry() instead.
:rtype: int
%End
int addPart( const QList<QgsPoint> &ring );
int addPart( const QList<QgsPointXY> &ring );
%Docstring
:rtype: int
%End
@ -1030,12 +1030,12 @@ changeGeometry() instead.
:rtype: int
%End
int splitParts( const QList<QgsPoint> &splitLine, bool topologicalEditing = false );
int splitParts( const QList<QgsPointXY> &splitLine, bool topologicalEditing = false );
%Docstring
:rtype: int
%End
int splitFeatures( const QList<QgsPoint> &splitLine, bool topologicalEditing = false );
int splitFeatures( const QList<QgsPointXY> &splitLine, bool topologicalEditing = false );
%Docstring
:rtype: int
%End
@ -1051,7 +1051,7 @@ changeGeometry() instead.
:rtype: int
%End
int addTopologicalPoints( const QgsPoint &p );
int addTopologicalPoints( const QgsPointXY &p );
%Docstring
Adds a vertex to segments which intersect point p but don't
already have a vertex there. If a feature already has a vertex at position p,

16
python/core/qgsvectorlayereditutils.sip
View File

@ -27,7 +27,7 @@ class QgsVectorLayerEditUtils
:rtype: bool
%End
bool insertVertex( const QgsPointV2 &point, QgsFeatureId atFeatureId, int beforeVertex );
bool insertVertex( const QgsPoint &point, QgsFeatureId atFeatureId, int beforeVertex );
%Docstring
Insert a new vertex before the given vertex number,
in the given ring, item (first number is index 0), and feature
@ -43,7 +43,7 @@ class QgsVectorLayerEditUtils
:rtype: bool
%End
bool moveVertex( const QgsPointV2 &p, QgsFeatureId atFeatureId, int atVertex ) /PyName=moveVertexV2/;
bool moveVertex( const QgsPoint &p, QgsFeatureId atFeatureId, int atVertex ) /PyName=moveVertexV2/;
%Docstring
Moves the vertex at the given position number,
ring and item (first number is index 0), and feature
@ -63,7 +63,7 @@ class QgsVectorLayerEditUtils
:rtype: QgsVectorLayer.EditResult
%End
int addRing( const QList<QgsPoint> &ring, const QgsFeatureIds &targetFeatureIds = QgsFeatureIds(), QgsFeatureId *modifiedFeatureId = 0 );
int addRing( const QList<QgsPointXY> &ring, const QgsFeatureIds &targetFeatureIds = QgsFeatureIds(), QgsFeatureId *modifiedFeatureId = 0 );
%Docstring
:rtype: int
%End
@ -73,7 +73,7 @@ class QgsVectorLayerEditUtils
:rtype: int
%End
int addPart( const QList<QgsPoint> &ring, QgsFeatureId featureId );
int addPart( const QList<QgsPointXY> &ring, QgsFeatureId featureId );
%Docstring
:rtype: int
%End
@ -98,12 +98,12 @@ class QgsVectorLayerEditUtils
:rtype: int
%End
int splitParts( const QList<QgsPoint> &splitLine, bool topologicalEditing = false );
int splitParts( const QList<QgsPointXY> &splitLine, bool topologicalEditing = false );
%Docstring
:rtype: int
%End
int splitFeatures( const QList<QgsPoint> &splitLine, bool topologicalEditing = false );
int splitFeatures( const QList<QgsPointXY> &splitLine, bool topologicalEditing = false );
%Docstring
:rtype: int
%End
@ -119,7 +119,7 @@ class QgsVectorLayerEditUtils
:rtype: int
%End
int addTopologicalPoints( const QgsPoint &p );
int addTopologicalPoints( const QgsPointXY &p );
%Docstring
Adds a vertex to segments which intersect point p but don't
already have a vertex there. If a feature already has a vertex at position p,
@ -132,7 +132,7 @@ class QgsVectorLayerEditUtils
protected:
int boundingBoxFromPointList( const QList<QgsPoint> &list, double &xmin, double &ymin, double &xmax, double &ymax ) const;
int boundingBoxFromPointList( const QList<QgsPointXY> &list, double &xmin, double &ymin, double &xmax, double &ymax ) const;
%Docstring
Little helper function that gives bounding box from a list of points.
:return: 0 in case of success *

2
python/core/raster/qgsrasterdataprovider.sip
View File

@ -234,7 +234,7 @@ Get list of user no data value ranges
:rtype: str
%End
virtual QgsRasterIdentifyResult identify( const QgsPoint &point, QgsRaster::IdentifyFormat format, const QgsRectangle &boundingBox = QgsRectangle(), int width = 0, int height = 0, int dpi = 96 );
virtual QgsRasterIdentifyResult identify( const QgsPointXY &point, QgsRaster::IdentifyFormat format, const QgsRectangle &boundingBox = QgsRectangle(), int width = 0, int height = 0, int dpi = 96 );
%Docstring
:rtype: QgsRasterIdentifyResult
%End

4
python/core/raster/qgsrasterviewport.sip
View File

@ -6,10 +6,10 @@ struct QgsRasterViewPort
%End
/** \brief Coordinate (in output device coordinate system) of top left corner
* of the part of the raster that is to be rendered.*/
QgsPoint mTopLeftPoint;
QgsPointXY mTopLeftPoint;
/** \brief Coordinate (in output device coordinate system) of bottom right corner
* of the part of the raster that is to be rendered.*/
QgsPoint mBottomRightPoint;
QgsPointXY mBottomRightPoint;
/** \brief Width, number of columns to be rendered */
int mWidth;

2
python/core/symbology-ng/qgsrenderer.sip
View File

@ -357,7 +357,7 @@ class QgsFeatureRenderer
* Creates a point in screen coordinates from a wkb string in map
* coordinates
*/
static QPointF _getPoint( QgsRenderContext &context, const QgsPointV2 &point );
static QPointF _getPoint( QgsRenderContext &context, const QgsPoint &point );
/**
* Clones generic renderer data to another renderer.

4
python/core/symbology-ng/qgssymbol.sip
View File

@ -241,9 +241,9 @@ class QgsSymbol
QgsSymbol( SymbolType type, const QgsSymbolLayerList &layers /Transfer/ );
/**
* Creates a point in screen coordinates from a QgsPointV2 in map coordinates
* Creates a point in screen coordinates from a QgsPoint in map coordinates
*/
static QPointF _getPoint( QgsRenderContext &context, const QgsPointV2 &point );
static QPointF _getPoint( QgsRenderContext &context, const QgsPoint &point );
/**
* Creates a line string in screen coordinates from a QgsCurve in map

20
python/gui/qgsadvanceddigitizingdockwidget.sip
View File

@ -158,7 +158,7 @@ class QgsAdvancedDigitizingDockWidget : QgsDockWidget
};
static bool lineCircleIntersection( const QgsPoint &center, const double radius, const QList<QgsPoint> &segment, QgsPoint &intersection );
static bool lineCircleIntersection( const QgsPointXY &center, const double radius, const QList<QgsPointXY> &segment, QgsPointXY &intersection );
%Docstring
.. note::
@ -280,28 +280,28 @@ Constraint on a common angle
:rtype: bool
%End
QgsPoint currentPoint( bool *exists = 0 ) const;
QgsPointXY currentPoint( bool *exists = 0 ) const;
%Docstring
The last point.
Helper for the CAD point list. The CAD point list is the list of points
currently digitized. It contains both "normal" points and intermediate points (construction mode).
:rtype: QgsPoint
:rtype: QgsPointXY
%End
QgsPoint previousPoint( bool *exists = 0 ) const;
QgsPointXY previousPoint( bool *exists = 0 ) const;
%Docstring
The previous point.
Helper for the CAD point list. The CAD point list is the list of points
currently digitized. It contains both "normal" points and intermediate points (construction mode).
:rtype: QgsPoint
:rtype: QgsPointXY
%End
QgsPoint penultimatePoint( bool *exists = 0 ) const;
QgsPointXY penultimatePoint( bool *exists = 0 ) const;
%Docstring
The penultimate point.
Helper for the CAD point list. The CAD point list is the list of points
currently digitized. It contains both "normal" points and intermediate points (construction mode).
:rtype: QgsPoint
:rtype: QgsPointXY
%End
int pointsCount() const;
@ -316,10 +316,10 @@ Constraint on a common angle
:rtype: bool
%End
QList<QgsPoint> snappedSegment() const;
QList<QgsPointXY> snappedSegment() const;
%Docstring
Snapped to a segment
:rtype: list of QgsPoint
:rtype: list of QgsPointXY
%End
QAction *enableAction();
@ -355,7 +355,7 @@ return the action used to enable/disable the tools
Remove any previously emitted warnings (if any)
%End
void pointChanged( const QgsPoint &point );
void pointChanged( const QgsPointXY &point );
%Docstring
Sometimes a constraint may change the current point out of a mouse event. This happens normally
when a constraint is toggled.

2
python/gui/qgsgeometryrubberband.sip
View File

@ -49,7 +49,7 @@ Sets geometry (takes ownership). Geometry is expected to be in map coordinates
Returns a pointer to the geometry
:rtype: QgsAbstractGeometry
%End
void moveVertex( QgsVertexId id, const QgsPointV2 &newPos );
void moveVertex( QgsVertexId id, const QgsPoint &newPos );
%Docstring
Moves vertex to new position (in map coordinates)
%End

10
python/gui/qgsmapcanvas.sip
View File

@ -180,15 +180,15 @@ Set the extent of the map canvas
.. versionadded:: 2.8
%End
void setCenter( const QgsPoint &center );
void setCenter( const QgsPointXY &center );
%Docstring
.. versionadded:: 2.8
%End
QgsPoint center() const;
QgsPointXY center() const;
%Docstring
.. versionadded:: 2.8
:rtype: QgsPoint
:rtype: QgsPointXY
%End
void zoomToFullExtent();
@ -408,7 +408,7 @@ set wheel zoom factor (should be greater than 1)
Zoom to a specific scale
%End
void zoomByFactor( double scaleFactor, const QgsPoint *center = 0 );
void zoomByFactor( double scaleFactor, const QgsPointXY *center = 0 );
%Docstring
If point is given, re-center on it
%End
@ -669,7 +669,7 @@ Zoom out with fixed factor
signals:
void xyCoordinates( const QgsPoint &p );
void xyCoordinates( const QgsPointXY &p );
%Docstring
Emits current mouse position
.. note::

6
python/gui/qgsmapcanvasitem.sip
View File

@ -71,13 +71,13 @@ returns canvas item rectangle in map units
sets canvas item rectangle in map units
%End
QgsPoint toMapCoordinates( QPoint point ) const;
QgsPointXY toMapCoordinates( QPoint point ) const;
%Docstring
transformation from screen coordinates to map coordinates
:rtype: QgsPoint
:rtype: QgsPointXY
%End
QPointF toCanvasCoordinates( const QgsPoint &point ) const;
QPointF toCanvasCoordinates( const QgsPointXY &point ) const;
%Docstring
transformation from map coordinates to screen coordinates
:rtype: QPointF

18
python/gui/qgsmapmouseevent.sip
View File

@ -59,16 +59,16 @@ class QgsMapMouseEvent : QMouseEvent
\param modifiers Keyboard modifiers
%End
QgsPoint snapPoint( SnappingMode snappingMode );
QgsPointXY snapPoint( SnappingMode snappingMode );
%Docstring
snapPoint will snap the points using the map canvas snapping utils configuration
.. note::
if snapping did not succeeded, the map point will be reset to its original position
:rtype: QgsPoint
:rtype: QgsPointXY
%End
QList<QgsPoint> snapSegment( SnappingMode snappingMode, bool *snapped = 0, bool allLayers = false ) const;
QList<QgsPointXY> snapSegment( SnappingMode snappingMode, bool *snapped = 0, bool allLayers = false ) const;
%Docstring
Returns the first snapped segment. If the cached snapped match is a segment, it will simply return it.
Otherwise it will try to snap a segment according to the event's snapping mode. In this case the cache
@ -76,7 +76,7 @@ class QgsMapMouseEvent : QMouseEvent
\param snappingMode Specify if the default project settings or all layers should be used for snapping
\param snapped if given, determines if a segment has been snapped
\param allLayers if true, override snapping mode
:rtype: list of QgsPoint
:rtype: list of QgsPointXY
%End
bool isSnapped() const;
@ -88,11 +88,11 @@ class QgsMapMouseEvent : QMouseEvent
:rtype: bool
%End
QgsPoint mapPoint() const;
QgsPointXY mapPoint() const;
%Docstring
mapPoint returns the point in coordinates
:return: the point in map coordinates, after snapping if requested in the event.
:rtype: QgsPoint
:rtype: QgsPointXY
%End
QgsPointLocator::Match mapPointMatch() const;
@ -103,7 +103,7 @@ class QgsMapMouseEvent : QMouseEvent
:rtype: QgsPointLocator.Match
%End
void setMapPoint( const QgsPoint &point );
void setMapPoint( const QgsPointXY &point );
%Docstring
Set the (snapped) point this event points to in map coordinates.
The point in pixel coordinates will be calculated accordingly.
@ -111,12 +111,12 @@ class QgsMapMouseEvent : QMouseEvent
\param point The point in map coordinates
%End
QgsPoint originalMapPoint() const;
QgsPointXY originalMapPoint() const;
%Docstring
Returns the original, unmodified map point of the mouse cursor.
:return: The cursor position in map coordinates.
:rtype: QgsPoint
:rtype: QgsPointXY
%End
QPoint pixelPoint() const;

2
python/gui/qgsmaptip.sip
View File

@ -26,7 +26,7 @@ class QgsMapTip: QWidget
* @param mpMapCanvas a map canvas on which the tip is drawn
*/
void showMapTip( QgsMapLayer * thepLayer,
QgsPoint & mapPosition,
QgsPointXY & mapPosition,
QPoint & pixelPosition,
QgsMapCanvas *mpMapCanvas );
/** Clear the current maptip if it exists

12
python/gui/qgsmaptool.sip
View File

@ -141,26 +141,26 @@ class QgsMapTool : QObject
QgsMapTool( QgsMapCanvas *canvas /TransferThis/ );
//! transformation from screen coordinates to map coordinates
QgsPoint toMapCoordinates( QPoint point );
QgsPointXY toMapCoordinates( QPoint point );
//! transformation from screen coordinates to layer's coordinates
QgsPoint toLayerCoordinates( const QgsMapLayer *layer, QPoint point );
QgsPointXY toLayerCoordinates( const QgsMapLayer *layer, QPoint point );
//! transformation from map coordinates to layer's coordinates
QgsPoint toLayerCoordinates( const QgsMapLayer *layer, const QgsPoint &point );
QgsPointXY toLayerCoordinates( const QgsMapLayer *layer, const QgsPointXY &point );
//!transformation from layer's coordinates to map coordinates (which is different in case reprojection is used)
QgsPoint toMapCoordinates( const QgsMapLayer *layer, const QgsPoint &point );
QgsPointXY toMapCoordinates( const QgsMapLayer *layer, const QgsPointXY &point );
//!transformation from layer's coordinates to map coordinates (which is different in case reprojection is used)
//! @note available in python bindings as toMapCoordinatesV2
QgsPointV2 toMapCoordinates( const QgsMapLayer *layer, const QgsPointV2 &point ) /PyName=toMapCoordinatesV2/;
QgsPoint toMapCoordinates( const QgsMapLayer *layer, const QgsPoint &point ) /PyName=toMapCoordinatesV2/;
//! trnasformation of the rect from map coordinates to layer's coordinates
QgsRectangle toLayerCoordinates( const QgsMapLayer *layer, const QgsRectangle &rect );
//! transformation from map coordinates to screen coordinates
QPoint toCanvasCoordinates( const QgsPoint &point );
QPoint toCanvasCoordinates( const QgsPointXY &point );
};

14
python/gui/qgsmaptoolcapture.sip
View File

@ -76,7 +76,7 @@ class QgsMapToolCapture : public QgsMapToolAdvancedDigitizing
* 1 if the current layer is null or not a vector layer
* 2 if the transformation failed
*/
int nextPoint( const QgsPointV2 &mapPoint, QgsPointV2 &layerPoint );
int nextPoint( const QgsPoint &mapPoint, QgsPoint &layerPoint );
/** Converts a point to map coordinates and layer coordinates
* @param p the input point
@ -87,26 +87,26 @@ class QgsMapToolCapture : public QgsMapToolAdvancedDigitizing
* 1 if the current layer is null or not a vector layer
* 2 if the transformation failed
*/
int nextPoint( QPoint p, QgsPointV2 &layerPoint, QgsPointV2 &mapPoint );
int nextPoint( QPoint p, QgsPoint &layerPoint, QgsPoint &mapPoint );
/** Fetches the original point from the source layer if it has the same
* CRS as the current layer.
* @return 0 in case of success, 1 if not applicable (CRS mismatch), 2 in case of failure
* @note added in 2.14
*/
int fetchLayerPoint( const QgsPointLocator::Match &match, QgsPointV2 &layerPoint );
int fetchLayerPoint( const QgsPointLocator::Match &match, QgsPoint &layerPoint );
/** Adds a point to the rubber band (in map coordinates) and to the capture list (in layer coordinates)
* @return 0 in case of success, 1 if current layer is not a vector layer, 2 if coordinate transformation failed
*/
int addVertex( const QgsPoint &point );
int addVertex( const QgsPointXY &point );
/** Variant to supply more information in the case of snapping
* @param mapPoint The vertex to add in map coordinates
* @param match Data about the snapping match. Can be an invalid match, if point not snapped.
* @note added in 2.14
*/
int addVertex( const QgsPoint &mapPoint, const QgsPointLocator::Match &match );
int addVertex( const QgsPointXY &mapPoint, const QgsPointLocator::Match &match );
/** Removes the last vertex from mRubberBand and mCaptureList*/
void undo();
@ -139,14 +139,14 @@ class QgsMapToolCapture : public QgsMapToolAdvancedDigitizing
* List of digitized points
* @return List of points
*/
QList<QgsPoint> points();
QList<QgsPointXY> points();
/**
* Set the points on which to work
*
* @param pointList A list of points
*/
void setPoints( const QList<QgsPoint> &pointList );
void setPoints( const QList<QgsPointXY> &pointList );
/**
* Close an open polygon

2
python/gui/qgsmaptooledit.sip
View File

@ -51,7 +51,7 @@ class QgsMapToolEdit: QgsMapTool
* @param geom list of points (in layer coordinate system)
* @return 0 in case of success
*/
int addTopologicalPoints( const QList<QgsPoint> &geom );
int addTopologicalPoints( const QList<QgsPointXY> &geom );
/** Display a timed message bar noting the active layer is not vector. */
void notifyNotVectorLayer();

2
python/gui/qgsmaptoolemitpoint.sip
View File

@ -22,5 +22,5 @@ class QgsMapToolEmitPoint : QgsMapTool
signals:
//! signal emitted on canvas click
void canvasClicked( const QgsPoint &point, Qt::MouseButton button );
void canvasClicked( const QgsPointXY &point, Qt::MouseButton button );
};

6
python/gui/qgsmaptoolidentify.sip
View File

@ -105,10 +105,10 @@ class QgsMapToolIdentify : QgsMapTool
QList<QgsMapToolIdentify::IdentifyResult> identify( int x, int y, IdentifyMode mode, const QList<QgsMapLayer*> &layerList, LayerType layerType = AllLayers );
/** Call the right method depending on layer type */
bool identifyLayer( QList<QgsMapToolIdentify::IdentifyResult> *results, QgsMapLayer *layer, const QgsPoint &point, const QgsRectangle &viewExtent, double mapUnitsPerPixel, LayerType layerType = AllLayers );
bool identifyLayer( QList<QgsMapToolIdentify::IdentifyResult> *results, QgsMapLayer *layer, const QgsPointXY &point, const QgsRectangle &viewExtent, double mapUnitsPerPixel, LayerType layerType = AllLayers );
bool identifyRasterLayer( QList<QgsMapToolIdentify::IdentifyResult> *results, QgsRasterLayer *layer, QgsPoint point, const QgsRectangle &viewExtent, double mapUnitsPerPixel );
bool identifyVectorLayer( QList<QgsMapToolIdentify::IdentifyResult> *results, QgsVectorLayer *layer, const QgsPoint &point );
bool identifyRasterLayer( QList<QgsMapToolIdentify::IdentifyResult> *results, QgsRasterLayer *layer, QgsPointXY point, const QgsRectangle &viewExtent, double mapUnitsPerPixel );
bool identifyVectorLayer( QList<QgsMapToolIdentify::IdentifyResult> *results, QgsVectorLayer *layer, const QgsPointXY &point );
private:

8
python/gui/qgsrubberband.sip
View File

@ -53,7 +53,7 @@ class QgsRubberBand: QgsMapCanvasItem
void reset( QgsWkbTypes::GeometryType geometryType = QgsWkbTypes::LineGeometry );
void addPoint( const QgsPoint &p, bool doUpdate = true, int geometryIndex = 0 );
void addPoint( const QgsPointXY &p, bool doUpdate = true, int geometryIndex = 0 );
void closePoints( bool doUpdate = true, int geometryIndex = 0 );
@ -61,9 +61,9 @@ class QgsRubberBand: QgsMapCanvasItem
void removeLastPoint( int geometryIndex = 0, bool doUpdate = true );
void movePoint( const QgsPoint &p, int geometryIndex = 0 );
void movePoint( const QgsPointXY &p, int geometryIndex = 0 );
void movePoint( int index, const QgsPoint &p, int geometryIndex = 0 );
void movePoint( int index, const QgsPointXY &p, int geometryIndex = 0 );
int partSize( int geometryIndex ) const;
@ -79,7 +79,7 @@ class QgsRubberBand: QgsMapCanvasItem
int numberOfVertices() const;
const QgsPoint *getPoint( int i, int j = 0 ) const;
const QgsPointXY *getPoint( int i, int j = 0 ) const;
QgsGeometry asGeometry() const;

2
python/gui/qgsvertexmarker.sip
View File

@ -31,7 +31,7 @@ class QgsVertexMarker : QgsMapCanvasItem
QgsVertexMarker( QgsMapCanvas *mapCanvas /TransferThis/ );
void setCenter( const QgsPoint &point );
void setCenter( const QgsPointXY &point );
void setIconType( int iconType );

12
python/plugins/MetaSearch/dialogs/maindialog.py
View File

@ -43,7 +43,7 @@ from qgis.PyQt.QtWidgets import (QApplication, QDialog, QComboBox,
from qgis.PyQt.QtGui import QColor, QCursor
from qgis.core import (QgsApplication, QgsCoordinateReferenceSystem,
QgsCoordinateTransform, QgsGeometry, QgsPoint,
QgsCoordinateTransform, QgsGeometry, QgsPointXY,
QgsProviderRegistry, QgsSettings)
from qgis.gui import QgsRubberBand
@ -407,10 +407,10 @@ class MetaSearchDialog(QDialog, BASE_CLASS):
src = QgsCoordinateReferenceSystem(crsid)
dest = QgsCoordinateReferenceSystem(4326)
xform = QgsCoordinateTransform(src, dest)
minxy = xform.transform(QgsPoint(extent.xMinimum(),
extent.yMinimum()))
maxxy = xform.transform(QgsPoint(extent.xMaximum(),
extent.yMaximum()))
minxy = xform.transform(QgsPointXY(extent.xMinimum(),
extent.yMinimum()))
maxxy = xform.transform(QgsPointXY(extent.xMaximum(),
extent.yMaximum()))
minx, miny = minxy
maxx, maxy = maxxy
else: # 4326
@ -980,7 +980,7 @@ def _get_field_value(field):
def bbox_to_polygon(bbox):
"""converts OWSLib bbox object to list of QgsPoint objects"""
"""converts OWSLib bbox object to list of QgsPointXY objects"""
if all([bbox.minx is not None,
bbox.maxx is not None,

6
python/plugins/processing/algs/qgis/Delaunay.py
View File

@ -35,7 +35,7 @@ from qgis.core import (QgsField,
QgsFeatureRequest,
QgsFeature,
QgsGeometry,
QgsPoint,
QgsPointXY,
QgsWkbTypes,
QgsProcessingUtils,
QgsFields)
@ -134,9 +134,9 @@ class Delaunay(GeoAlgorithm):
inFeat = next(layer.getFeatures(request))
geom = QgsGeometry(inFeat.geometry())
if geom.isMultipart():
point = QgsPoint(geom.asMultiPoint()[n])
point = QgsPointXY(geom.asMultiPoint()[n])
else:
point = QgsPoint(geom.asPoint())
point = QgsPointXY(geom.asPoint())
polygon.append(point)
if step <= 3:
attrs.append(ids[index])

10
python/plugins/processing/algs/qgis/ExtentFromLayer.py
View File

@ -31,7 +31,7 @@ from qgis.PyQt.QtGui import QIcon
from qgis.PyQt.QtCore import QVariant
from qgis.core import (QgsField,
QgsPoint,
QgsPointXY,
QgsGeometry,
QgsFeature,
QgsWkbTypes,
@ -115,8 +115,8 @@ class ExtentFromLayer(GeoAlgorithm):
area = width * height
perim = 2 * width + 2 * height
rect = [QgsPoint(minx, miny), QgsPoint(minx, maxy), QgsPoint(maxx,
maxy), QgsPoint(maxx, miny), QgsPoint(minx, miny)]
rect = [QgsPointXY(minx, miny), QgsPointXY(minx, maxy), QgsPointXY(maxx,
maxy), QgsPointXY(maxx, miny), QgsPointXY(minx, miny)]
geometry = QgsGeometry().fromPolygon([rect])
feat = QgsFeature()
feat.setGeometry(geometry)
@ -151,8 +151,8 @@ class ExtentFromLayer(GeoAlgorithm):
cnty = miny + height / 2.0
area = width * height
perim = 2 * width + 2 * height
rect = [QgsPoint(minx, miny), QgsPoint(minx, maxy), QgsPoint(maxx,
maxy), QgsPoint(maxx, miny), QgsPoint(minx, miny)]
rect = [QgsPointXY(minx, miny), QgsPointXY(minx, maxy), QgsPointXY(maxx,
maxy), QgsPointXY(maxx, miny), QgsPointXY(minx, miny)]
geometry = QgsGeometry().fromPolygon([rect])
feat.setGeometry(geometry)

10
python/plugins/processing/algs/qgis/GridLine.py
View File

@ -35,7 +35,7 @@ from qgis.core import (QgsRectangle,
QgsField,
QgsFeature,
QgsGeometry,
QgsPointV2,
QgsPoint,
QgsLineString,
QgsWkbTypes,
QgsFields)
@ -150,8 +150,8 @@ class GridLine(GeoAlgorithm):
count_update = count_max * 0.10
y = bbox.yMaximum()
while y >= bbox.yMinimum():
pt1 = QgsPointV2(bbox.xMinimum(), y)
pt2 = QgsPointV2(bbox.xMaximum(), y)
pt1 = QgsPoint(bbox.xMinimum(), y)
pt2 = QgsPoint(bbox.xMaximum(), y)
line = QgsLineString()
line.setPoints([pt1, pt2])
feat.setGeometry(QgsGeometry(line))
@ -177,8 +177,8 @@ class GridLine(GeoAlgorithm):
count_update = count_max * 0.10
x = bbox.xMinimum()
while x <= bbox.xMaximum():
pt1 = QgsPointV2(x, bbox.yMaximum())
pt2 = QgsPointV2(x, bbox.yMinimum())
pt1 = QgsPoint(x, bbox.yMaximum())
pt2 = QgsPoint(x, bbox.yMinimum())
line = QgsLineString()
line.setPoints([pt1, pt2])
feat.setGeometry(QgsGeometry(line))

36
python/plugins/processing/algs/qgis/GridPolygon.py
View File

@ -35,7 +35,7 @@ from qgis.core import (QgsRectangle,
QgsField,
QgsFeature,
QgsGeometry,
QgsPoint,
QgsPointXY,
QgsWkbTypes,
QgsFields)
@ -173,11 +173,11 @@ class GridPolygon(GeoAlgorithm):
y2 = y1 - vSpacing
polyline = []
polyline.append(QgsPoint(x1, y1))
polyline.append(QgsPoint(x2, y1))
polyline.append(QgsPoint(x2, y2))
polyline.append(QgsPoint(x1, y2))
polyline.append(QgsPoint(x1, y1))
polyline.append(QgsPointXY(x1, y1))
polyline.append(QgsPointXY(x2, y1))
polyline.append(QgsPointXY(x2, y2))
polyline.append(QgsPointXY(x1, y2))
polyline.append(QgsPointXY(x1, y1))
ft.setGeometry(QgsGeometry.fromPolygon([polyline]))
ft.setAttributes([x1, y1, x2, y2, id])
@ -225,11 +225,11 @@ class GridPolygon(GeoAlgorithm):
y3 = y - (((row * 2) + 3) * halfVSpacing)
polyline = []
polyline.append(QgsPoint(x1, y2))
polyline.append(QgsPoint(x2, y1))
polyline.append(QgsPoint(x3, y2))
polyline.append(QgsPoint(x2, y3))
polyline.append(QgsPoint(x1, y2))
polyline.append(QgsPointXY(x1, y2))
polyline.append(QgsPointXY(x2, y1))
polyline.append(QgsPointXY(x3, y2))
polyline.append(QgsPointXY(x2, y3))
polyline.append(QgsPointXY(x1, y2))
ft.setGeometry(QgsGeometry.fromPolygon([polyline]))
ft.setAttributes([x1, y1, x3, y3, id])
@ -287,13 +287,13 @@ class GridPolygon(GeoAlgorithm):
y3 = originY + (row * vOverlay) - (((row * 2) + 3) * halfVSpacing) # lo
polyline = []
polyline.append(QgsPoint(x1, y2))
polyline.append(QgsPoint(x2, y1))
polyline.append(QgsPoint(x3, y1))
polyline.append(QgsPoint(x4, y2))
polyline.append(QgsPoint(x3, y3))
polyline.append(QgsPoint(x2, y3))
polyline.append(QgsPoint(x1, y2))
polyline.append(QgsPointXY(x1, y2))
polyline.append(QgsPointXY(x2, y1))
polyline.append(QgsPointXY(x3, y1))
polyline.append(QgsPointXY(x4, y2))
polyline.append(QgsPointXY(x3, y3))
polyline.append(QgsPointXY(x2, y3))
polyline.append(QgsPointXY(x1, y2))
ft.setGeometry(QgsGeometry.fromPolygon([polyline]))
ft.setAttributes([x1, y1, x4, y3, id])

6
python/plugins/processing/algs/qgis/Gridify.py
View File

@ -27,7 +27,7 @@ __revision__ = '$Format:%H$'
from qgis.core import (QgsGeometry,
QgsFeature,
QgsPoint,
QgsPointXY,
QgsWkbTypes,
QgsApplication,
QgsMessageLog,
@ -156,8 +156,8 @@ class Gridify(GeoAlgorithm):
def _gridify(self, points, hSpacing, vSpacing):
nPoints = []
for p in points:
nPoints.append(QgsPoint(round(p.x() / hSpacing, 0) * hSpacing,
round(p.y() / vSpacing, 0) * vSpacing))
nPoints.append(QgsPointXY(round(p.x() / hSpacing, 0) * hSpacing,
round(p.y() / vSpacing, 0) * vSpacing))
i = 0
# Delete overlapping points

4
python/plugins/processing/algs/qgis/HubLines.py
View File

@ -28,7 +28,7 @@ __revision__ = '$Format:%H$'
from qgis.core import (QgsFeature,
QgsGeometry,
QgsPoint,
QgsPointXY,
QgsWkbTypes,
QgsApplication,
QgsProcessingUtils)
@ -109,7 +109,7 @@ class HubLines(GeoAlgorithm):
f = QgsFeature()
f.setAttributes(spokepoint.attributes())
f.setGeometry(QgsGeometry.fromPolyline(
[QgsPoint(spokeX, spokeY), QgsPoint(hubX, hubY)]))
[QgsPointXY(spokeX, spokeY), QgsPointXY(hubX, hubY)]))
writer.addFeature(f)
break

4
python/plugins/processing/algs/qgis/MeanCoords.py
View File

@ -31,7 +31,7 @@ import os
from qgis.PyQt.QtGui import QIcon
from qgis.PyQt.QtCore import QVariant
from qgis.core import QgsField, QgsFeature, QgsGeometry, QgsPoint, QgsWkbTypes, QgsProcessingUtils, QgsFields
from qgis.core import QgsField, QgsFeature, QgsGeometry, QgsPointXY, QgsWkbTypes, QgsProcessingUtils, QgsFields
from processing.core.GeoAlgorithm import GeoAlgorithm
from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
@ -138,7 +138,7 @@ class MeanCoords(GeoAlgorithm):
outFeat = QgsFeature()
cx = values[0] / values[2]
cy = values[1] / values[2]
meanPoint = QgsPoint(cx, cy)
meanPoint = QgsPointXY(cx, cy)
outFeat.setGeometry(QgsGeometry.fromPoint(meanPoint))
outFeat.setAttributes([cx, cy, clazz])

4
python/plugins/processing/algs/qgis/PointsDisplacement.py
View File

@ -31,7 +31,7 @@ from qgis.core import (QgsApplication,
QgsFeatureRequest,
QgsFeature,
QgsGeometry,
QgsPoint,
QgsPointXY,
QgsProcessingUtils)
from processing.tools import dataobjects
from processing.core.GeoAlgorithm import GeoAlgorithm
@ -123,7 +123,7 @@ class PointsDisplacement(GeoAlgorithm):
dx = radius * sinusCurrentAngle
dy = radius * cosinusCurrentAngle
new_point = QgsPoint(old_point.x() + dx, old_point.y() + dy)
new_point = QgsPointXY(old_point.x() + dx, old_point.y() + dy)
out_feature = QgsFeature()
out_feature.setGeometry(QgsGeometry.fromPoint(new_point))
out_feature.setAttributes(f.attributes())

4
python/plugins/processing/algs/qgis/PointsFromLines.py
View File

@ -34,7 +34,7 @@ from qgis.core import (QgsApplication,
QgsFields,
QgsField,
QgsGeometry,
QgsPoint,
QgsPointXY,
QgsWkbTypes,
QgsProcessingUtils)
from processing.tools import raster, dataobjects
@ -190,7 +190,7 @@ class PointsFromLines(GeoAlgorithm):
def createPoint(self, pX, pY, geoTransform, writer, feature):
(x, y) = raster.pixelToMap(pX, pY, geoTransform)
feature.setGeometry(QgsGeometry.fromPoint(QgsPoint(x, y)))
feature.setGeometry(QgsGeometry.fromPoint(QgsPointXY(x, y)))
feature['id'] = self.fid
feature['line_id'] = self.lineId
feature['point_id'] = self.pointId

4
python/plugins/processing/algs/qgis/PointsFromPolygons.py
View File

@ -34,7 +34,7 @@ from qgis.core import (QgsApplication,
QgsFeature,
QgsGeometry,
QgsWkbTypes,
QgsPointV2,
QgsPoint,
QgsProcessingUtils)
from qgis.PyQt.QtCore import QVariant
from processing.core.GeoAlgorithm import GeoAlgorithm
@ -118,7 +118,7 @@ class PointsFromPolygons(GeoAlgorithm):
for row in range(startRow, endRow + 1):
for col in range(startColumn, endColumn + 1):
(x, y) = raster.pixelToMap(row, col, geoTransform)
point = QgsPointV2()
point = QgsPoint()
point.setX(x)
point.setY(y)

4
python/plugins/processing/algs/qgis/PointsLayerFromTable.py
View File

@ -27,7 +27,7 @@ __revision__ = '$Format:%H$'
from qgis.core import (QgsApplication,
QgsWkbTypes,
QgsPointV2,
QgsPoint,
QgsCoordinateReferenceSystem,
QgsGeometry,
QgsProcessingUtils)
@ -120,7 +120,7 @@ class PointsLayerFromTable(GeoAlgorithm):
x = float(attrs[x_field_index])
y = float(attrs[y_field_index])
point = QgsPointV2(x, y)
point = QgsPoint(x, y)
if z_field_index is not None:
try:

4
python/plugins/processing/algs/qgis/RandomPointsAlongLines.py
View File

@ -38,7 +38,7 @@ from qgis.core import (QgsApplication,
QgsDistanceArea,
QgsFeatureRequest,
QgsFeature,
QgsPoint,
QgsPointXY,
QgsMessageLog,
QgsProcessingUtils)
@ -133,7 +133,7 @@ class RandomPointsAlongLines(GeoAlgorithm):
ry = (startPoint.y() + d * endPoint.y()) / (1 + d)
# generate random point
pnt = QgsPoint(rx, ry)
pnt = QgsPointXY(rx, ry)
geom = QgsGeometry.fromPoint(pnt)
if vector.checkMinDistance(pnt, index, minDistance, points):
f = QgsFeature(nPoints)

4
python/plugins/processing/algs/qgis/RandomPointsExtent.py
View File

@ -32,7 +32,7 @@ import random
from qgis.PyQt.QtGui import QIcon
from qgis.PyQt.QtCore import QVariant
from qgis.core import (QgsGeometry, QgsRectangle, QgsFeature, QgsFields, QgsWkbTypes,
QgsField, QgsSpatialIndex, QgsPoint,
QgsField, QgsSpatialIndex, QgsPointXY,
QgsCoordinateReferenceSystem,
QgsMessageLog,
QgsProcessingUtils)
@ -112,7 +112,7 @@ class RandomPointsExtent(GeoAlgorithm):
rx = xMin + (xMax - xMin) * random.random()
ry = yMin + (yMax - yMin) * random.random()
pnt = QgsPoint(rx, ry)
pnt = QgsPointXY(rx, ry)
geom = QgsGeometry.fromPoint(pnt)
if geom.within(extent) and \
vector.checkMinDistance(pnt, index, minDistance, points):

4
python/plugins/processing/algs/qgis/RandomPointsLayer.py
View File

@ -31,7 +31,7 @@ import random
from qgis.PyQt.QtGui import QIcon
from qgis.PyQt.QtCore import QVariant
from qgis.core import (QgsGeometry, QgsFields, QgsField, QgsSpatialIndex, QgsWkbTypes,
QgsPoint, QgsFeature, QgsFeatureRequest,
QgsPointXY, QgsFeature, QgsFeatureRequest,
QgsMessageLog,
QgsProcessingUtils)
@ -98,7 +98,7 @@ class RandomPointsLayer(GeoAlgorithm):
rx = bbox.xMinimum() + bbox.width() * random.random()
ry = bbox.yMinimum() + bbox.height() * random.random()
pnt = QgsPoint(rx, ry)
pnt = QgsPointXY(rx, ry)
geom = QgsGeometry.fromPoint(pnt)
ids = idxLayer.intersects(geom.buffer(5, 5).boundingBox())
if len(ids) > 0 and \

4
python/plugins/processing/algs/qgis/RandomPointsPolygonsFixed.py
View File

@ -31,7 +31,7 @@ import random
from qgis.PyQt.QtGui import QIcon
from qgis.PyQt.QtCore import QVariant
from qgis.core import (QgsFields, QgsField, QgsDistanceArea, QgsGeometry, QgsWkbTypes,
QgsSpatialIndex, QgsPoint, QgsFeature,
QgsSpatialIndex, QgsPointXY, QgsFeature,
QgsMessageLog,
QgsProcessingUtils)
@ -119,7 +119,7 @@ class RandomPointsPolygonsFixed(GeoAlgorithm):
rx = bbox.xMinimum() + bbox.width() * random.random()
ry = bbox.yMinimum() + bbox.height() * random.random()
pnt = QgsPoint(rx, ry)
pnt = QgsPointXY(rx, ry)
geom = QgsGeometry.fromPoint(pnt)
if geom.within(fGeom) and \
vector.checkMinDistance(pnt, index, minDistance, points):

4
python/plugins/processing/algs/qgis/RandomPointsPolygonsVariable.py
View File

@ -30,7 +30,7 @@ import random
from qgis.PyQt.QtGui import QIcon
from qgis.PyQt.QtCore import QVariant
from qgis.core import (QgsFields, QgsField, QgsFeature, QgsPoint, QgsWkbTypes,
from qgis.core import (QgsFields, QgsField, QgsFeature, QgsPointXY, QgsWkbTypes,
QgsGeometry, QgsSpatialIndex, QgsDistanceArea,
QgsMessageLog,
QgsProcessingUtils)
@ -120,7 +120,7 @@ class RandomPointsPolygonsVariable(GeoAlgorithm):
rx = bbox.xMinimum() + bbox.width() * random.random()
ry = bbox.yMinimum() + bbox.height() * random.random()
pnt = QgsPoint(rx, ry)
pnt = QgsPointXY(rx, ry)
geom = QgsGeometry.fromPoint(pnt)
if geom.within(fGeom) and \
vector.checkMinDistance(pnt, index, minDistance, points):

20
python/plugins/processing/algs/qgis/RectanglesOvalsDiamondsFixed.py
View File

@ -31,7 +31,7 @@ import math
from qgis.core import (QgsApplication,
QgsFeature,
QgsGeometry,
QgsPoint,
QgsPointXY,
QgsWkbTypes,
QgsProcessingUtils)
@ -127,8 +127,8 @@ class RectanglesOvalsDiamondsFixed(GeoAlgorithm):
x = point.x()
y = point.y()
points = [(-xOffset, -yOffset), (-xOffset, yOffset), (xOffset, yOffset), (xOffset, -yOffset)]
polygon = [[QgsPoint(i[0] * math.cos(phi) + i[1] * math.sin(phi) + x,
-i[0] * math.sin(phi) + i[1] * math.cos(phi) + y) for i in points]]
polygon = [[QgsPointXY(i[0] * math.cos(phi) + i[1] * math.sin(phi) + x,
-i[0] * math.sin(phi) + i[1] * math.cos(phi) + y) for i in points]]
ft.setGeometry(QgsGeometry.fromPolygon(polygon))
ft.setAttributes(feat.attributes())
@ -139,7 +139,7 @@ class RectanglesOvalsDiamondsFixed(GeoAlgorithm):
x = point.x()
y = point.y()
points = [(-xOffset, -yOffset), (-xOffset, yOffset), (xOffset, yOffset), (xOffset, -yOffset)]
polygon = [[QgsPoint(i[0] + x, i[1] + y) for i in points]]
polygon = [[QgsPointXY(i[0] + x, i[1] + y) for i in points]]
ft.setGeometry(QgsGeometry.fromPolygon(polygon))
ft.setAttributes(feat.attributes())
@ -158,8 +158,8 @@ class RectanglesOvalsDiamondsFixed(GeoAlgorithm):
x = point.x()
y = point.y()
points = [(0.0, -yOffset), (-xOffset, 0.0), (0.0, yOffset), (xOffset, 0.0)]
polygon = [[QgsPoint(i[0] * math.cos(phi) + i[1] * math.sin(phi) + x,
-i[0] * math.sin(phi) + i[1] * math.cos(phi) + y) for i in points]]
polygon = [[QgsPointXY(i[0] * math.cos(phi) + i[1] * math.sin(phi) + x,
-i[0] * math.sin(phi) + i[1] * math.cos(phi) + y) for i in points]]
ft.setGeometry(QgsGeometry.fromPolygon(polygon))
ft.setAttributes(feat.attributes())
@ -170,7 +170,7 @@ class RectanglesOvalsDiamondsFixed(GeoAlgorithm):
x = point.x()
y = point.y()
points = [(0.0, -yOffset), (-xOffset, 0.0), (0.0, yOffset), (xOffset, 0.0)]
polygon = [[QgsPoint(i[0] + x, i[1] + y) for i in points]]
polygon = [[QgsPointXY(i[0] + x, i[1] + y) for i in points]]
ft.setGeometry(QgsGeometry.fromPolygon(polygon))
ft.setAttributes(feat.attributes())
@ -191,8 +191,8 @@ class RectanglesOvalsDiamondsFixed(GeoAlgorithm):
points = []
for t in [(2 * math.pi) / segments * i for i in range(segments)]:
points.append((xOffset * math.cos(t), yOffset * math.sin(t)))
polygon = [[QgsPoint(i[0] * math.cos(phi) + i[1] * math.sin(phi) + x,
-i[0] * math.sin(phi) + i[1] * math.cos(phi) + y) for i in points]]
polygon = [[QgsPointXY(i[0] * math.cos(phi) + i[1] * math.sin(phi) + x,
-i[0] * math.sin(phi) + i[1] * math.cos(phi) + y) for i in points]]
ft.setGeometry(QgsGeometry.fromPolygon(polygon))
ft.setAttributes(feat.attributes())
@ -205,7 +205,7 @@ class RectanglesOvalsDiamondsFixed(GeoAlgorithm):
points = []
for t in [(2 * math.pi) / segments * i for i in range(segments)]:
points.append((xOffset * math.cos(t), yOffset * math.sin(t)))
polygon = [[QgsPoint(i[0] + x, i[1] + y) for i in points]]
polygon = [[QgsPointXY(i[0] + x, i[1] + y) for i in points]]
ft.setGeometry(QgsGeometry.fromPolygon(polygon))
ft.setAttributes(feat.attributes())

20
python/plugins/processing/algs/qgis/RectanglesOvalsDiamondsVariable.py
View File

@ -32,7 +32,7 @@ from qgis.core import (QgsApplication,
QgsWkbTypes,
QgsFeature,
QgsGeometry,
QgsPoint,
QgsPointXY,
QgsMessageLog,
QgsProcessingUtils)
@ -146,8 +146,8 @@ class RectanglesOvalsDiamondsVariable(GeoAlgorithm):
x = point.x()
y = point.y()
points = [(-xOffset, -yOffset), (-xOffset, yOffset), (xOffset, yOffset), (xOffset, -yOffset)]
polygon = [[QgsPoint(i[0] * math.cos(phi) + i[1] * math.sin(phi) + x,
-i[0] * math.sin(phi) + i[1] * math.cos(phi) + y) for i in points]]
polygon = [[QgsPointXY(i[0] * math.cos(phi) + i[1] * math.sin(phi) + x,
-i[0] * math.sin(phi) + i[1] * math.cos(phi) + y) for i in points]]
ft.setGeometry(QgsGeometry.fromPolygon(polygon))
ft.setAttributes(feat.attributes())
@ -170,7 +170,7 @@ class RectanglesOvalsDiamondsVariable(GeoAlgorithm):
x = point.x()
y = point.y()
points = [(-xOffset, -yOffset), (-xOffset, yOffset), (xOffset, yOffset), (xOffset, -yOffset)]
polygon = [[QgsPoint(i[0] + x, i[1] + y) for i in points]]
polygon = [[QgsPointXY(i[0] + x, i[1] + y) for i in points]]
ft.setGeometry(QgsGeometry.fromPolygon(polygon))
ft.setAttributes(feat.attributes())
@ -199,8 +199,8 @@ class RectanglesOvalsDiamondsVariable(GeoAlgorithm):
x = point.x()
y = point.y()
points = [(0.0, -yOffset), (-xOffset, 0.0), (0.0, yOffset), (xOffset, 0.0)]
polygon = [[QgsPoint(i[0] * math.cos(phi) + i[1] * math.sin(phi) + x,
-i[0] * math.sin(phi) + i[1] * math.cos(phi) + y) for i in points]]
polygon = [[QgsPointXY(i[0] * math.cos(phi) + i[1] * math.sin(phi) + x,
-i[0] * math.sin(phi) + i[1] * math.cos(phi) + y) for i in points]]
ft.setGeometry(QgsGeometry.fromPolygon(polygon))
ft.setAttributes(feat.attributes())
@ -223,7 +223,7 @@ class RectanglesOvalsDiamondsVariable(GeoAlgorithm):
x = point.x()
y = point.y()
points = [(0.0, -yOffset), (-xOffset, 0.0), (0.0, yOffset), (xOffset, 0.0)]
polygon = [[QgsPoint(i[0] + x, i[1] + y) for i in points]]
polygon = [[QgsPointXY(i[0] + x, i[1] + y) for i in points]]
ft.setGeometry(QgsGeometry.fromPolygon(polygon))
ft.setAttributes(feat.attributes())
@ -254,8 +254,8 @@ class RectanglesOvalsDiamondsVariable(GeoAlgorithm):
points = []
for t in [(2 * math.pi) / segments * i for i in range(segments)]:
points.append((xOffset * math.cos(t), yOffset * math.sin(t)))
polygon = [[QgsPoint(i[0] * math.cos(phi) + i[1] * math.sin(phi) + x,
-i[0] * math.sin(phi) + i[1] * math.cos(phi) + y) for i in points]]
polygon = [[QgsPointXY(i[0] * math.cos(phi) + i[1] * math.sin(phi) + x,
-i[0] * math.sin(phi) + i[1] * math.cos(phi) + y) for i in points]]
ft.setGeometry(QgsGeometry.fromPolygon(polygon))
ft.setAttributes(feat.attributes())
@ -280,7 +280,7 @@ class RectanglesOvalsDiamondsVariable(GeoAlgorithm):
points = []
for t in [(2 * math.pi) / segments * i for i in range(segments)]:
points.append((xOffset * math.cos(t), yOffset * math.sin(t)))
polygon = [[QgsPoint(i[0] + x, i[1] + y) for i in points]]
polygon = [[QgsPointXY(i[0] + x, i[1] + y) for i in points]]
ft.setGeometry(QgsGeometry.fromPolygon(polygon))
ft.setAttributes(feat.attributes())

6
python/plugins/processing/algs/qgis/RegularPoints.py
View File

@ -33,7 +33,7 @@ from math import sqrt
from qgis.PyQt.QtGui import QIcon
from qgis.PyQt.QtCore import QVariant
from qgis.core import (QgsRectangle, QgsFields, QgsField, QgsFeature, QgsWkbTypes,
QgsGeometry, QgsPoint, QgsCoordinateReferenceSystem)
QgsGeometry, QgsPointXY, QgsCoordinateReferenceSystem)
from processing.core.GeoAlgorithm import GeoAlgorithm
from processing.core.parameters import ParameterExtent
@ -127,11 +127,11 @@ class RegularPoints(GeoAlgorithm):
x = extent.xMinimum() + inset
while x <= extent.xMaximum():
if randomize:
geom = QgsGeometry().fromPoint(QgsPoint(
geom = QgsGeometry().fromPoint(QgsPointXY(
uniform(x - (pSpacing / 2.0), x + (pSpacing / 2.0)),
uniform(y - (pSpacing / 2.0), y + (pSpacing / 2.0))))
else:
geom = QgsGeometry().fromPoint(QgsPoint(x, y))
geom = QgsGeometry().fromPoint(QgsPointXY(x, y))
if extent_engine.intersects(geom.geometry()):
f.setAttribute('id', count)

4
python/plugins/processing/algs/qgis/ServiceAreaFromPoint.py
View File

@ -35,7 +35,7 @@ from qgis.core import (QgsWkbTypes,
QgsUnitTypes,
QgsFeature,
QgsGeometry,
QgsPoint,
QgsPointXY,
QgsField,
QgsFields,
QgsProcessingUtils)
@ -174,7 +174,7 @@ class ServiceAreaFromPoint(GeoAlgorithm):
tolerance = self.getParameterValue(self.TOLERANCE)
tmp = startPoint.split(',')
startPoint = QgsPoint(float(tmp[0]), float(tmp[1]))
startPoint = QgsPointXY(float(tmp[0]), float(tmp[1]))
directionField = -1
if directionFieldName is not None:

4
python/plugins/processing/algs/qgis/ShortestPathLayerToPoint.py
View File

@ -35,7 +35,7 @@ from qgis.core import (QgsWkbTypes,
QgsUnitTypes,
QgsFeature,
QgsGeometry,
QgsPoint,
QgsPointXY,
QgsFields,
QgsField,
QgsFeatureRequest,
@ -183,7 +183,7 @@ class ShortestPathLayerToPoint(GeoAlgorithm):
self.OUTPUT_LAYER).getVectorWriter(fields, QgsWkbTypes.LineString, layer.crs(), context)
tmp = endPoint.split(',')
endPoint = QgsPoint(float(tmp[0]), float(tmp[1]))
endPoint = QgsPointXY(float(tmp[0]), float(tmp[1]))
directionField = -1
if directionFieldName is not None:

4
python/plugins/processing/algs/qgis/ShortestPathPointToLayer.py
View File

@ -31,7 +31,7 @@ from collections import OrderedDict
from qgis.PyQt.QtCore import QVariant
from qgis.PyQt.QtGui import QIcon
from qgis.core import (QgsWkbTypes, QgsUnitTypes, QgsFeature, QgsGeometry, QgsPoint, QgsFields, QgsField, QgsFeatureRequest,
from qgis.core import (QgsWkbTypes, QgsUnitTypes, QgsFeature, QgsGeometry, QgsPointXY, QgsFields, QgsField, QgsFeatureRequest,
QgsMessageLog,
QgsProcessingUtils)
from qgis.analysis import (QgsVectorLayerDirector,
@ -176,7 +176,7 @@ class ShortestPathPointToLayer(GeoAlgorithm):
self.OUTPUT_LAYER).getVectorWriter(fields, QgsWkbTypes.LineString, layer.crs(), context)
tmp = startPoint.split(',')
startPoint = QgsPoint(float(tmp[0]), float(tmp[1]))
startPoint = QgsPointXY(float(tmp[0]), float(tmp[1]))
directionField = -1
if directionFieldName is not None:

6
python/plugins/processing/algs/qgis/ShortestPathPointToPoint.py
View File

@ -35,7 +35,7 @@ from qgis.core import (QgsWkbTypes,
QgsUnitTypes,
QgsFeature,
QgsGeometry,
QgsPoint,
QgsPointXY,
QgsFields,
QgsField,
QgsProcessingUtils)
@ -183,9 +183,9 @@ class ShortestPathPointToPoint(GeoAlgorithm):
self.OUTPUT_LAYER).getVectorWriter(fields, QgsWkbTypes.LineString, layer.crs(), context)
tmp = startPoint.split(',')
startPoint = QgsPoint(float(tmp[0]), float(tmp[1]))
startPoint = QgsPointXY(float(tmp[0]), float(tmp[1]))
tmp = endPoint.split(',')
endPoint = QgsPoint(float(tmp[0]), float(tmp[1]))
endPoint = QgsPointXY(float(tmp[0]), float(tmp[1]))
directionField = -1
if directionFieldName is not None:

6
python/plugins/processing/algs/qgis/TopoColors.py
View File

@ -35,7 +35,7 @@ from qgis.core import (QgsApplication,
QgsField,
QgsGeometry,
QgsSpatialIndex,
QgsPointV2,
QgsPoint,
NULL,
QgsProcessingUtils)
@ -234,7 +234,7 @@ class ColoringAlgorithm:
color_areas[feature_color] += features[feature_id].geometry().area()
elif balance == 2:
min_distances = {c: sys.float_info.max for c in available_colors}
this_feature_centroid = QgsPointV2(features[feature_id].geometry().centroid().geometry())
this_feature_centroid = QgsPoint(features[feature_id].geometry().centroid().geometry())
# find features for all available colors
other_features = {f_id: c for (f_id, c) in feature_colors.items() if c in available_colors}
@ -243,7 +243,7 @@ class ColoringAlgorithm:
# feature with each assigned color
for other_feature_id, c in other_features.items():
other_geometry = features[other_feature_id].geometry()
other_centroid = QgsPointV2(other_geometry.centroid().geometry())
other_centroid = QgsPoint(other_geometry.centroid().geometry())
distance = this_feature_centroid.distanceSquared(other_centroid)
if distance < min_distances[c]:

10
python/plugins/processing/algs/qgis/VectorGridLines.py
View File

@ -37,7 +37,7 @@ from qgis.core import (QgsProcessingAlgorithm,
QgsField,
QgsFeature,
QgsGeometry,
QgsPoint,
QgsPointXY,
QgsWkbTypes)
from qgis.utils import iface
@ -111,8 +111,8 @@ class VectorGridLines(GeoAlgorithm):
count_update = count_max * 0.10
y = bbox.yMaximum()
while y >= bbox.yMinimum():
pt1 = QgsPoint(bbox.xMinimum(), y)
pt2 = QgsPoint(bbox.xMaximum(), y)
pt1 = QgsPointXY(bbox.xMinimum(), y)
pt2 = QgsPointXY(bbox.xMaximum(), y)
line = [pt1, pt2]
feat.setGeometry(geom.fromPolyline(line))
feat.setAttribute(0, idVar)
@ -131,8 +131,8 @@ class VectorGridLines(GeoAlgorithm):
count_update = count_max * 0.10
x = bbox.xMinimum()
while x <= bbox.xMaximum():
pt1 = QgsPoint(x, bbox.yMaximum())
pt2 = QgsPoint(x, bbox.yMinimum())
pt1 = QgsPointXY(x, bbox.yMaximum())
pt2 = QgsPointXY(x, bbox.yMinimum())
line = [pt1, pt2]
feat.setGeometry(geom.fromPolyline(line))
feat.setAttribute(0, idVar)

12
python/plugins/processing/algs/qgis/VectorGridPolygons.py
View File

@ -37,7 +37,7 @@ from qgis.core import (QgsProcessingAlgorithm,
QgsField,
QgsFeature,
QgsGeometry,
QgsPoint,
QgsPointXY,
QgsWkbTypes)
from qgis.utils import iface
@ -117,11 +117,11 @@ class VectorGridPolygons(GeoAlgorithm):
while y >= bbox.yMinimum():
x = bbox.xMinimum()
while x <= bbox.xMaximum():
pt1 = QgsPoint(x, y)
pt2 = QgsPoint(x + xSpace, y)
pt3 = QgsPoint(x + xSpace, y - ySpace)
pt4 = QgsPoint(x, y - ySpace)
pt5 = QgsPoint(x, y)
pt1 = QgsPointXY(x, y)
pt2 = QgsPointXY(x + xSpace, y)
pt3 = QgsPointXY(x + xSpace, y - ySpace)
pt4 = QgsPointXY(x, y - ySpace)
pt5 = QgsPointXY(x, y)
polygon = [[pt1, pt2, pt3, pt4, pt5]]
feat.setGeometry(geom.fromPolygon(polygon))
feat.setAttribute(0, idVar)

26
python/plugins/processing/algs/qgis/VoronoiPolygons.py
View File

@ -30,7 +30,7 @@ import os
from qgis.PyQt.QtGui import QIcon
from qgis.core import QgsFeatureRequest, QgsFeature, QgsGeometry, QgsPoint, QgsWkbTypes, QgsProcessingUtils
from qgis.core import QgsFeatureRequest, QgsFeature, QgsGeometry, QgsPointXY, QgsWkbTypes, QgsProcessingUtils
from processing.core.GeoAlgorithm import GeoAlgorithm
from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
@ -242,10 +242,10 @@ class VoronoiPolygons(GeoAlgorithm):
exY,
)
if x1 or x2 or y1 or y2:
lines.append(QgsPoint(x1 + extent.xMinimum(),
y1 + extent.yMinimum()))
lines.append(QgsPoint(x2 + extent.xMinimum(),
y2 + extent.yMinimum()))
lines.append(QgsPointXY(x1 + extent.xMinimum(),
y1 + extent.yMinimum()))
lines.append(QgsPointXY(x2 + extent.xMinimum(),
y2 + extent.yMinimum()))
if 0 - exX in (x1, x2):
hasXMin = True
if 0 - exY in (y1, y2):
@ -256,16 +256,16 @@ class VoronoiPolygons(GeoAlgorithm):
hasXMax = True
if hasXMin:
if hasYMax:
lines.append(QgsPoint(extent.xMinimum() - exX,
height + extent.yMinimum() + exY))
lines.append(QgsPointXY(extent.xMinimum() - exX,
height + extent.yMinimum() + exY))
if hasYMin:
lines.append(QgsPoint(extent.xMinimum() - exX,
extent.yMinimum() - exY))
lines.append(QgsPointXY(extent.xMinimum() - exX,
extent.yMinimum() - exY))
if hasXMax:
if hasYMax:
lines.append(QgsPoint(width + extent.xMinimum() + exX,
height + extent.yMinimum() + exY))
lines.append(QgsPointXY(width + extent.xMinimum() + exX,
height + extent.yMinimum() + exY))
if hasYMin:
lines.append(QgsPoint(width + extent.xMinimum() + exX,
extent.yMinimum() - exY))
lines.append(QgsPointXY(width + extent.xMinimum() + exX,
extent.yMinimum() - exY))
return lines

14
python/plugins/processing/gui/RectangleMapTool.py
View File

@ -27,7 +27,7 @@ __revision__ = '$Format:%H$'
from qgis.PyQt.QtCore import pyqtSignal
from qgis.PyQt.QtGui import QColor
from qgis.core import QgsPoint, QgsRectangle, QgsWkbTypes
from qgis.core import QgsPointXY, QgsRectangle, QgsWkbTypes
from qgis.gui import QgsMapTool, QgsMapToolEmitPoint, QgsRubberBand
@ -75,10 +75,10 @@ class RectangleMapTool(QgsMapToolEmitPoint):
if startPoint.x() == endPoint.x() or startPoint.y() == endPoint.y():
return
point1 = QgsPoint(startPoint.x(), startPoint.y())
point2 = QgsPoint(startPoint.x(), endPoint.y())
point3 = QgsPoint(endPoint.x(), endPoint.y())
point4 = QgsPoint(endPoint.x(), startPoint.y())
point1 = QgsPointXY(startPoint.x(), startPoint.y())
point2 = QgsPointXY(startPoint.x(), endPoint.y())
point3 = QgsPointXY(endPoint.x(), endPoint.y())
point4 = QgsPointXY(endPoint.x(), startPoint.y())
self.rubberBand.addPoint(point1, False)
self.rubberBand.addPoint(point2, False)
@ -103,8 +103,8 @@ class RectangleMapTool(QgsMapToolEmitPoint):
if rect is None:
self.reset()
else:
self.startPoint = QgsPoint(rect.xMaximum(), rect.yMaximum())
self.endPoint = QgsPoint(rect.xMinimum(), rect.yMinimum())
self.startPoint = QgsPointXY(rect.xMaximum(), rect.yMaximum())
self.endPoint = QgsPointXY(rect.xMinimum(), rect.yMinimum())
self.showRect(self.startPoint, self.endPoint)
return True

50
python/qsci_apis/PyQGIS-1.7.api
View File

@ -722,7 +722,7 @@ qgis.core.QgsCoordinateTransform.setSourceCrs?4(QgsCoordinateReferenceSystem)
qgis.core.QgsCoordinateTransform.setDestCRS?4(QgsCoordinateReferenceSystem)
qgis.core.QgsCoordinateTransform.sourceCrs?4() -> QgsCoordinateReferenceSystem
qgis.core.QgsCoordinateTransform.destCRS?4() -> QgsCoordinateReferenceSystem
qgis.core.QgsCoordinateTransform.transform?4(QgsPoint, QgsCoordinateTransform.TransformDirection direction=QgsCoordinateTransform.ForwardTransform) -> QgsPoint
qgis.core.QgsCoordinateTransform.transform?4(QgsPointXY, QgsCoordinateTransform.TransformDirection direction=QgsCoordinateTransform.ForwardTransform) -> QgsPoint
qgis.core.QgsCoordinateTransform.transform?4(float, float, QgsCoordinateTransform.TransformDirection direction=QgsCoordinateTransform.ForwardTransform) -> QgsPoint
qgis.core.QgsCoordinateTransform.transformBoundingBox?4(QgsRectangle, QgsCoordinateTransform.TransformDirection direction=QgsCoordinateTransform.ForwardTransform) -> QgsRectangle
qgis.core.QgsCoordinateTransform.transformInPlace?4(QgsCoordinateTransform.TransformDirection direction=QgsCoordinateTransform.ForwardTransform) -> (float, float, float)
@ -811,9 +811,9 @@ qgis.core.QgsDistanceArea.ellipsoidInverseFlattening?4() -> float
qgis.core.QgsDistanceArea.measure?4(QgsGeometry) -> float
qgis.core.QgsDistanceArea.measurePerimeter?4(QgsGeometry) -> float
qgis.core.QgsDistanceArea.measureLine?4(list-of-QgsPoint) -> float
qgis.core.QgsDistanceArea.measureLine?4(QgsPoint, QgsPoint) -> float
qgis.core.QgsDistanceArea.measureLine?4(QgsPointXY, QgsPoint) -> float
qgis.core.QgsDistanceArea.measurePolygon?4(list-of-QgsPoint) -> float
qgis.core.QgsDistanceArea.bearing?4(QgsPoint, QgsPoint) -> float
qgis.core.QgsDistanceArea.bearing?4(QgsPointXY, QgsPoint) -> float
qgis.core.QgsDistanceArea.textUnit?4(float, int, QGis.UnitType, bool, bool keepBaseUnit=False) -> QString
qgis.core.QgsFeature?1(int id=0, QString typeName="")
qgis.core.QgsFeature.__init__?1(self, int id=0, QString typeName="")
@ -877,20 +877,20 @@ qgis.core.QgsGeometry.isGeosEmpty?4() -> bool
qgis.core.QgsGeometry.area?4() -> float
qgis.core.QgsGeometry.length?4() -> float
qgis.core.QgsGeometry.distance?4(QgsGeometry) -> float
qgis.core.QgsGeometry.closestVertex?4(QgsPoint) -> (QgsPoint, int, int, int, float)
qgis.core.QgsGeometry.closestVertex?4(QgsPoint) -> (QgsPointXY, int, int, int, float)
qgis.core.QgsGeometry.adjacentVertices?4(int) -> (int, int)
qgis.core.QgsGeometry.insertVertex?4(float, float, int) -> bool
qgis.core.QgsGeometry.moveVertex?4(float, float, int) -> bool
qgis.core.QgsGeometry.deleteVertex?4(int) -> bool
qgis.core.QgsGeometry.vertexAt?4(int) -> QgsPoint
qgis.core.QgsGeometry.sqrDistToVertexAt?4(QgsPoint, int) -> float
qgis.core.QgsGeometry.sqrDistToVertexAt?4(QgsPointXY, int) -> float
qgis.core.QgsGeometry.closestVertexWithContext?4(QgsPoint) -> (float, int)
qgis.core.QgsGeometry.closestSegmentWithContext?4(QgsPoint) -> (float, QgsPoint, int)
qgis.core.QgsGeometry.closestSegmentWithContext?4(QgsPoint) -> (float, QgsPointXY, int)
qgis.core.QgsGeometry.addRing?4(list-of-QgsPoint) -> int
qgis.core.QgsGeometry.addIsland?4(list-of-QgsPoint) -> int
qgis.core.QgsGeometry.translate?4(float, float) -> int
qgis.core.QgsGeometry.transform?4(QgsCoordinateTransform) -> int
qgis.core.QgsGeometry.splitGeometry?4(list-of-QgsPoint, bool) -> (int, list-of-QgsGeometry, list-of-QgsPoint)
qgis.core.QgsGeometry.splitGeometry?4(list-of-QgsPointXY, bool) -> (int, list-of-QgsGeometry, list-of-QgsPoint)
qgis.core.QgsGeometry.reshapeGeometry?4(list-of-QgsPoint) -> int
qgis.core.QgsGeometry.makeDifference?4(QgsGeometry) -> int
qgis.core.QgsGeometry.boundingBox?4() -> QgsRectangle
@ -1190,8 +1190,8 @@ qgis.core.QgsLabelPosition.layerID?7
qgis.core.QgsLabelPosition.rotation?7
qgis.core.QgsLabelPosition.upsideDown?7
qgis.core.QgsLabelPosition.width?7
qgis.core.QgsLabelPosition?1(int, float, list-of-QgsPoint, QgsRectangle, float, float, QString, bool)
qgis.core.QgsLabelPosition.__init__?1(self, int, float, list-of-QgsPoint, QgsRectangle, float, float, QString, bool)
qgis.core.QgsLabelPosition?1(int, float, list-of-QgsPointXY, QgsRectangle, float, float, QString, bool)
qgis.core.QgsLabelPosition.__init__?1(self, int, float, list-of-QgsPointXY, QgsRectangle, float, float, QString, bool)
qgis.core.QgsLabelPosition?1()
qgis.core.QgsLabelPosition.__init__?1(self)
qgis.core.QgsLabelPosition?1(QgsLabelPosition)
@ -1703,11 +1703,11 @@ qgis.core.QgsRasterViewPort?1(QgsRasterViewPort)
qgis.core.QgsRasterViewPort.__init__?1(self, QgsRasterViewPort)
qgis.core.QgsRectangle?1(float xmin=0, float ymin=0, float xmax=0, float ymax=0)
qgis.core.QgsRectangle.__init__?1(self, float xmin=0, float ymin=0, float xmax=0, float ymax=0)
qgis.core.QgsRectangle?1(QgsPoint, QgsPoint)
qgis.core.QgsRectangle.__init__?1(self, QgsPoint, QgsPoint)
qgis.core.QgsRectangle?1(QgsPointXY, QgsPoint)
qgis.core.QgsRectangle.__init__?1(self, QgsPointXY, QgsPoint)
qgis.core.QgsRectangle?1(QgsRectangle)
qgis.core.QgsRectangle.__init__?1(self, QgsRectangle)
qgis.core.QgsRectangle.set?4(QgsPoint, QgsPoint)
qgis.core.QgsRectangle.set?4(QgsPointXY, QgsPoint)
qgis.core.QgsRectangle.set?4(float, float, float, float)
qgis.core.QgsRectangle.setXMinimum?4(float)
qgis.core.QgsRectangle.setXMaximum?4(float)
@ -1722,8 +1722,8 @@ qgis.core.QgsRectangle.normalize?4()
qgis.core.QgsRectangle.width?4() -> float
qgis.core.QgsRectangle.height?4() -> float
qgis.core.QgsRectangle.center?4() -> QgsPoint
qgis.core.QgsRectangle.scale?4(float, QgsPoint c=None)
qgis.core.QgsRectangle.expand?4(float, QgsPoint c=None)
qgis.core.QgsRectangle.scale?4(float, QgsPointXY c=None)
qgis.core.QgsRectangle.expand?4(float, QgsPointXY c=None)
qgis.core.QgsRectangle.intersect?4(QgsRectangle) -> QgsRectangle
qgis.core.QgsRectangle.intersects?4(QgsRectangle) -> bool
qgis.core.QgsRectangle.contains?4(QgsRectangle) -> bool
@ -1940,7 +1940,7 @@ qgis.core.QgsSpatialIndex.__init__?1(self, QgsSpatialIndex)
qgis.core.QgsSpatialIndex.insertFeature?4(QgsFeature) -> bool
qgis.core.QgsSpatialIndex.deleteFeature?4(QgsFeature) -> bool
qgis.core.QgsSpatialIndex.intersects?4(QgsRectangle) -> list-of-int
qgis.core.QgsSpatialIndex.nearestNeighbor?4(QgsPoint, int) -> list-of-int
qgis.core.QgsSpatialIndex.nearestNeighbor?4(QgsPointXY, int) -> list-of-int
qgis.core.QgsCoordinateReferenceSystem.CrsType?10
qgis.core.QgsCoordinateReferenceSystem.InternalCrsId?10
qgis.core.QgsCoordinateReferenceSystem.PostgisCrsId?10
@ -2253,7 +2253,7 @@ qgis.core.QgsVectorLayer.deleteSelectedFeatures?4() -> bool
qgis.core.QgsVectorLayer.addRing?4(list-of-QgsPoint) -> int
qgis.core.QgsVectorLayer.addIsland?4(list-of-QgsPoint) -> int
qgis.core.QgsVectorLayer.translateFeature?4(int, float, float) -> int
qgis.core.QgsVectorLayer.splitFeatures?4(list-of-QgsPoint, bool topologicalEditing=False) -> int
qgis.core.QgsVectorLayer.splitFeatures?4(list-of-QgsPointXY, bool topologicalEditing=False) -> int
qgis.core.QgsVectorLayer.removePolygonIntersections?4(QgsGeometry) -> int
qgis.core.QgsVectorLayer.addTopologicalPoints?4(QgsGeometry) -> int
qgis.core.QgsVectorLayer.addTopologicalPoints?4(QgsPoint) -> int
@ -2263,8 +2263,8 @@ qgis.core.QgsVectorLayer.hasLabelsEnabled?4() -> bool
qgis.core.QgsVectorLayer.isEditable?4() -> bool
qgis.core.QgsVectorLayer.isReadOnly?4() -> bool
qgis.core.QgsVectorLayer.isModified?4() -> bool
qgis.core.QgsVectorLayer.snapPoint?4(QgsPoint, float) -> bool
qgis.core.QgsVectorLayer.snapWithContext?4(QgsPoint, float, QgsSnapper.SnappingType) -> (int, unknown-type)
qgis.core.QgsVectorLayer.snapPoint?4(QgsPointXY, float) -> bool
qgis.core.QgsVectorLayer.snapWithContext?4(QgsPointXY, float, QgsSnapper.SnappingType) -> (int, unknown-type)
qgis.core.QgsVectorLayer.reload?4()
qgis.core.QgsVectorLayer.draw?4(QgsRenderContext) -> bool
qgis.core.QgsVectorLayer.drawLabels?4(QgsRenderContext)
@ -3219,14 +3219,14 @@ qgis.gui.QgsMapCanvasSnapper?1()
qgis.gui.QgsMapCanvasSnapper.__init__?1(self)
qgis.gui.QgsMapCanvasSnapper?1(QgsMapCanvasSnapper)
qgis.gui.QgsMapCanvasSnapper.__init__?1(self, QgsMapCanvasSnapper)
qgis.gui.QgsMapCanvasSnapper.snapToCurrentLayer?4(QPoint, QgsSnapper.SnappingType, float snappingTol=-1, list-of-QgsPoint excludePoints=QList&lt;QgsPoint&gt;()) -> (int, list-of-QgsSnappingResult)
qgis.gui.QgsMapCanvasSnapper.snapToBackgroundLayers?4(QPoint, list-of-QgsPoint excludePoints=QList&lt;QgsPoint&gt;()) -> (int, list-of-QgsSnappingResult)
qgis.gui.QgsMapCanvasSnapper.snapToCurrentLayer?4(QPoint, QgsSnapper.SnappingType, float snappingTol=-1, list-of-QgsPointXY excludePoints=QList&lt;QgsPoint&gt;()) -> (int, list-of-QgsSnappingResult)
qgis.gui.QgsMapCanvasSnapper.snapToBackgroundLayers?4(QPoint, list-of-QgsPointXY excludePoints=QList&lt;QgsPoint&gt;()) -> (int, list-of-QgsSnappingResult)
qgis.gui.QgsMapCanvasSnapper.setMapCanvas?4(QgsMapCanvas)
qgis.gui.QgsMapTip?1()
qgis.gui.QgsMapTip.__init__?1(self)
qgis.gui.QgsMapTip?1(QgsMapTip)
qgis.gui.QgsMapTip.__init__?1(self, QgsMapTip)
qgis.gui.QgsMapTip.showMapTip?4(QgsMapLayer, QgsPoint, QPoint, QgsMapCanvas)
qgis.gui.QgsMapTip.showMapTip?4(QgsMapLayer, QgsPointXY, QPoint, QgsMapCanvas)
qgis.gui.QgsMapTip.clear?4(QgsMapCanvas)
qgis.gui.QgsMapTool?1(QgsMapCanvas)
qgis.gui.QgsMapTool.__init__?1(self, QgsMapCanvas)
@ -3255,7 +3255,7 @@ qgis.gui.QgsMapToolEmitPoint.__init__?1(self, QgsMapCanvas)
qgis.gui.QgsMapToolEmitPoint.canvasMoveEvent?4(QMouseEvent)
qgis.gui.QgsMapToolEmitPoint.canvasPressEvent?4(QMouseEvent)
qgis.gui.QgsMapToolEmitPoint.canvasReleaseEvent?4(QMouseEvent)
qgis.gui.QgsMapToolEmitPoint.canvasClicked?4(QgsPoint, Qt.MouseButton)
qgis.gui.QgsMapToolEmitPoint.canvasClicked?4(QgsPointXY, Qt.MouseButton)
qgis.gui.QgsMapToolPan?1(QgsMapCanvas)
qgis.gui.QgsMapToolPan.__init__?1(self, QgsMapCanvas)
qgis.gui.QgsMapToolPan.canvasMoveEvent?4(QMouseEvent)
@ -3340,10 +3340,10 @@ qgis.gui.QgsRubberBand.__init__?1(self, QgsMapCanvas, bool isPolygon=False)
qgis.gui.QgsRubberBand.setColor?4(QColor)
qgis.gui.QgsRubberBand.setWidth?4(int)
qgis.gui.QgsRubberBand.reset?4(bool isPolygon=False)
qgis.gui.QgsRubberBand.addPoint?4(QgsPoint, bool update=True, int geometryIndex=0)
qgis.gui.QgsRubberBand.addPoint?4(QgsPointXY, bool update=True, int geometryIndex=0)
qgis.gui.QgsRubberBand.removeLastPoint?4(int geometryIndex=0)
qgis.gui.QgsRubberBand.movePoint?4(QgsPoint, int geometryIndex=0)
qgis.gui.QgsRubberBand.movePoint?4(int, QgsPoint, int geometryIndex=0)
qgis.gui.QgsRubberBand.movePoint?4(QgsPointXY, int geometryIndex=0)
qgis.gui.QgsRubberBand.movePoint?4(int, QgsPointXY, int geometryIndex=0)
qgis.gui.QgsRubberBand.setToGeometry?4(QgsGeometry, QgsVectorLayer)
qgis.gui.QgsRubberBand.addGeometry?4(QgsGeometry, QgsVectorLayer)
qgis.gui.QgsRubberBand.setToCanvasRectangle?4(QRect)

54
python/qsci_apis/PyQGIS-1.8.api
View File

@ -766,7 +766,7 @@ qgis.core.QgsCoordinateTransform.setSourceCrs?4(QgsCoordinateReferenceSystem)
qgis.core.QgsCoordinateTransform.setDestCRS?4(QgsCoordinateReferenceSystem)
qgis.core.QgsCoordinateTransform.sourceCrs?4() -> QgsCoordinateReferenceSystem
qgis.core.QgsCoordinateTransform.destCRS?4() -> QgsCoordinateReferenceSystem
qgis.core.QgsCoordinateTransform.transform?4(QgsPoint, QgsCoordinateTransform.TransformDirection direction=QgsCoordinateTransform.ForwardTransform) -> QgsPoint
qgis.core.QgsCoordinateTransform.transform?4(QgsPointXY, QgsCoordinateTransform.TransformDirection direction=QgsCoordinateTransform.ForwardTransform) -> QgsPoint
qgis.core.QgsCoordinateTransform.transform?4(float, float, QgsCoordinateTransform.TransformDirection direction=QgsCoordinateTransform.ForwardTransform) -> QgsPoint
qgis.core.QgsCoordinateTransform.transformBoundingBox?4(QgsRectangle, QgsCoordinateTransform.TransformDirection direction=QgsCoordinateTransform.ForwardTransform) -> QgsRectangle
qgis.core.QgsCoordinateTransform.transformInPlace?4(QgsCoordinateTransform.TransformDirection direction=QgsCoordinateTransform.ForwardTransform) -> (float, float, float)
@ -855,9 +855,9 @@ qgis.core.QgsDistanceArea.ellipsoidInverseFlattening?4() -> float
qgis.core.QgsDistanceArea.measure?4(QgsGeometry) -> float
qgis.core.QgsDistanceArea.measurePerimeter?4(QgsGeometry) -> float
qgis.core.QgsDistanceArea.measureLine?4(list-of-QgsPoint) -> float
qgis.core.QgsDistanceArea.measureLine?4(QgsPoint, QgsPoint) -> float
qgis.core.QgsDistanceArea.measureLine?4(QgsPointXY, QgsPoint) -> float
qgis.core.QgsDistanceArea.measurePolygon?4(list-of-QgsPoint) -> float
qgis.core.QgsDistanceArea.bearing?4(QgsPoint, QgsPoint) -> float
qgis.core.QgsDistanceArea.bearing?4(QgsPointXY, QgsPoint) -> float
qgis.core.QgsDistanceArea.textUnit?4(float, int, QGis.UnitType, bool, bool keepBaseUnit=False) -> QString
qgis.core.QgsExpression.BinaryOperator?10
qgis.core.QgsExpression.boOr?10
@ -1091,21 +1091,21 @@ qgis.core.QgsGeometry.isGeosEmpty?4() -> bool
qgis.core.QgsGeometry.area?4() -> float
qgis.core.QgsGeometry.length?4() -> float
qgis.core.QgsGeometry.distance?4(QgsGeometry) -> float
qgis.core.QgsGeometry.closestVertex?4(QgsPoint) -> (QgsPoint, int, int, int, float)
qgis.core.QgsGeometry.closestVertex?4(QgsPoint) -> (QgsPointXY, int, int, int, float)
qgis.core.QgsGeometry.adjacentVertices?4(int) -> (int, int)
qgis.core.QgsGeometry.insertVertex?4(float, float, int) -> bool
qgis.core.QgsGeometry.moveVertex?4(float, float, int) -> bool
qgis.core.QgsGeometry.deleteVertex?4(int) -> bool
qgis.core.QgsGeometry.vertexAt?4(int) -> QgsPoint
qgis.core.QgsGeometry.sqrDistToVertexAt?4(QgsPoint, int) -> float
qgis.core.QgsGeometry.sqrDistToVertexAt?4(QgsPointXY, int) -> float
qgis.core.QgsGeometry.closestVertexWithContext?4(QgsPoint) -> (float, int)
qgis.core.QgsGeometry.closestSegmentWithContext?4(QgsPoint) -> (float, QgsPoint, int)
qgis.core.QgsGeometry.closestSegmentWithContext?4(QgsPoint) -> (float, QgsPointXY, int)
qgis.core.QgsGeometry.addRing?4(list-of-QgsPoint) -> int
qgis.core.QgsGeometry.addPart?4(list-of-QgsPoint) -> int
qgis.core.QgsGeometry.addIsland?4(list-of-QgsPoint) -> int
qgis.core.QgsGeometry.translate?4(float, float) -> int
qgis.core.QgsGeometry.transform?4(QgsCoordinateTransform) -> int
qgis.core.QgsGeometry.splitGeometry?4(list-of-QgsPoint, bool) -> (int, list-of-QgsGeometry, list-of-QgsPoint)
qgis.core.QgsGeometry.splitGeometry?4(list-of-QgsPointXY, bool) -> (int, list-of-QgsGeometry, list-of-QgsPoint)
qgis.core.QgsGeometry.reshapeGeometry?4(list-of-QgsPoint) -> int
qgis.core.QgsGeometry.makeDifference?4(QgsGeometry) -> int
qgis.core.QgsGeometry.boundingBox?4() -> QgsRectangle
@ -1414,8 +1414,8 @@ qgis.core.QgsLabelPosition.layerID?7
qgis.core.QgsLabelPosition.rotation?7
qgis.core.QgsLabelPosition.upsideDown?7
qgis.core.QgsLabelPosition.width?7
qgis.core.QgsLabelPosition?1(int, float, list-of-QgsPoint, QgsRectangle, float, float, QString, bool)
qgis.core.QgsLabelPosition.__init__?1(self, int, float, list-of-QgsPoint, QgsRectangle, float, float, QString, bool)
qgis.core.QgsLabelPosition?1(int, float, list-of-QgsPointXY, QgsRectangle, float, float, QString, bool)
qgis.core.QgsLabelPosition.__init__?1(self, int, float, list-of-QgsPointXY, QgsRectangle, float, float, QString, bool)
qgis.core.QgsLabelPosition?1()
qgis.core.QgsLabelPosition.__init__?1(self)
qgis.core.QgsLabelPosition?1(QgsLabelPosition)
@ -1933,11 +1933,11 @@ qgis.core.QgsRasterViewPort?1(QgsRasterViewPort)
qgis.core.QgsRasterViewPort.__init__?1(self, QgsRasterViewPort)
qgis.core.QgsRectangle?1(float xmin=0, float ymin=0, float xmax=0, float ymax=0)
qgis.core.QgsRectangle.__init__?1(self, float xmin=0, float ymin=0, float xmax=0, float ymax=0)
qgis.core.QgsRectangle?1(QgsPoint, QgsPoint)
qgis.core.QgsRectangle.__init__?1(self, QgsPoint, QgsPoint)
qgis.core.QgsRectangle?1(QgsPointXY, QgsPoint)
qgis.core.QgsRectangle.__init__?1(self, QgsPointXY, QgsPoint)
qgis.core.QgsRectangle?1(QgsRectangle)
qgis.core.QgsRectangle.__init__?1(self, QgsRectangle)
qgis.core.QgsRectangle.set?4(QgsPoint, QgsPoint)
qgis.core.QgsRectangle.set?4(QgsPointXY, QgsPoint)
qgis.core.QgsRectangle.set?4(float, float, float, float)
qgis.core.QgsRectangle.setXMinimum?4(float)
qgis.core.QgsRectangle.setXMaximum?4(float)
@ -1952,8 +1952,8 @@ qgis.core.QgsRectangle.normalize?4()
qgis.core.QgsRectangle.width?4() -> float
qgis.core.QgsRectangle.height?4() -> float
qgis.core.QgsRectangle.center?4() -> QgsPoint
qgis.core.QgsRectangle.scale?4(float, QgsPoint c=None)
qgis.core.QgsRectangle.expand?4(float, QgsPoint c=None)
qgis.core.QgsRectangle.scale?4(float, QgsPointXY c=None)
qgis.core.QgsRectangle.expand?4(float, QgsPointXY c=None)
qgis.core.QgsRectangle.intersect?4(QgsRectangle) -> QgsRectangle
qgis.core.QgsRectangle.intersects?4(QgsRectangle) -> bool
qgis.core.QgsRectangle.contains?4(QgsRectangle) -> bool
@ -2190,7 +2190,7 @@ qgis.core.QgsSpatialIndex.__init__?1(self, QgsSpatialIndex)
qgis.core.QgsSpatialIndex.insertFeature?4(QgsFeature) -> bool
qgis.core.QgsSpatialIndex.deleteFeature?4(QgsFeature) -> bool
qgis.core.QgsSpatialIndex.intersects?4(QgsRectangle) -> unknown-type
qgis.core.QgsSpatialIndex.nearestNeighbor?4(QgsPoint, int) -> unknown-type
qgis.core.QgsSpatialIndex.nearestNeighbor?4(QgsPointXY, int) -> unknown-type
qgis.core.QgsCoordinateReferenceSystem.CrsType?10
qgis.core.QgsCoordinateReferenceSystem.InternalCrsId?10
qgis.core.QgsCoordinateReferenceSystem.PostgisCrsId?10
@ -2582,7 +2582,7 @@ qgis.core.QgsVectorLayer.addRing?4(list-of-QgsPoint) -> int
qgis.core.QgsVectorLayer.addPart?4(list-of-QgsPoint) -> int
qgis.core.QgsVectorLayer.addIsland?4(list-of-QgsPoint) -> int
qgis.core.QgsVectorLayer.translateFeature?4(int, float, float) -> int
qgis.core.QgsVectorLayer.splitFeatures?4(list-of-QgsPoint, bool topologicalEditing=False) -> int
qgis.core.QgsVectorLayer.splitFeatures?4(list-of-QgsPointXY, bool topologicalEditing=False) -> int
qgis.core.QgsVectorLayer.removePolygonIntersections?4(QgsGeometry) -> int
qgis.core.QgsVectorLayer.addTopologicalPoints?4(QgsGeometry) -> int
qgis.core.QgsVectorLayer.addTopologicalPoints?4(QgsPoint) -> int
@ -2592,8 +2592,8 @@ qgis.core.QgsVectorLayer.hasLabelsEnabled?4() -> bool
qgis.core.QgsVectorLayer.isEditable?4() -> bool
qgis.core.QgsVectorLayer.isReadOnly?4() -> bool
qgis.core.QgsVectorLayer.isModified?4() -> bool
qgis.core.QgsVectorLayer.snapPoint?4(QgsPoint, float) -> bool
qgis.core.QgsVectorLayer.snapWithContext?4(QgsPoint, float, QgsSnapper.SnappingType) -> (int, unknown-type)
qgis.core.QgsVectorLayer.snapPoint?4(QgsPointXY, float) -> bool
qgis.core.QgsVectorLayer.snapWithContext?4(QgsPointXY, float, QgsSnapper.SnappingType) -> (int, unknown-type)
qgis.core.QgsVectorLayer.reload?4()
qgis.core.QgsVectorLayer.draw?4(QgsRenderContext) -> bool
qgis.core.QgsVectorLayer.drawLabels?4(QgsRenderContext)
@ -3676,14 +3676,14 @@ qgis.gui.QgsMapCanvasSnapper?1()
qgis.gui.QgsMapCanvasSnapper.__init__?1(self)
qgis.gui.QgsMapCanvasSnapper?1(QgsMapCanvasSnapper)
qgis.gui.QgsMapCanvasSnapper.__init__?1(self, QgsMapCanvasSnapper)
qgis.gui.QgsMapCanvasSnapper.snapToCurrentLayer?4(QPoint, QgsSnapper.SnappingType, float snappingTol=-1, list-of-QgsPoint excludePoints=QList&lt;QgsPoint&gt;()) -> (int, list-of-QgsSnappingResult)
qgis.gui.QgsMapCanvasSnapper.snapToBackgroundLayers?4(QPoint, list-of-QgsPoint excludePoints=QList&lt;QgsPoint&gt;()) -> (int, list-of-QgsSnappingResult)
qgis.gui.QgsMapCanvasSnapper.snapToCurrentLayer?4(QPoint, QgsSnapper.SnappingType, float snappingTol=-1, list-of-QgsPointXY excludePoints=QList&lt;QgsPoint&gt;()) -> (int, list-of-QgsSnappingResult)
qgis.gui.QgsMapCanvasSnapper.snapToBackgroundLayers?4(QPoint, list-of-QgsPointXY excludePoints=QList&lt;QgsPoint&gt;()) -> (int, list-of-QgsSnappingResult)
qgis.gui.QgsMapCanvasSnapper.setMapCanvas?4(QgsMapCanvas)
qgis.gui.QgsMapTip?1()
qgis.gui.QgsMapTip.__init__?1(self)
qgis.gui.QgsMapTip?1(QgsMapTip)
qgis.gui.QgsMapTip.__init__?1(self, QgsMapTip)
qgis.gui.QgsMapTip.showMapTip?4(QgsMapLayer, QgsPoint, QPoint, QgsMapCanvas)
qgis.gui.QgsMapTip.showMapTip?4(QgsMapLayer, QgsPointXY, QPoint, QgsMapCanvas)
qgis.gui.QgsMapTip.clear?4(QgsMapCanvas)
qgis.gui.QgsMapTool?1(QgsMapCanvas)
qgis.gui.QgsMapTool.__init__?1(self, QgsMapCanvas)
@ -3712,7 +3712,7 @@ qgis.gui.QgsMapToolEmitPoint.__init__?1(self, QgsMapCanvas)
qgis.gui.QgsMapToolEmitPoint.canvasMoveEvent?4(QMouseEvent)
qgis.gui.QgsMapToolEmitPoint.canvasPressEvent?4(QMouseEvent)
qgis.gui.QgsMapToolEmitPoint.canvasReleaseEvent?4(QMouseEvent)
qgis.gui.QgsMapToolEmitPoint.canvasClicked?4(QgsPoint, Qt.MouseButton)
qgis.gui.QgsMapToolEmitPoint.canvasClicked?4(QgsPointXY, Qt.MouseButton)
qgis.gui.QgsMapToolPan?1(QgsMapCanvas)
qgis.gui.QgsMapToolPan.__init__?1(self, QgsMapCanvas)
qgis.gui.QgsMapToolPan.canvasMoveEvent?4(QMouseEvent)
@ -3796,10 +3796,10 @@ qgis.gui.QgsRubberBand.__init__?1(self, QgsMapCanvas, bool isPolygon=False)
qgis.gui.QgsRubberBand.setColor?4(QColor)
qgis.gui.QgsRubberBand.setWidth?4(int)
qgis.gui.QgsRubberBand.reset?4(bool isPolygon=False)
qgis.gui.QgsRubberBand.addPoint?4(QgsPoint, bool update=True, int geometryIndex=0)
qgis.gui.QgsRubberBand.addPoint?4(QgsPointXY, bool update=True, int geometryIndex=0)
qgis.gui.QgsRubberBand.removeLastPoint?4(int geometryIndex=0)
qgis.gui.QgsRubberBand.movePoint?4(QgsPoint, int geometryIndex=0)
qgis.gui.QgsRubberBand.movePoint?4(int, QgsPoint, int geometryIndex=0)
qgis.gui.QgsRubberBand.movePoint?4(QgsPointXY, int geometryIndex=0)
qgis.gui.QgsRubberBand.movePoint?4(int, QgsPointXY, int geometryIndex=0)
qgis.gui.QgsRubberBand.setToGeometry?4(QgsGeometry, QgsVectorLayer)
qgis.gui.QgsRubberBand.addGeometry?4(QgsGeometry, QgsVectorLayer)
qgis.gui.QgsRubberBand.setToCanvasRectangle?4(QRect)
@ -3939,13 +3939,13 @@ qgis.networkanalysis.QgsGraphBuilderInterface.coordinateTransformationEnabled?4(
qgis.networkanalysis.QgsGraphBuilderInterface.topologyTolerance?4() -> float
qgis.networkanalysis.QgsGraphBuilderInterface.distanceArea?4() -> QgsDistanceArea
qgis.networkanalysis.QgsGraphBuilderInterface.addVertex?4(int, QgsPoint)
qgis.networkanalysis.QgsGraphBuilderInterface.addArc?4(int, QgsPoint, int, QgsPoint, list-of-QVariant)
qgis.networkanalysis.QgsGraphBuilderInterface.addArc?4(int, QgsPointXY, int, QgsPointXY, list-of-QVariant)
qgis.networkanalysis.QgsGraphBuilder?1(QgsCoordinateReferenceSystem, bool otfEnabled=True, float topologyTolerance=0, QString ellipsoidID="WGS84")
qgis.networkanalysis.QgsGraphBuilder.__init__?1(self, QgsCoordinateReferenceSystem, bool otfEnabled=True, float topologyTolerance=0, QString ellipsoidID="WGS84")
qgis.networkanalysis.QgsGraphBuilder?1(QgsGraphBuilder)
qgis.networkanalysis.QgsGraphBuilder.__init__?1(self, QgsGraphBuilder)
qgis.networkanalysis.QgsGraphBuilder.addVertex?4(int, QgsPoint)
qgis.networkanalysis.QgsGraphBuilder.addArc?4(int, QgsPoint, int, QgsPoint, list-of-QVariant)
qgis.networkanalysis.QgsGraphBuilder.addArc?4(int, QgsPointXY, int, QgsPointXY, list-of-QVariant)
qgis.networkanalysis.QgsGraphBuilder.graph?4() -> QgsGraph
qgis.networkanalysis.QgsGraphDirector?1()
qgis.networkanalysis.QgsGraphDirector.__init__?1(self)

62
python/qsci_apis/PyQGIS-2.0.api
View File

@ -479,7 +479,7 @@ qgis.core.QgsCoordinateTransform.setSourceCrs?4(QgsCoordinateReferenceSystem)
qgis.core.QgsCoordinateTransform.setDestCRS?4(QgsCoordinateReferenceSystem)
qgis.core.QgsCoordinateTransform.sourceCrs?4() -> QgsCoordinateReferenceSystem
qgis.core.QgsCoordinateTransform.destCRS?4() -> QgsCoordinateReferenceSystem
qgis.core.QgsCoordinateTransform.transform?4(QgsPoint, QgsCoordinateTransform.TransformDirection direction=QgsCoordinateTransform.ForwardTransform) -> QgsPoint
qgis.core.QgsCoordinateTransform.transform?4(QgsPointXY, QgsCoordinateTransform.TransformDirection direction=QgsCoordinateTransform.ForwardTransform) -> QgsPoint
qgis.core.QgsCoordinateTransform.transform?4(float, float, QgsCoordinateTransform.TransformDirection direction=QgsCoordinateTransform.ForwardTransform) -> QgsPoint
qgis.core.QgsCoordinateTransform.transformBoundingBox?4(QgsRectangle, QgsCoordinateTransform.TransformDirection direction=QgsCoordinateTransform.ForwardTransform) -> QgsRectangle
qgis.core.QgsCoordinateTransform.transformInPlace?4(QgsCoordinateTransform.TransformDirection direction=QgsCoordinateTransform.ForwardTransform) -> (float, float, float)
@ -745,9 +745,9 @@ qgis.core.QgsDistanceArea.ellipsoidInverseFlattening?4() -> float
qgis.core.QgsDistanceArea.measure?4(QgsGeometry) -> float
qgis.core.QgsDistanceArea.measurePerimeter?4(QgsGeometry) -> float
qgis.core.QgsDistanceArea.measureLine?4(list-of-QgsPoint) -> float
qgis.core.QgsDistanceArea.measureLine?4(QgsPoint, QgsPoint) -> float
qgis.core.QgsDistanceArea.measureLine?4(QgsPointXY, QgsPoint) -> float
qgis.core.QgsDistanceArea.measurePolygon?4(list-of-QgsPoint) -> float
qgis.core.QgsDistanceArea.bearing?4(QgsPoint, QgsPoint) -> float
qgis.core.QgsDistanceArea.bearing?4(QgsPointXY, QgsPoint) -> float
qgis.core.QgsDistanceArea.textUnit?4(float, int, QGis.UnitType, bool, bool keepBaseUnit=False) -> QString
qgis.core.QgsDistanceArea.convertMeasurement?4(float, QGis.UnitType, QGis.UnitType, bool) -> (float, QGis.UnitType)
qgis.core.QgsErrorMessage.Format?10
@ -1135,20 +1135,20 @@ qgis.core.QgsGeometry.isGeosEmpty?4() -> bool
qgis.core.QgsGeometry.area?4() -> float
qgis.core.QgsGeometry.length?4() -> float
qgis.core.QgsGeometry.distance?4(QgsGeometry) -> float
qgis.core.QgsGeometry.closestVertex?4(QgsPoint) -> (QgsPoint, int, int, int, float)
qgis.core.QgsGeometry.closestVertex?4(QgsPoint) -> (QgsPointXY, int, int, int, float)
qgis.core.QgsGeometry.adjacentVertices?4(int) -> (int, int)
qgis.core.QgsGeometry.insertVertex?4(float, float, int) -> bool
qgis.core.QgsGeometry.moveVertex?4(float, float, int) -> bool
qgis.core.QgsGeometry.deleteVertex?4(int) -> bool
qgis.core.QgsGeometry.vertexAt?4(int) -> QgsPoint
qgis.core.QgsGeometry.sqrDistToVertexAt?4(QgsPoint, int) -> float
qgis.core.QgsGeometry.sqrDistToVertexAt?4(QgsPointXY, int) -> float
qgis.core.QgsGeometry.closestVertexWithContext?4(QgsPoint) -> (float, int)
qgis.core.QgsGeometry.closestSegmentWithContext?4(QgsPoint) -> (float, QgsPoint, int)
qgis.core.QgsGeometry.closestSegmentWithContext?4(QgsPoint) -> (float, QgsPointXY, int)
qgis.core.QgsGeometry.addRing?4(list-of-QgsPoint) -> int
qgis.core.QgsGeometry.addPart?4(list-of-QgsPoint) -> int
qgis.core.QgsGeometry.translate?4(float, float) -> int
qgis.core.QgsGeometry.transform?4(QgsCoordinateTransform) -> int
qgis.core.QgsGeometry.splitGeometry?4(list-of-QgsPoint, bool) -> (int, list-of-QgsGeometry, list-of-QgsPoint)
qgis.core.QgsGeometry.splitGeometry?4(list-of-QgsPointXY, bool) -> (int, list-of-QgsGeometry, list-of-QgsPoint)
qgis.core.QgsGeometry.reshapeGeometry?4(list-of-QgsPoint) -> int
qgis.core.QgsGeometry.makeDifference?4(QgsGeometry) -> int
qgis.core.QgsGeometry.boundingBox?4() -> QgsRectangle
@ -1517,8 +1517,8 @@ qgis.core.QgsLabelPosition.layerID?7
qgis.core.QgsLabelPosition.rotation?7
qgis.core.QgsLabelPosition.upsideDown?7
qgis.core.QgsLabelPosition.width?7
qgis.core.QgsLabelPosition?1(int, float, list-of-QgsPoint, QgsRectangle, float, float, QString, QString, QFont, bool, bool diagram=False, bool pinned=False)
qgis.core.QgsLabelPosition.__init__?1(self, int, float, list-of-QgsPoint, QgsRectangle, float, float, QString, QString, QFont, bool, bool diagram=False, bool pinned=False)
qgis.core.QgsLabelPosition?1(int, float, list-of-QgsPointXY, QgsRectangle, float, float, QString, QString, QFont, bool, bool diagram=False, bool pinned=False)
qgis.core.QgsLabelPosition.__init__?1(self, int, float, list-of-QgsPointXY, QgsRectangle, float, float, QString, QString, QFont, bool, bool diagram=False, bool pinned=False)
qgis.core.QgsLabelPosition?1()
qgis.core.QgsLabelPosition.__init__?1(self)
qgis.core.QgsLabelPosition?1(QgsLabelPosition)
@ -2106,7 +2106,7 @@ qgis.core.QgsPoint.sqrDist?4(QgsPoint) -> float
qgis.core.QgsPoint.sqrDistToSegment?4(float, float, float, float, float epsilon=DEFAULT_SEGMENT_EPSILON) -> (float, QgsPoint)
qgis.core.QgsPoint.azimuth?4(QgsPoint) -> float
qgis.core.QgsPoint.multiply?4(float)
qgis.core.QgsPoint.onSegment?4(QgsPoint, QgsPoint) -> int
qgis.core.QgsPoint.onSegment?4(QgsPointXY, QgsPoint) -> int
qgis.core.QgsProject.instance?4() -> QgsProject
qgis.core.QgsProject.title?4(QString)
qgis.core.QgsProject.title?4() -> QString
@ -2274,13 +2274,13 @@ qgis.core.QgsPythonRunner.runCommand?4(QString, QString messageOnError=QString()
qgis.core.QgsPythonRunner.evalCommand?4(QString, QString) -> bool
qgis.core.QgsRectangle?1(float xmin=0, float ymin=0, float xmax=0, float ymax=0)
qgis.core.QgsRectangle.__init__?1(self, float xmin=0, float ymin=0, float xmax=0, float ymax=0)
qgis.core.QgsRectangle?1(QgsPoint, QgsPoint)
qgis.core.QgsRectangle.__init__?1(self, QgsPoint, QgsPoint)
qgis.core.QgsRectangle?1(QgsPointXY, QgsPoint)
qgis.core.QgsRectangle.__init__?1(self, QgsPointXY, QgsPoint)
qgis.core.QgsRectangle?1(QRectF)
qgis.core.QgsRectangle.__init__?1(self, QRectF)
qgis.core.QgsRectangle?1(QgsRectangle)
qgis.core.QgsRectangle.__init__?1(self, QgsRectangle)
qgis.core.QgsRectangle.set?4(QgsPoint, QgsPoint)
qgis.core.QgsRectangle.set?4(QgsPointXY, QgsPoint)
qgis.core.QgsRectangle.set?4(float, float, float, float)
qgis.core.QgsRectangle.setXMinimum?4(float)
qgis.core.QgsRectangle.setXMaximum?4(float)
@ -2295,7 +2295,7 @@ qgis.core.QgsRectangle.normalize?4()
qgis.core.QgsRectangle.width?4() -> float
qgis.core.QgsRectangle.height?4() -> float
qgis.core.QgsRectangle.center?4() -> QgsPoint
qgis.core.QgsRectangle.scale?4(float, QgsPoint c=None)
qgis.core.QgsRectangle.scale?4(float, QgsPointXY c=None)
qgis.core.QgsRectangle.intersect?4(QgsRectangle) -> QgsRectangle
qgis.core.QgsRectangle.intersects?4(QgsRectangle) -> bool
qgis.core.QgsRectangle.contains?4(QgsRectangle) -> bool
@ -2404,7 +2404,7 @@ qgis.core.QgsSnapper?1(QgsMapRenderer)
qgis.core.QgsSnapper.__init__?1(self, QgsMapRenderer)
qgis.core.QgsSnapper?1(QgsSnapper)
qgis.core.QgsSnapper.__init__?1(self, QgsSnapper)
qgis.core.QgsSnapper.snapPoint?4(QPoint, list-of-QgsPoint excludePoints=QList&lt;QgsPoint&gt;()) -> (int, list-of-QgsSnappingResult)
qgis.core.QgsSnapper.snapPoint?4(QPoint, list-of-QgsPointXY excludePoints=QList&lt;QgsPoint&gt;()) -> (int, list-of-QgsSnappingResult)
qgis.core.QgsSnapper.setSnapLayers?4(list-of-QgsSnapper.SnapLayer)
qgis.core.QgsSnapper.setSnapMode?4(QgsSnapper.SnappingMode)
qgis.core.QgsSnapper.SnapLayer.mLayer?7
@ -2422,7 +2422,7 @@ qgis.core.QgsSpatialIndex.__init__?1(self, QgsSpatialIndex)
qgis.core.QgsSpatialIndex.insertFeature?4(QgsFeature) -> bool
qgis.core.QgsSpatialIndex.deleteFeature?4(QgsFeature) -> bool
qgis.core.QgsSpatialIndex.intersects?4(QgsRectangle) -> unknown-type
qgis.core.QgsSpatialIndex.nearestNeighbor?4(QgsPoint, int) -> unknown-type
qgis.core.QgsSpatialIndex.nearestNeighbor?4(QgsPointXY, int) -> unknown-type
qgis.core.QgsTolerance.UnitType?10
qgis.core.QgsTolerance.MapUnits?10
qgis.core.QgsTolerance.Pixels?10
@ -2648,7 +2648,7 @@ qgis.core.QgsVectorLayer.deleteSelectedFeatures?4() -> bool
qgis.core.QgsVectorLayer.addRing?4(list-of-QgsPoint) -> int
qgis.core.QgsVectorLayer.addPart?4(list-of-QgsPoint) -> int
qgis.core.QgsVectorLayer.translateFeature?4(int, float, float) -> int
qgis.core.QgsVectorLayer.splitFeatures?4(list-of-QgsPoint, bool topologicalEditing=False) -> int
qgis.core.QgsVectorLayer.splitFeatures?4(list-of-QgsPointXY, bool topologicalEditing=False) -> int
qgis.core.QgsVectorLayer.removePolygonIntersections?4(QgsGeometry, unknown-type ignoreFeatures=QgsFeatureIds()) -> int
qgis.core.QgsVectorLayer.addTopologicalPoints?4(QgsGeometry) -> int
qgis.core.QgsVectorLayer.addTopologicalPoints?4(QgsPoint) -> int
@ -2658,8 +2658,8 @@ qgis.core.QgsVectorLayer.hasLabelsEnabled?4() -> bool
qgis.core.QgsVectorLayer.isEditable?4() -> bool
qgis.core.QgsVectorLayer.isReadOnly?4() -> bool
qgis.core.QgsVectorLayer.isModified?4() -> bool
qgis.core.QgsVectorLayer.snapPoint?4(QgsPoint, float) -> bool
qgis.core.QgsVectorLayer.snapWithContext?4(QgsPoint, float, QgsSnapper.SnappingType) -> (int, unknown-type)
qgis.core.QgsVectorLayer.snapPoint?4(QgsPointXY, float) -> bool
qgis.core.QgsVectorLayer.snapWithContext?4(QgsPointXY, float, QgsSnapper.SnappingType) -> (int, unknown-type)
qgis.core.QgsVectorLayer.reload?4()
qgis.core.QgsVectorLayer.draw?4(QgsRenderContext) -> bool
qgis.core.QgsVectorLayer.drawLabels?4(QgsRenderContext)
@ -2948,9 +2948,9 @@ qgis.core.QgsVectorLayerEditUtils.insertVertex?4(float, float, int, int) -> bool
qgis.core.QgsVectorLayerEditUtils.moveVertex?4(float, float, int, int) -> bool
qgis.core.QgsVectorLayerEditUtils.deleteVertex?4(int, int) -> bool
qgis.core.QgsVectorLayerEditUtils.addRing?4(list-of-QgsPoint) -> int
qgis.core.QgsVectorLayerEditUtils.addPart?4(list-of-QgsPoint, int) -> int
qgis.core.QgsVectorLayerEditUtils.addPart?4(list-of-QgsPointXY, int) -> int
qgis.core.QgsVectorLayerEditUtils.translateFeature?4(int, float, float) -> int
qgis.core.QgsVectorLayerEditUtils.splitFeatures?4(list-of-QgsPoint, bool topologicalEditing=False) -> int
qgis.core.QgsVectorLayerEditUtils.splitFeatures?4(list-of-QgsPointXY, bool topologicalEditing=False) -> int
qgis.core.QgsVectorLayerEditUtils.addTopologicalPoints?4(QgsGeometry) -> int
qgis.core.QgsVectorLayerEditUtils.addTopologicalPoints?4(QgsPoint) -> int
qgis.core.QgsVectorLayerEditUtils.insertSegmentVerticesForSnap?4(list-of-QgsSnappingResult) -> int
@ -4470,7 +4470,7 @@ qgis.core.QgsRasterDataProvider.buildPyramids?4(list-of-QgsRasterPyramid, QStrin
qgis.core.QgsRasterDataProvider.buildPyramidList?4(list-of-int overviewList=QList&lt;int&gt;()) -> list-of-QgsRasterPyramid
qgis.core.QgsRasterDataProvider.hasPyramids?4() -> bool
qgis.core.QgsRasterDataProvider.metadata?4() -> QString
qgis.core.QgsRasterDataProvider.identify?4(QgsPoint, QgsRaster.IdentifyFormat, QgsRectangle theExtent=QgsRectangle(), int theWidth=0, int theHeight=0) -> QgsRasterIdentifyResult
qgis.core.QgsRasterDataProvider.identify?4(QgsPointXY, QgsRaster.IdentifyFormat, QgsRectangle theExtent=QgsRectangle(), int theWidth=0, int theHeight=0) -> QgsRasterIdentifyResult
qgis.core.QgsRasterDataProvider.lastErrorTitle?4() -> QString
qgis.core.QgsRasterDataProvider.lastError?4() -> QString
qgis.core.QgsRasterDataProvider.lastErrorFormat?4() -> QString
@ -7015,8 +7015,8 @@ qgis.gui.QgsMapCanvasSnapper?1()
qgis.gui.QgsMapCanvasSnapper.__init__?1(self)
qgis.gui.QgsMapCanvasSnapper?1(QgsMapCanvasSnapper)
qgis.gui.QgsMapCanvasSnapper.__init__?1(self, QgsMapCanvasSnapper)
qgis.gui.QgsMapCanvasSnapper.snapToCurrentLayer?4(QPoint, QgsSnapper.SnappingType, float snappingTol=-1, list-of-QgsPoint excludePoints=QList&lt;QgsPoint&gt;()) -> (int, list-of-QgsSnappingResult)
qgis.gui.QgsMapCanvasSnapper.snapToBackgroundLayers?4(QPoint, list-of-QgsPoint excludePoints=QList&lt;QgsPoint&gt;()) -> (int, list-of-QgsSnappingResult)
qgis.gui.QgsMapCanvasSnapper.snapToCurrentLayer?4(QPoint, QgsSnapper.SnappingType, float snappingTol=-1, list-of-QgsPointXY excludePoints=QList&lt;QgsPoint&gt;()) -> (int, list-of-QgsSnappingResult)
qgis.gui.QgsMapCanvasSnapper.snapToBackgroundLayers?4(QPoint, list-of-QgsPointXY excludePoints=QList&lt;QgsPoint&gt;()) -> (int, list-of-QgsSnappingResult)
qgis.gui.QgsMapCanvasSnapper.setMapCanvas?4(QgsMapCanvas)
qgis.gui.QgsMapOverviewCanvas?1(QWidget parent=None, QgsMapCanvas mapCanvas=None)
qgis.gui.QgsMapOverviewCanvas.__init__?1(self, QWidget parent=None, QgsMapCanvas mapCanvas=None)
@ -7039,7 +7039,7 @@ qgis.gui.QgsMapTip?1()
qgis.gui.QgsMapTip.__init__?1(self)
qgis.gui.QgsMapTip?1(QgsMapTip)
qgis.gui.QgsMapTip.__init__?1(self, QgsMapTip)
qgis.gui.QgsMapTip.showMapTip?4(QgsMapLayer, QgsPoint, QPoint, QgsMapCanvas)
qgis.gui.QgsMapTip.showMapTip?4(QgsMapLayer, QgsPointXY, QPoint, QgsMapCanvas)
qgis.gui.QgsMapTip.clear?4(QgsMapCanvas)
qgis.gui.QgsMapTool?1(QgsMapCanvas)
qgis.gui.QgsMapTool.__init__?1(self, QgsMapCanvas)
@ -7072,7 +7072,7 @@ qgis.gui.QgsMapToolEmitPoint.__init__?1(self, QgsMapCanvas)
qgis.gui.QgsMapToolEmitPoint.canvasMoveEvent?4(QMouseEvent)
qgis.gui.QgsMapToolEmitPoint.canvasPressEvent?4(QMouseEvent)
qgis.gui.QgsMapToolEmitPoint.canvasReleaseEvent?4(QMouseEvent)
qgis.gui.QgsMapToolEmitPoint.canvasClicked?4(QgsPoint, Qt.MouseButton)
qgis.gui.QgsMapToolEmitPoint.canvasClicked?4(QgsPointXY, Qt.MouseButton)
qgis.gui.QgsMapToolIdentify.LayerType?10
qgis.gui.QgsMapToolIdentify.AllLayers?10
qgis.gui.QgsMapToolIdentify.VectorLayer?10
@ -7394,11 +7394,11 @@ qgis.gui.QgsRubberBand.setLineStyle?4(Qt.PenStyle)
qgis.gui.QgsRubberBand.setBrushStyle?4(Qt.BrushStyle)
qgis.gui.QgsRubberBand.reset?4(QGis.GeometryType geometryType=QGis.Line)
qgis.gui.QgsRubberBand.reset?4(bool)
qgis.gui.QgsRubberBand.addPoint?4(QgsPoint, bool update=True, int geometryIndex=0)
qgis.gui.QgsRubberBand.addPoint?4(QgsPointXY, bool update=True, int geometryIndex=0)
qgis.gui.QgsRubberBand.removePoint?4(int index=0, bool doUpdate=True, int geometryIndex=0)
qgis.gui.QgsRubberBand.removeLastPoint?4(int geometryIndex=0)
qgis.gui.QgsRubberBand.movePoint?4(QgsPoint, int geometryIndex=0)
qgis.gui.QgsRubberBand.movePoint?4(int, QgsPoint, int geometryIndex=0)
qgis.gui.QgsRubberBand.movePoint?4(QgsPointXY, int geometryIndex=0)
qgis.gui.QgsRubberBand.movePoint?4(int, QgsPointXY, int geometryIndex=0)
qgis.gui.QgsRubberBand.setToGeometry?4(QgsGeometry, QgsVectorLayer)
qgis.gui.QgsRubberBand.setToCanvasRectangle?4(QRect)
qgis.gui.QgsRubberBand.addGeometry?4(QgsGeometry, QgsVectorLayer)
@ -8668,13 +8668,13 @@ qgis.networkanalysis.QgsGraphBuilderInterface.coordinateTransformationEnabled?4(
qgis.networkanalysis.QgsGraphBuilderInterface.topologyTolerance?4() -> float
qgis.networkanalysis.QgsGraphBuilderInterface.distanceArea?4() -> QgsDistanceArea
qgis.networkanalysis.QgsGraphBuilderInterface.addVertex?4(int, QgsPoint)
qgis.networkanalysis.QgsGraphBuilderInterface.addArc?4(int, QgsPoint, int, QgsPoint, list-of-QVariant)
qgis.networkanalysis.QgsGraphBuilderInterface.addArc?4(int, QgsPointXY, int, QgsPointXY, list-of-QVariant)
qgis.networkanalysis.QgsGraphBuilder?1(QgsCoordinateReferenceSystem, bool otfEnabled=True, float topologyTolerance=0, QString ellipsoidID="WGS84")
qgis.networkanalysis.QgsGraphBuilder.__init__?1(self, QgsCoordinateReferenceSystem, bool otfEnabled=True, float topologyTolerance=0, QString ellipsoidID="WGS84")
qgis.networkanalysis.QgsGraphBuilder?1(QgsGraphBuilder)
qgis.networkanalysis.QgsGraphBuilder.__init__?1(self, QgsGraphBuilder)
qgis.networkanalysis.QgsGraphBuilder.addVertex?4(int, QgsPoint)
qgis.networkanalysis.QgsGraphBuilder.addArc?4(int, QgsPoint, int, QgsPoint, list-of-QVariant)
qgis.networkanalysis.QgsGraphBuilder.addArc?4(int, QgsPointXY, int, QgsPointXY, list-of-QVariant)
qgis.networkanalysis.QgsGraphBuilder.graph?4() -> QgsGraph
qgis.networkanalysis.QgsGraphDirector?1()
qgis.networkanalysis.QgsGraphDirector.__init__?1(self)

78
python/qsci_apis/PyQGIS-2.2.api
View File

@ -498,7 +498,7 @@ qgis.core.QgsCoordinateTransform.setSourceCrs?4(QgsCoordinateReferenceSystem)
qgis.core.QgsCoordinateTransform.setDestCRS?4(QgsCoordinateReferenceSystem)
qgis.core.QgsCoordinateTransform.sourceCrs?4() -> QgsCoordinateReferenceSystem
qgis.core.QgsCoordinateTransform.destCRS?4() -> QgsCoordinateReferenceSystem
qgis.core.QgsCoordinateTransform.transform?4(QgsPoint, QgsCoordinateTransform.TransformDirection direction=QgsCoordinateTransform.ForwardTransform) -> QgsPoint
qgis.core.QgsCoordinateTransform.transform?4(QgsPointXY, QgsCoordinateTransform.TransformDirection direction=QgsCoordinateTransform.ForwardTransform) -> QgsPoint
qgis.core.QgsCoordinateTransform.transform?4(float, float, QgsCoordinateTransform.TransformDirection direction=QgsCoordinateTransform.ForwardTransform) -> QgsPoint
qgis.core.QgsCoordinateTransform.transformBoundingBox?4(QgsRectangle, QgsCoordinateTransform.TransformDirection direction=QgsCoordinateTransform.ForwardTransform) -> QgsRectangle
qgis.core.QgsCoordinateTransform.transformInPlace?4(QgsCoordinateTransform.TransformDirection direction=QgsCoordinateTransform.ForwardTransform) -> (float, float, float)
@ -775,9 +775,9 @@ qgis.core.QgsDistanceArea.ellipsoidInverseFlattening?4() -> float
qgis.core.QgsDistanceArea.measure?4(QgsGeometry) -> float
qgis.core.QgsDistanceArea.measurePerimeter?4(QgsGeometry) -> float
qgis.core.QgsDistanceArea.measureLine?4(list-of-QgsPoint) -> float
qgis.core.QgsDistanceArea.measureLine?4(QgsPoint, QgsPoint) -> float
qgis.core.QgsDistanceArea.measureLine?4(QgsPointXY, QgsPoint) -> float
qgis.core.QgsDistanceArea.measurePolygon?4(list-of-QgsPoint) -> float
qgis.core.QgsDistanceArea.bearing?4(QgsPoint, QgsPoint) -> float
qgis.core.QgsDistanceArea.bearing?4(QgsPointXY, QgsPoint) -> float
qgis.core.QgsDistanceArea.textUnit?4(float, int, QGis.UnitType, bool, bool keepBaseUnit=False) -> QString
qgis.core.QgsDistanceArea.convertMeasurement?4(float, QGis.UnitType, QGis.UnitType, bool) -> (float, QGis.UnitType)
qgis.core.QgsErrorMessage.Format?10
@ -1188,21 +1188,21 @@ qgis.core.QgsGeometry.isGeosEmpty?4() -> bool
qgis.core.QgsGeometry.area?4() -> float
qgis.core.QgsGeometry.length?4() -> float
qgis.core.QgsGeometry.distance?4(QgsGeometry) -> float
qgis.core.QgsGeometry.closestVertex?4(QgsPoint) -> (QgsPoint, int, int, int, float)
qgis.core.QgsGeometry.closestVertex?4(QgsPoint) -> (QgsPointXY, int, int, int, float)
qgis.core.QgsGeometry.adjacentVertices?4(int) -> (int, int)
qgis.core.QgsGeometry.insertVertex?4(float, float, int) -> bool
qgis.core.QgsGeometry.moveVertex?4(float, float, int) -> bool
qgis.core.QgsGeometry.deleteVertex?4(int) -> bool
qgis.core.QgsGeometry.vertexAt?4(int) -> QgsPoint
qgis.core.QgsGeometry.sqrDistToVertexAt?4(QgsPoint, int) -> float
qgis.core.QgsGeometry.sqrDistToVertexAt?4(QgsPointXY, int) -> float
qgis.core.QgsGeometry.closestVertexWithContext?4(QgsPoint) -> (float, int)
qgis.core.QgsGeometry.closestSegmentWithContext?4(QgsPoint) -> (float, QgsPoint, int)
qgis.core.QgsGeometry.closestSegmentWithContext?4(QgsPoint) -> (float, QgsPointXY, int)
qgis.core.QgsGeometry.addRing?4(list-of-QgsPoint) -> int
qgis.core.QgsGeometry.addPart?4(list-of-QgsPoint, QGis.GeometryType geomType=QGis.UnknownGeometry) -> int
qgis.core.QgsGeometry.addPart?4(list-of-QgsPointXY, QGis.GeometryType geomType=QGis.UnknownGeometry) -> int
qgis.core.QgsGeometry.addPartGeometry?4(QgsGeometry) -> int
qgis.core.QgsGeometry.translate?4(float, float) -> int
qgis.core.QgsGeometry.transform?4(QgsCoordinateTransform) -> int
qgis.core.QgsGeometry.splitGeometry?4(list-of-QgsPoint, bool) -> (int, list-of-QgsGeometry, list-of-QgsPoint)
qgis.core.QgsGeometry.splitGeometry?4(list-of-QgsPointXY, bool) -> (int, list-of-QgsGeometry, list-of-QgsPoint)
qgis.core.QgsGeometry.reshapeGeometry?4(list-of-QgsPoint) -> int
qgis.core.QgsGeometry.makeDifference?4(QgsGeometry) -> int
qgis.core.QgsGeometry.boundingBox?4() -> QgsRectangle
@ -1593,8 +1593,8 @@ qgis.core.QgsLabelPosition.layerID?7
qgis.core.QgsLabelPosition.rotation?7
qgis.core.QgsLabelPosition.upsideDown?7
qgis.core.QgsLabelPosition.width?7
qgis.core.QgsLabelPosition?1(int, float, list-of-QgsPoint, QgsRectangle, float, float, QString, QString, QFont, bool, bool diagram=False, bool pinned=False)
qgis.core.QgsLabelPosition.__init__?1(self, int, float, list-of-QgsPoint, QgsRectangle, float, float, QString, QString, QFont, bool, bool diagram=False, bool pinned=False)
qgis.core.QgsLabelPosition?1(int, float, list-of-QgsPointXY, QgsRectangle, float, float, QString, QString, QFont, bool, bool diagram=False, bool pinned=False)
qgis.core.QgsLabelPosition.__init__?1(self, int, float, list-of-QgsPointXY, QgsRectangle, float, float, QString, QString, QFont, bool, bool diagram=False, bool pinned=False)
qgis.core.QgsLabelPosition?1()
qgis.core.QgsLabelPosition.__init__?1(self)
qgis.core.QgsLabelPosition?1(QgsLabelPosition)
@ -2207,7 +2207,7 @@ qgis.core.QgsPoint.sqrDist?4(QgsPoint) -> float
qgis.core.QgsPoint.sqrDistToSegment?4(float, float, float, float, float epsilon=DEFAULT_SEGMENT_EPSILON) -> (float, QgsPoint)
qgis.core.QgsPoint.azimuth?4(QgsPoint) -> float
qgis.core.QgsPoint.multiply?4(float)
qgis.core.QgsPoint.onSegment?4(QgsPoint, QgsPoint) -> int
qgis.core.QgsPoint.onSegment?4(QgsPointXY, QgsPoint) -> int
qgis.core.QgsProject.instance?4() -> QgsProject
qgis.core.QgsProject.title?4(QString)
qgis.core.QgsProject.title?4() -> QString
@ -2376,13 +2376,13 @@ qgis.core.QgsPythonRunner.runCommand?4(QString, QString messageOnError=QString()
qgis.core.QgsPythonRunner.evalCommand?4(QString, QString) -> bool
qgis.core.QgsRectangle?1(float xmin=0, float ymin=0, float xmax=0, float ymax=0)
qgis.core.QgsRectangle.__init__?1(self, float xmin=0, float ymin=0, float xmax=0, float ymax=0)
qgis.core.QgsRectangle?1(QgsPoint, QgsPoint)
qgis.core.QgsRectangle.__init__?1(self, QgsPoint, QgsPoint)
qgis.core.QgsRectangle?1(QgsPointXY, QgsPoint)
qgis.core.QgsRectangle.__init__?1(self, QgsPointXY, QgsPoint)
qgis.core.QgsRectangle?1(QRectF)
qgis.core.QgsRectangle.__init__?1(self, QRectF)
qgis.core.QgsRectangle?1(QgsRectangle)
qgis.core.QgsRectangle.__init__?1(self, QgsRectangle)
qgis.core.QgsRectangle.set?4(QgsPoint, QgsPoint)
qgis.core.QgsRectangle.set?4(QgsPointXY, QgsPoint)
qgis.core.QgsRectangle.set?4(float, float, float, float)
qgis.core.QgsRectangle.setXMinimum?4(float)
qgis.core.QgsRectangle.setXMaximum?4(float)
@ -2397,7 +2397,7 @@ qgis.core.QgsRectangle.normalize?4()
qgis.core.QgsRectangle.width?4() -> float
qgis.core.QgsRectangle.height?4() -> float
qgis.core.QgsRectangle.center?4() -> QgsPoint
qgis.core.QgsRectangle.scale?4(float, QgsPoint c=None)
qgis.core.QgsRectangle.scale?4(float, QgsPointXY c=None)
qgis.core.QgsRectangle.scale?4(float, float, float)
qgis.core.QgsRectangle.buffer?4(float) -> QgsRectangle
qgis.core.QgsRectangle.intersect?4(QgsRectangle) -> QgsRectangle
@ -2563,7 +2563,7 @@ qgis.core.QgsSnapper?1(QgsMapRenderer)
qgis.core.QgsSnapper.__init__?1(self, QgsMapRenderer)
qgis.core.QgsSnapper?1(QgsSnapper)
qgis.core.QgsSnapper.__init__?1(self, QgsSnapper)
qgis.core.QgsSnapper.snapPoint?4(QPoint, list-of-QgsPoint excludePoints=QList&lt;QgsPoint&gt;()) -> (int, list-of-QgsSnappingResult)
qgis.core.QgsSnapper.snapPoint?4(QPoint, list-of-QgsPointXY excludePoints=QList&lt;QgsPoint&gt;()) -> (int, list-of-QgsSnappingResult)
qgis.core.QgsSnapper.setSnapLayers?4(list-of-QgsSnapper.SnapLayer)
qgis.core.QgsSnapper.setSnapMode?4(QgsSnapper.SnappingMode)
qgis.core.QgsSnapper.SnapLayer.mLayer?7
@ -2581,7 +2581,7 @@ qgis.core.QgsSpatialIndex.__init__?1(self, QgsSpatialIndex)
qgis.core.QgsSpatialIndex.insertFeature?4(QgsFeature) -> bool
qgis.core.QgsSpatialIndex.deleteFeature?4(QgsFeature) -> bool
qgis.core.QgsSpatialIndex.intersects?4(QgsRectangle) -> unknown-type
qgis.core.QgsSpatialIndex.nearestNeighbor?4(QgsPoint, int) -> unknown-type
qgis.core.QgsSpatialIndex.nearestNeighbor?4(QgsPointXY, int) -> unknown-type
qgis.core.QgsTolerance.UnitType?10
qgis.core.QgsTolerance.MapUnits?10
qgis.core.QgsTolerance.Pixels?10
@ -2884,8 +2884,8 @@ qgis.core.QgsVectorLayer.deleteSelectedFeatures?4() -> bool
qgis.core.QgsVectorLayer.addRing?4(list-of-QgsPoint) -> int
qgis.core.QgsVectorLayer.addPart?4(list-of-QgsPoint) -> int
qgis.core.QgsVectorLayer.translateFeature?4(int, float, float) -> int
qgis.core.QgsVectorLayer.splitParts?4(list-of-QgsPoint, bool topologicalEditing=False) -> int
qgis.core.QgsVectorLayer.splitFeatures?4(list-of-QgsPoint, bool topologicalEditing=False) -> int
qgis.core.QgsVectorLayer.splitParts?4(list-of-QgsPointXY, bool topologicalEditing=False) -> int
qgis.core.QgsVectorLayer.splitFeatures?4(list-of-QgsPointXY, bool topologicalEditing=False) -> int
qgis.core.QgsVectorLayer.removePolygonIntersections?4(QgsGeometry, unknown-type ignoreFeatures=QgsFeatureIds()) -> int
qgis.core.QgsVectorLayer.addTopologicalPoints?4(QgsGeometry) -> int
qgis.core.QgsVectorLayer.addTopologicalPoints?4(QgsPoint) -> int
@ -2895,8 +2895,8 @@ qgis.core.QgsVectorLayer.hasLabelsEnabled?4() -> bool
qgis.core.QgsVectorLayer.isEditable?4() -> bool
qgis.core.QgsVectorLayer.isReadOnly?4() -> bool
qgis.core.QgsVectorLayer.isModified?4() -> bool
qgis.core.QgsVectorLayer.snapPoint?4(QgsPoint, float) -> bool
qgis.core.QgsVectorLayer.snapWithContext?4(QgsPoint, float, QgsSnapper.SnappingType) -> (int, unknown-type)
qgis.core.QgsVectorLayer.snapPoint?4(QgsPointXY, float) -> bool
qgis.core.QgsVectorLayer.snapWithContext?4(QgsPointXY, float, QgsSnapper.SnappingType) -> (int, unknown-type)
qgis.core.QgsVectorLayer.reload?4()
qgis.core.QgsVectorLayer.draw?4(QgsRenderContext) -> bool
qgis.core.QgsVectorLayer.drawLabels?4(QgsRenderContext)
@ -3281,10 +3281,10 @@ qgis.core.QgsVectorLayerEditUtils.insertVertex?4(float, float, int, int) -> bool
qgis.core.QgsVectorLayerEditUtils.moveVertex?4(float, float, int, int) -> bool
qgis.core.QgsVectorLayerEditUtils.deleteVertex?4(int, int) -> bool
qgis.core.QgsVectorLayerEditUtils.addRing?4(list-of-QgsPoint) -> int
qgis.core.QgsVectorLayerEditUtils.addPart?4(list-of-QgsPoint, int) -> int
qgis.core.QgsVectorLayerEditUtils.addPart?4(list-of-QgsPointXY, int) -> int
qgis.core.QgsVectorLayerEditUtils.translateFeature?4(int, float, float) -> int
qgis.core.QgsVectorLayerEditUtils.splitParts?4(list-of-QgsPoint, bool topologicalEditing=False) -> int
qgis.core.QgsVectorLayerEditUtils.splitFeatures?4(list-of-QgsPoint, bool topologicalEditing=False) -> int
qgis.core.QgsVectorLayerEditUtils.splitParts?4(list-of-QgsPointXY, bool topologicalEditing=False) -> int
qgis.core.QgsVectorLayerEditUtils.splitFeatures?4(list-of-QgsPointXY, bool topologicalEditing=False) -> int
qgis.core.QgsVectorLayerEditUtils.addTopologicalPoints?4(QgsGeometry) -> int
qgis.core.QgsVectorLayerEditUtils.addTopologicalPoints?4(QgsPoint) -> int
qgis.core.QgsVectorLayerEditUtils.insertSegmentVerticesForSnap?4(list-of-QgsSnappingResult) -> int
@ -4935,7 +4935,7 @@ qgis.core.QgsRasterDataProvider.buildPyramids?4(list-of-QgsRasterPyramid, QStrin
qgis.core.QgsRasterDataProvider.buildPyramidList?4(list-of-int overviewList=QList&lt;int&gt;()) -> list-of-QgsRasterPyramid
qgis.core.QgsRasterDataProvider.hasPyramids?4() -> bool
qgis.core.QgsRasterDataProvider.metadata?4() -> QString
qgis.core.QgsRasterDataProvider.identify?4(QgsPoint, QgsRaster.IdentifyFormat, QgsRectangle theExtent=QgsRectangle(), int theWidth=0, int theHeight=0) -> QgsRasterIdentifyResult
qgis.core.QgsRasterDataProvider.identify?4(QgsPointXY, QgsRaster.IdentifyFormat, QgsRectangle theExtent=QgsRectangle(), int theWidth=0, int theHeight=0) -> QgsRasterIdentifyResult
qgis.core.QgsRasterDataProvider.lastErrorTitle?4() -> QString
qgis.core.QgsRasterDataProvider.lastError?4() -> QString
qgis.core.QgsRasterDataProvider.lastErrorFormat?4() -> QString
@ -6955,12 +6955,12 @@ qgis.core.QgsDxfExport.writeGroupCode?4(int)
qgis.core.QgsDxfExport.writeInt?4(int)
qgis.core.QgsDxfExport.writeDouble?4(float)
qgis.core.QgsDxfExport.writeString?4(QString)
qgis.core.QgsDxfExport.writePolyline?4(list-of-QgsPoint, QString, QString, int, float width=-1, bool polygon=False)
qgis.core.QgsDxfExport.writeSolid?4(QString, int, QgsPoint, QgsPoint, QgsPoint, QgsPoint)
qgis.core.QgsDxfExport.writeLine?4(QgsPoint, QgsPoint, QString, QString, int, float width=-1)
qgis.core.QgsDxfExport.writePolyline?4(list-of-QgsPointXY, QString, QString, int, float width=-1, bool polygon=False)
qgis.core.QgsDxfExport.writeSolid?4(QString, int, QgsPointXY, QgsPointXY, QgsPointXY, QgsPoint)
qgis.core.QgsDxfExport.writeLine?4(QgsPointXY, QgsPointXY, QString, QString, int, float width=-1)
qgis.core.QgsDxfExport.writePoint?4(QString, int, QgsPoint)
qgis.core.QgsDxfExport.writeCircle?4(QString, int, QgsPoint, float)
qgis.core.QgsDxfExport.writeText?4(QString, QString, QgsPoint, float, float, int)
qgis.core.QgsDxfExport.writeCircle?4(QString, int, QgsPointXY, float)
qgis.core.QgsDxfExport.writeText?4(QString, QString, QgsPointXY, float, float, int)
qgis.core.QgsDxfExport.mapUnitScaleFactor?4(float, QgsSymbolV2.OutputUnit, QGis.UnitType) -> float
qgis.core.QgsDxfExport.dxfLayerName?4(QString) -> QString
qgis.gui.QgsBlendModeComboBox?1(QWidget parent=None)
@ -7731,8 +7731,8 @@ qgis.gui.QgsMapCanvasSnapper?1()
qgis.gui.QgsMapCanvasSnapper.__init__?1(self)
qgis.gui.QgsMapCanvasSnapper?1(QgsMapCanvasSnapper)
qgis.gui.QgsMapCanvasSnapper.__init__?1(self, QgsMapCanvasSnapper)
qgis.gui.QgsMapCanvasSnapper.snapToCurrentLayer?4(QPoint, QgsSnapper.SnappingType, float snappingTol=-1, list-of-QgsPoint excludePoints=QList&lt;QgsPoint&gt;()) -> (int, list-of-QgsSnappingResult)
qgis.gui.QgsMapCanvasSnapper.snapToBackgroundLayers?4(QPoint, list-of-QgsPoint excludePoints=QList&lt;QgsPoint&gt;()) -> (int, list-of-QgsSnappingResult)
qgis.gui.QgsMapCanvasSnapper.snapToCurrentLayer?4(QPoint, QgsSnapper.SnappingType, float snappingTol=-1, list-of-QgsPointXY excludePoints=QList&lt;QgsPoint&gt;()) -> (int, list-of-QgsSnappingResult)
qgis.gui.QgsMapCanvasSnapper.snapToBackgroundLayers?4(QPoint, list-of-QgsPointXY excludePoints=QList&lt;QgsPoint&gt;()) -> (int, list-of-QgsSnappingResult)
qgis.gui.QgsMapCanvasSnapper.setMapCanvas?4(QgsMapCanvas)
qgis.gui.QgsMapLayerAction?1(QString, QObject)
qgis.gui.QgsMapLayerAction.__init__?1(self, QString, QObject)
@ -7775,7 +7775,7 @@ qgis.gui.QgsMapTip?1()
qgis.gui.QgsMapTip.__init__?1(self)
qgis.gui.QgsMapTip?1(QgsMapTip)
qgis.gui.QgsMapTip.__init__?1(self, QgsMapTip)
qgis.gui.QgsMapTip.showMapTip?4(QgsMapLayer, QgsPoint, QPoint, QgsMapCanvas)
qgis.gui.QgsMapTip.showMapTip?4(QgsMapLayer, QgsPointXY, QPoint, QgsMapCanvas)
qgis.gui.QgsMapTip.clear?4(QgsMapCanvas)
qgis.gui.QgsMapTool?1(QgsMapCanvas)
qgis.gui.QgsMapTool.__init__?1(self, QgsMapCanvas)
@ -7808,7 +7808,7 @@ qgis.gui.QgsMapToolEmitPoint.__init__?1(self, QgsMapCanvas)
qgis.gui.QgsMapToolEmitPoint.canvasMoveEvent?4(QMouseEvent)
qgis.gui.QgsMapToolEmitPoint.canvasPressEvent?4(QMouseEvent)
qgis.gui.QgsMapToolEmitPoint.canvasReleaseEvent?4(QMouseEvent)
qgis.gui.QgsMapToolEmitPoint.canvasClicked?4(QgsPoint, Qt.MouseButton)
qgis.gui.QgsMapToolEmitPoint.canvasClicked?4(QgsPointXY, Qt.MouseButton)
qgis.gui.QgsMapToolIdentify.LayerType?10
qgis.gui.QgsMapToolIdentify.AllLayers?10
qgis.gui.QgsMapToolIdentify.VectorLayer?10
@ -8135,11 +8135,11 @@ qgis.gui.QgsRubberBand.setLineStyle?4(Qt.PenStyle)
qgis.gui.QgsRubberBand.setBrushStyle?4(Qt.BrushStyle)
qgis.gui.QgsRubberBand.reset?4(QGis.GeometryType geometryType=QGis.Line)
qgis.gui.QgsRubberBand.reset?4(bool)
qgis.gui.QgsRubberBand.addPoint?4(QgsPoint, bool doUpdate=True, int geometryIndex=0)
qgis.gui.QgsRubberBand.addPoint?4(QgsPointXY, bool doUpdate=True, int geometryIndex=0)
qgis.gui.QgsRubberBand.removePoint?4(int index=0, bool doUpdate=True, int geometryIndex=0)
qgis.gui.QgsRubberBand.removeLastPoint?4(int geometryIndex=0, bool doUpdate=True)
qgis.gui.QgsRubberBand.movePoint?4(QgsPoint, int geometryIndex=0)
qgis.gui.QgsRubberBand.movePoint?4(int, QgsPoint, int geometryIndex=0)
qgis.gui.QgsRubberBand.movePoint?4(QgsPointXY, int geometryIndex=0)
qgis.gui.QgsRubberBand.movePoint?4(int, QgsPointXY, int geometryIndex=0)
qgis.gui.QgsRubberBand.partSize?4(int) -> int
qgis.gui.QgsRubberBand.setToGeometry?4(QgsGeometry, QgsVectorLayer)
qgis.gui.QgsRubberBand.setToCanvasRectangle?4(QRect)
@ -9536,13 +9536,13 @@ qgis.networkanalysis.QgsGraphBuilderInterface.coordinateTransformationEnabled?4(
qgis.networkanalysis.QgsGraphBuilderInterface.topologyTolerance?4() -> float
qgis.networkanalysis.QgsGraphBuilderInterface.distanceArea?4() -> QgsDistanceArea
qgis.networkanalysis.QgsGraphBuilderInterface.addVertex?4(int, QgsPoint)
qgis.networkanalysis.QgsGraphBuilderInterface.addArc?4(int, QgsPoint, int, QgsPoint, list-of-QVariant)
qgis.networkanalysis.QgsGraphBuilderInterface.addArc?4(int, QgsPointXY, int, QgsPointXY, list-of-QVariant)
qgis.networkanalysis.QgsGraphBuilder?1(QgsCoordinateReferenceSystem, bool otfEnabled=True, float topologyTolerance=0, QString ellipsoidID="WGS84")
qgis.networkanalysis.QgsGraphBuilder.__init__?1(self, QgsCoordinateReferenceSystem, bool otfEnabled=True, float topologyTolerance=0, QString ellipsoidID="WGS84")
qgis.networkanalysis.QgsGraphBuilder?1(QgsGraphBuilder)
qgis.networkanalysis.QgsGraphBuilder.__init__?1(self, QgsGraphBuilder)
qgis.networkanalysis.QgsGraphBuilder.addVertex?4(int, QgsPoint)
qgis.networkanalysis.QgsGraphBuilder.addArc?4(int, QgsPoint, int, QgsPoint, list-of-QVariant)
qgis.networkanalysis.QgsGraphBuilder.addArc?4(int, QgsPointXY, int, QgsPointXY, list-of-QVariant)
qgis.networkanalysis.QgsGraphBuilder.graph?4() -> QgsGraph
qgis.networkanalysis.QgsGraphDirector?1()
qgis.networkanalysis.QgsGraphDirector.__init__?1(self)

4
src/analysis/interpolation/DualEdgeTriangulation.cc
View File

@ -3136,8 +3136,8 @@ bool DualEdgeTriangulation::saveAsShapefile( const QString &fileName ) const
Point3D *p1 = mPointVector[currentEdge->getPoint()];
Point3D *p2 = mPointVector[mHalfEdge[currentEdge->getDual()]->getPoint()];
QgsPolyline lineGeom;
lineGeom.push_back( QgsPoint( p1->getX(), p1->getY() ) );
lineGeom.push_back( QgsPoint( p2->getX(), p2->getY() ) );
lineGeom.push_back( QgsPointXY( p1->getX(), p1->getY() ) );
lineGeom.push_back( QgsPointXY( p2->getX(), p2->getY() ) );
edgeLineFeature.setGeometry( QgsGeometry::fromPolyline( lineGeom ) );
edgeLineFeature.initAttributes( 1 );

2
src/analysis/interpolation/qgstininterpolator.cpp
View File

@ -198,7 +198,7 @@ int QgsTINInterpolator::insertData( QgsFeature *f, bool zCoord, int attr, InputT
}
}
//parse WKB. It is ugly, but we cannot use the methods with QgsPoint because they don't contain z-values for 25D types
//parse WKB. It is ugly, but we cannot use the methods with QgsPointXY because they don't contain z-values for 25D types
bool hasZValue = false;
double x, y, z;
QByteArray wkb( g.exportToWkb() );

8
src/analysis/network/qgsgraph.cpp
View File

@ -24,7 +24,7 @@ QgsGraph::QgsGraph()
{
}
int QgsGraph::addVertex( const QgsPoint &pt )
int QgsGraph::addVertex( const QgsPointXY &pt )
{
mGraphVertexes.append( QgsGraphVertex( pt ) );
return mGraphVertexes.size() - 1;
@ -66,7 +66,7 @@ int QgsGraph::edgeCount() const
return mGraphEdges.size();
}
int QgsGraph::findVertex( const QgsPoint &pt ) const
int QgsGraph::findVertex( const QgsPointXY &pt ) const
{
int i = 0;
for ( i = 0; i < mGraphVertexes.size(); ++i )
@ -106,7 +106,7 @@ int QgsGraphEdge::outVertex() const
return mOut;
}
QgsGraphVertex::QgsGraphVertex( const QgsPoint &point )
QgsGraphVertex::QgsGraphVertex( const QgsPointXY &point )
: mCoordinate( point )
{
@ -122,7 +122,7 @@ QgsGraphEdgeIds QgsGraphVertex::inEdges() const
return mInEdges;
}
QgsPoint QgsGraphVertex::point() const
QgsPointXY QgsGraphVertex::point() const
{
return mCoordinate;
}

10
src/analysis/network/qgsgraph.h
View File

@ -97,7 +97,7 @@ class ANALYSIS_EXPORT QgsGraphVertex
* This constructor initializes QgsGraphVertex object and associates a vertex with a point
*/
QgsGraphVertex( const QgsPoint &point );
QgsGraphVertex( const QgsPointXY &point );
/**
* Returns outgoing edges ids
@ -112,10 +112,10 @@ class ANALYSIS_EXPORT QgsGraphVertex
/**
* Returns point associated with graph vertex
*/
QgsPoint point() const;
QgsPointXY point() const;
private:
QgsPoint mCoordinate;
QgsPointXY mCoordinate;
QgsGraphEdgeIds mOutEdges;
QgsGraphEdgeIds mInEdges;
@ -138,7 +138,7 @@ class ANALYSIS_EXPORT QgsGraph
/**
* Add a vertex to the graph
*/
int addVertex( const QgsPoint &pt );
int addVertex( const QgsPointXY &pt );
/**
* Add an edge to the graph
@ -169,7 +169,7 @@ class ANALYSIS_EXPORT QgsGraph
* Find vertex by associated point
* \returns vertex index
*/
int findVertex( const QgsPoint &pt ) const;
int findVertex( const QgsPointXY &pt ) const;
private:
QVector<QgsGraphVertex> mGraphVertexes;

4
src/analysis/network/qgsgraphbuilder.cpp
View File

@ -35,12 +35,12 @@ QgsGraphBuilder::~QgsGraphBuilder()
delete mGraph;
}
void QgsGraphBuilder::addVertex( int, const QgsPoint &pt )
void QgsGraphBuilder::addVertex( int, const QgsPointXY &pt )
{
mGraph->addVertex( pt );
}
void QgsGraphBuilder::addEdge( int pt1id, const QgsPoint &, int pt2id, const QgsPoint &, const QVector< QVariant > &prop )
void QgsGraphBuilder::addEdge( int pt1id, const QgsPointXY &, int pt2id, const QgsPointXY &, const QVector< QVariant > &prop )
{
mGraph->addEdge( pt1id, pt2id, prop );
}

4
src/analysis/network/qgsgraphbuilder.h
View File

@ -47,9 +47,9 @@ class ANALYSIS_EXPORT QgsGraphBuilder : public QgsGraphBuilderInterface
/*
* MANDATORY BUILDER PROPERTY DECLARATION
*/
virtual void addVertex( int id, const QgsPoint &pt ) override;
virtual void addVertex( int id, const QgsPointXY &pt ) override;
virtual void addEdge( int pt1id, const QgsPoint &pt1, int pt2id, const QgsPoint &pt2, const QVector< QVariant > &prop ) override;
virtual void addEdge( int pt1id, const QgsPointXY &pt1, int pt2id, const QgsPointXY &pt2, const QVector< QVariant > &prop ) override;
/**
* Returns generated QgsGraph

4
src/analysis/network/qgsgraphbuilderinterface.h
View File

@ -99,7 +99,7 @@ class ANALYSIS_EXPORT QgsGraphBuilderInterface
* \param pt vertex coordinates
* \note id and pt are redundant. You can use pt or id to identify the vertex
*/
virtual void addVertex( int id, const QgsPoint &pt )
virtual void addVertex( int id, const QgsPointXY &pt )
{
Q_UNUSED( id );
Q_UNUSED( pt );
@ -114,7 +114,7 @@ class ANALYSIS_EXPORT QgsGraphBuilderInterface
* \param strategies optimization strategies
* \note pt1id, pt1 and pt2id, pt2 is a redundant interface. You can use vertex coordinates or their identificators.
*/
virtual void addEdge( int pt1id, const QgsPoint &pt1, int pt2id, const QgsPoint &pt2, const QVector< QVariant > &strategies )
virtual void addEdge( int pt1id, const QgsPointXY &pt1, int pt2id, const QgsPointXY &pt2, const QVector< QVariant > &strategies )
{
Q_UNUSED( pt1id );
Q_UNUSED( pt1 );

6
src/analysis/network/qgsgraphdirector.h
View File

@ -69,11 +69,11 @@ class ANALYSIS_EXPORT QgsGraphDirector : public QObject
* \param builder the graph builder
* \param additionalPoints list of points that should be snapped to the graph
* \param snappedPoints list of snapped points
* \note if snappedPoints[i] == QgsPoint(0.0,0.0) then snapping failed.
* \note if snappedPoints[i] == QgsPointXY(0.0,0.0) then snapping failed.
*/
virtual void makeGraph( QgsGraphBuilderInterface *builder,
const QVector< QgsPoint > &additionalPoints,
QVector< QgsPoint > &snappedPoints SIP_OUT ) const
const QVector< QgsPointXY > &additionalPoints,
QVector< QgsPointXY > &snappedPoints SIP_OUT ) const
{
Q_UNUSED( builder );
Q_UNUSED( additionalPoints );

Some files were not shown because too many files have changed in this diff Show More