sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-18 00:03:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix constructor and skip method with same python signature

Browse Source
This commit is contained in:
Denis Rouzaud 2017-06-13 08:26:52 +02:00 committed by Nyall Dawson
parent 1a961e8045
commit 8053b96ec0
2 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,11 +36,6 @@ class QgsReferencedGeometryPrimitive
Constructor for QgsReferencedGeometryPrimitive, for the specified ``primitive`` and ``crs``. Constructor for QgsReferencedGeometryPrimitive, for the specified ``primitive`` and ``crs``.
%End %End
T primitive() const;
%Docstring
Returns the geometry primitive.
:rtype: T
%End
T &primitive(); T &primitive();
%Docstring %Docstring
@ -66,6 +61,7 @@ class QgsReferencedGeometryPrimitive
}; };
typedef QgsReferencedGeometryPrimitive<QgsRectangle> QgsReferencedGeometryPrimitiveQgsRectangleBase; typedef QgsReferencedGeometryPrimitive<QgsRectangle> QgsReferencedGeometryPrimitiveQgsRectangleBase;
class QgsReferencedRectangle : QgsReferencedGeometryPrimitiveQgsRectangleBase class QgsReferencedRectangle : QgsReferencedGeometryPrimitiveQgsRectangleBase
@ -81,7 +77,7 @@ typedef QgsReferencedGeometryPrimitive<QgsRectangle> QgsReferencedGeometryPrimit
%End %End
public: public:
QgsReferencedRectangle(); QgsReferencedRectangle( const QgsRectangle &rect );
%Docstring %Docstring
Construct a default optional expression. Construct a default optional expression.
It will be disabled and with an empty expression. It will be disabled and with an empty expression.
@ -89,16 +85,12 @@ typedef QgsReferencedGeometryPrimitive<QgsRectangle> QgsReferencedGeometryPrimit
QgsRectangle &rect(); QgsRectangle &rect();
%Docstring %Docstring
Returns the rectangles
:rtype: QgsRectangle :rtype: QgsRectangle
%End %End
}; };
/************************************************************************ /************************************************************************
* This file has been generated automatically from * * This file has been generated automatically from *
* * * *

15
src/core/geometry/qgsreferencedgeometry.h
View File

@ -53,7 +53,7 @@ class CORE_EXPORT QgsReferencedGeometryPrimitive
/** /**
* Returns the geometry primitive. * Returns the geometry primitive.
*/ */
T primitive() const { return mPrimitive; } T primitive() const { return mPrimitive; } SIP_SKIP
/** /**
* Returns the geometry primitive. * Returns the geometry primitive.
@ -81,7 +81,10 @@ class CORE_EXPORT QgsReferencedGeometryPrimitive
}; };
//template class QgsReferencedGeometryPrimitive< QgsRectangle > QgsReferencedRectangle;
/** /**
* \ingroup core
* A QgsRectangle with associated coordinate reference system. * A QgsRectangle with associated coordinate reference system.
* \since QGIS 3.0 * \since QGIS 3.0
*/ */
@ -93,15 +96,13 @@ class CORE_EXPORT QgsReferencedRectangle : public QgsReferencedGeometryPrimitive
* Construct a default optional expression. * Construct a default optional expression.
* It will be disabled and with an empty expression. * It will be disabled and with an empty expression.
*/ */
QgsReferencedRectangle(); QgsReferencedRectangle( const QgsRectangle &rect ) : QgsReferencedGeometryPrimitive( rect ) {}
/**
* Returns the rectangles
*/
QgsRectangle &rect() { return primitive(); } QgsRectangle &rect() { return primitive(); }
}; };
#endif // QGSREFERENCEDGEOMETRY_H #endif // QGSREFERENCEDGEOMETRY_H