Skip to content

Commit 6165e4c

Browse files
nyalldawsonnyalldawson
committedMay 22, 2018
Add some SIP_THROW( QgsCsException ) annotations
Incomplete, but allows proper QgsCsException catching for these methods
·
ltr-3_40final-3_2_0
1 parent f82b639 commit 6165e4c

20 files changed

+36
-50
lines changed
 

‎python/core/auto_generated/geometry/qgsabstractgeometry.sip.in

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -258,9 +258,7 @@ Returns a GeoJSON representation of the geometry.
258258
%End
259259

260260

261-
virtual void transform( const QgsCoordinateTransform &ct,
262-
QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform,
263-
bool transformZ = false ) = 0;
261+
virtual void transform( const QgsCoordinateTransform &ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform, bool transformZ = false ) throw( QgsCsException ) = 0;
264262
%Docstring
265263
Transforms the geometry using a coordinate transform
266264

‎python/core/auto_generated/geometry/qgscircularstring.sip.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ Sets the circular string's points
115115

116116
virtual void draw( QPainter &p ) const;
117117

118-
virtual void transform( const QgsCoordinateTransform &ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform,
119-
bool transformZ = false );
118+
virtual void transform( const QgsCoordinateTransform &ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform, bool transformZ = false ) throw( QgsCsException );
119+
120120
virtual void transform( const QTransform &t, double zTranslate = 0.0, double zScale = 1.0, double mTranslate = 0.0, double mScale = 1.0 );
121121

122122
virtual void addToPainterPath( QPainterPath &path ) const;

‎python/core/auto_generated/geometry/qgscompoundcurve.sip.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ Adds a vertex to the end of the geometry.
110110

111111
virtual void draw( QPainter &p ) const;
112112

113-
virtual void transform( const QgsCoordinateTransform &ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform,
114-
bool transformZ = false );
113+
virtual void transform( const QgsCoordinateTransform &ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform, bool transformZ = false ) throw( QgsCsException );
114+
115115
virtual void transform( const QTransform &t, double zTranslate = 0.0, double zScale = 1.0, double mTranslate = 0.0, double mScale = 1.0 );
116116

117117
virtual void addToPainterPath( QPainterPath &path ) const;

‎python/core/auto_generated/geometry/qgscurvepolygon.sip.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ area will be removed.
127127

128128
virtual void draw( QPainter &p ) const;
129129

130-
virtual void transform( const QgsCoordinateTransform &ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform,
131-
bool transformZ = false );
130+
virtual void transform( const QgsCoordinateTransform &ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform, bool transformZ = false ) throw( QgsCsException );
131+
132132
virtual void transform( const QTransform &t, double zTranslate = 0.0, double zScale = 1.0, double mTranslate = 0.0, double mScale = 1.0 );
133133

134134

‎python/core/auto_generated/geometry/qgsgeometry.sip.in

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -632,9 +632,7 @@ Translates this geometry by dx, dy, dz and dm.
632632
:return: OperationResult a result code: success or reason of failure
633633
%End
634634

635-
OperationResult transform( const QgsCoordinateTransform &ct,
636-
QgsCoordinateTransform::TransformDirection direction = QgsCoordinateTransform::ForwardTransform,
637-
bool transformZ = false );
635+
OperationResult transform( const QgsCoordinateTransform &ct, QgsCoordinateTransform::TransformDirection direction = QgsCoordinateTransform::ForwardTransform, bool transformZ = false ) throw( QgsCsException );
638636
%Docstring
639637
Transforms this geometry as described by the coordinate transform ``ct``.
640638

‎python/core/auto_generated/geometry/qgsgeometrycollection.sip.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ Removes a geometry from the collection.
8989
:return: true if removal was successful.
9090
%End
9191

92-
virtual void transform( const QgsCoordinateTransform &ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform,
93-
bool transformZ = false );
92+
virtual void transform( const QgsCoordinateTransform &ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform, bool transformZ = false ) throw( QgsCsException );
93+
9494
virtual void transform( const QTransform &t, double zTranslate = 0.0, double zScale = 1.0, double mTranslate = 0.0, double mScale = 1.0 );
9595

9696

‎python/core/auto_generated/geometry/qgslinestring.sip.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,8 +258,8 @@ of the curve.
258258
virtual void draw( QPainter &p ) const;
259259

260260

261-
virtual void transform( const QgsCoordinateTransform &ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform,
262-
bool transformZ = false );
261+
virtual void transform( const QgsCoordinateTransform &ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform, bool transformZ = false ) throw( QgsCsException );
262+
263263
virtual void transform( const QTransform &t, double zTranslate = 0.0, double zScale = 1.0, double mTranslate = 0.0, double mScale = 1.0 );
264264

265265

‎python/core/auto_generated/geometry/qgspoint.sip.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -360,8 +360,8 @@ Example:
360360

361361
virtual void draw( QPainter &p ) const;
362362

363-
virtual void transform( const QgsCoordinateTransform &ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform,
364-
bool transformZ = false );
363+
virtual void transform( const QgsCoordinateTransform &ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform, bool transformZ = false ) throw( QgsCsException );
364+
365365
virtual void transform( const QTransform &t, double zTranslate = 0.0, double zScale = 1.0, double mTranslate = 0.0, double mScale = 1.0 );
366366

367367
virtual QgsCoordinateSequence coordinateSequence() const;

‎python/core/auto_generated/qgscoordinatetransform.sip.in

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ transform coordinates to.
179179
.. seealso:: :py:func:`sourceCrs`
180180
%End
181181

182-
QgsPointXY transform( const QgsPointXY &point, TransformDirection direction = ForwardTransform ) const;
182+
QgsPointXY transform( const QgsPointXY &point, TransformDirection direction = ForwardTransform ) const throw( QgsCsException );
183183
%Docstring
184184
Transform the point from the source CRS to the destination CRS.
185185
If the direction is ForwardTransform then coordinates are transformed from source to destination,
@@ -204,7 +204,7 @@ otherwise points are transformed from destination to source CRS.
204204
:return: transformed point
205205
%End
206206

207-
QgsRectangle transformBoundingBox( const QgsRectangle &rectangle, TransformDirection direction = ForwardTransform, const bool handle180Crossover = false ) const;
207+
QgsRectangle transformBoundingBox( const QgsRectangle &rectangle, TransformDirection direction = ForwardTransform, const bool handle180Crossover = false ) const throw( QgsCsException );
208208
%Docstring
209209
Transforms a rectangle from the source CRS to the destination CRS.
210210
If the direction is ForwardTransform then coordinates are transformed from source to destination,
@@ -221,7 +221,7 @@ crossing the 180 degree longitude line is required
221221
:return: rectangle in destination CRS
222222
%End
223223

224-
void transformInPlace( double &x, double &y, double &z, TransformDirection direction = ForwardTransform ) const;
224+
void transformInPlace( double &x, double &y, double &z, TransformDirection direction = ForwardTransform ) const throw( QgsCsException );
225225
%Docstring
226226
Transforms an array of x, y and z double coordinates in place, from the source CRS to the destination CRS.
227227
If the direction is ForwardTransform then coordinates are transformed from source to destination,
@@ -239,15 +239,15 @@ heights) and must be expressed in its vertical units (generally meters)
239239

240240

241241

242-
void transformPolygon( QPolygonF &polygon, TransformDirection direction = ForwardTransform ) const;
242+
void transformPolygon( QPolygonF &polygon, TransformDirection direction = ForwardTransform ) const throw( QgsCsException );
243243
%Docstring
244244
Transforms a polygon to the destination coordinate system.
245245

246246
:param polygon: polygon to transform (occurs in place)
247247
:param direction: transform direction (defaults to forward transformation)
248248
%End
249249

250-
QgsRectangle transform( const QgsRectangle &rectangle, TransformDirection direction = ForwardTransform ) const;
250+
QgsRectangle transform( const QgsRectangle &rectangle, TransformDirection direction = ForwardTransform ) const throw( QgsCsException );
251251
%Docstring
252252
Transforms a rectangle to the destination CRS.
253253
If the direction is ForwardTransform then coordinates are transformed from source to destination,
@@ -259,7 +259,7 @@ otherwise points are transformed from destination to source CRS.
259259
:return: transformed rectangle
260260
%End
261261

262-
void transformCoords( int numPoint, double *x, double *y, double *z, TransformDirection direction = ForwardTransform ) const;
262+
void transformCoords( int numPoint, double *x, double *y, double *z, TransformDirection direction = ForwardTransform ) const throw( QgsCsException );
263263
%Docstring
264264
Transform an array of coordinates to the destination CRS.
265265
If the direction is ForwardTransform then coordinates are transformed from source to destination,

‎python/core/auto_generated/qgsfeatureiterator.sip.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ QgsFeatureRequest.destinationCrs() set on the request is respected.
118118
%End
119119

120120

121-
QgsRectangle filterRectToSourceCrs( const QgsCoordinateTransform &transform ) const;
121+
QgsRectangle filterRectToSourceCrs( const QgsCoordinateTransform &transform ) const throw( QgsCsException );
122122
%Docstring
123123
Returns a rectangle representing the original request's :py:func:`QgsFeatureRequest.filterRect()`
124124
If ``transform`` is a valid coordinate transform, the return rectangle will represent

‎src/core/geometry/qgsabstractgeometry.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -282,9 +282,7 @@ class CORE_EXPORT QgsAbstractGeometry
282282
* units (generally meters). If false, then z coordinates will not be changed by the
283283
* transform.
284284
*/
285-
virtual void transform( const QgsCoordinateTransform &ct,
286-
QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform,
287-
bool transformZ = false ) = 0;
285+
virtual void transform( const QgsCoordinateTransform &ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform, bool transformZ = false ) SIP_THROW( QgsCsException ) = 0;
288286

289287
/**
290288
* Transforms the x and y components of the geometry using a QTransform object \a t.

‎src/core/geometry/qgscircularstring.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,7 @@ class CORE_EXPORT QgsCircularString: public QgsCurve
104104
bool removeDuplicateNodes( double epsilon = 4 * DBL_EPSILON, bool useZValues = false ) override;
105105

106106
void draw( QPainter &p ) const override;
107-
void transform( const QgsCoordinateTransform &ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform,
108-
bool transformZ = false ) override;
107+
void transform( const QgsCoordinateTransform &ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform, bool transformZ = false ) override SIP_THROW( QgsCsException );
109108
void transform( const QTransform &t, double zTranslate = 0.0, double zScale = 1.0, double mTranslate = 0.0, double mScale = 1.0 ) override;
110109
void addToPainterPath( QPainterPath &path ) const override;
111110
void drawAsPolygon( QPainter &p ) const override;

‎src/core/geometry/qgscompoundcurve.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,7 @@ class CORE_EXPORT QgsCompoundCurve: public QgsCurve
9797
void addVertex( const QgsPoint &pt );
9898

9999
void draw( QPainter &p ) const override;
100-
void transform( const QgsCoordinateTransform &ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform,
101-
bool transformZ = false ) override;
100+
void transform( const QgsCoordinateTransform &ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform, bool transformZ = false ) override SIP_THROW( QgsCsException );
102101
void transform( const QTransform &t, double zTranslate = 0.0, double zScale = 1.0, double mTranslate = 0.0, double mScale = 1.0 ) override;
103102
void addToPainterPath( QPainterPath &path ) const override;
104103
void drawAsPolygon( QPainter &p ) const override;

‎src/core/geometry/qgscurvepolygon.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,7 @@ class CORE_EXPORT QgsCurvePolygon: public QgsSurface
110110
void removeInteriorRings( double minimumAllowedArea = -1 );
111111

112112
void draw( QPainter &p ) const override;
113-
void transform( const QgsCoordinateTransform &ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform,
114-
bool transformZ = false ) override;
113+
void transform( const QgsCoordinateTransform &ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform, bool transformZ = false ) override SIP_THROW( QgsCsException );
115114
void transform( const QTransform &t, double zTranslate = 0.0, double zScale = 1.0, double mTranslate = 0.0, double mScale = 1.0 ) override;
116115

117116
bool insertVertex( QgsVertexId position, const QgsPoint &vertex ) override;

‎src/core/geometry/qgsgeometry.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -660,9 +660,7 @@ class CORE_EXPORT QgsGeometry
660660
*
661661
* \returns OperationResult a result code: success or reason of failure
662662
*/
663-
OperationResult transform( const QgsCoordinateTransform &ct,
664-
QgsCoordinateTransform::TransformDirection direction = QgsCoordinateTransform::ForwardTransform,
665-
bool transformZ = false );
663+
OperationResult transform( const QgsCoordinateTransform &ct, QgsCoordinateTransform::TransformDirection direction = QgsCoordinateTransform::ForwardTransform, bool transformZ = false ) SIP_THROW( QgsCsException );
666664

667665
/**
668666
* Transforms the x and y components of the geometry using a QTransform object \a t.

‎src/core/geometry/qgsgeometrycollection.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,7 @@ class CORE_EXPORT QgsGeometryCollection: public QgsAbstractGeometry
9090
*/
9191
virtual bool removeGeometry( int nr );
9292

93-
void transform( const QgsCoordinateTransform &ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform,
94-
bool transformZ = false ) override;
93+
void transform( const QgsCoordinateTransform &ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform, bool transformZ = false ) override SIP_THROW( QgsCsException );
9594
void transform( const QTransform &t, double zTranslate = 0.0, double zScale = 1.0, double mTranslate = 0.0, double mScale = 1.0 ) override;
9695

9796
void draw( QPainter &p ) const override;

‎src/core/geometry/qgslinestring.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,7 @@ class CORE_EXPORT QgsLineString: public QgsCurve
222222

223223
void draw( QPainter &p ) const override;
224224

225-
void transform( const QgsCoordinateTransform &ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform,
226-
bool transformZ = false ) override;
225+
void transform( const QgsCoordinateTransform &ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform, bool transformZ = false ) override SIP_THROW( QgsCsException );
227226
void transform( const QTransform &t, double zTranslate = 0.0, double zScale = 1.0, double mTranslate = 0.0, double mScale = 1.0 ) override;
228227

229228
void addToPainterPath( QPainterPath &path ) const override;

‎src/core/geometry/qgspoint.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,8 +402,7 @@ class CORE_EXPORT QgsPoint: public QgsAbstractGeometry
402402
QDomElement asGml3( QDomDocument &doc, int precision = 17, const QString &ns = "gml", QgsAbstractGeometry::AxisOrder axisOrder = QgsAbstractGeometry::AxisOrder::XY ) const override;
403403
QString asJson( int precision = 17 ) const override;
404404
void draw( QPainter &p ) const override;
405-
void transform( const QgsCoordinateTransform &ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform,
406-
bool transformZ = false ) override;
405+
void transform( const QgsCoordinateTransform &ct, QgsCoordinateTransform::TransformDirection d = QgsCoordinateTransform::ForwardTransform, bool transformZ = false ) override SIP_THROW( QgsCsException );
407406
void transform( const QTransform &t, double zTranslate = 0.0, double zScale = 1.0, double mTranslate = 0.0, double mScale = 1.0 ) override;
408407
QgsCoordinateSequence coordinateSequence() const override;
409408
int nCoordinates() const override;

‎src/core/qgscoordinatetransform.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ class CORE_EXPORT QgsCoordinateTransform
203203
* \param direction transform direction (defaults to ForwardTransform)
204204
* \returns transformed point
205205
*/
206-
QgsPointXY transform( const QgsPointXY &point, TransformDirection direction = ForwardTransform ) const;
206+
QgsPointXY transform( const QgsPointXY &point, TransformDirection direction = ForwardTransform ) const SIP_THROW( QgsCsException );
207207

208208
/**
209209
* Transform the point specified by x,y from the source CRS to the destination CRS.
@@ -229,7 +229,7 @@ class CORE_EXPORT QgsCoordinateTransform
229229
* crossing the 180 degree longitude line is required
230230
* \returns rectangle in destination CRS
231231
*/
232-
QgsRectangle transformBoundingBox( const QgsRectangle &rectangle, TransformDirection direction = ForwardTransform, const bool handle180Crossover = false ) const;
232+
QgsRectangle transformBoundingBox( const QgsRectangle &rectangle, TransformDirection direction = ForwardTransform, const bool handle180Crossover = false ) const SIP_THROW( QgsCsException );
233233

234234
/**
235235
* Transforms an array of x, y and z double coordinates in place, from the source CRS to the destination CRS.
@@ -242,7 +242,7 @@ class CORE_EXPORT QgsCoordinateTransform
242242
* heights) and must be expressed in its vertical units (generally meters)
243243
* \param direction transform direction (defaults to ForwardTransform)
244244
*/
245-
void transformInPlace( double &x, double &y, double &z, TransformDirection direction = ForwardTransform ) const;
245+
void transformInPlace( double &x, double &y, double &z, TransformDirection direction = ForwardTransform ) const SIP_THROW( QgsCsException );
246246

247247
/**
248248
* Transforms an array of x, y and z float coordinates in place, from the source CRS to the destination CRS.
@@ -307,7 +307,7 @@ class CORE_EXPORT QgsCoordinateTransform
307307
* \param polygon polygon to transform (occurs in place)
308308
* \param direction transform direction (defaults to forward transformation)
309309
*/
310-
void transformPolygon( QPolygonF &polygon, TransformDirection direction = ForwardTransform ) const;
310+
void transformPolygon( QPolygonF &polygon, TransformDirection direction = ForwardTransform ) const SIP_THROW( QgsCsException );
311311

312312
/**
313313
* Transforms a rectangle to the destination CRS.
@@ -317,7 +317,7 @@ class CORE_EXPORT QgsCoordinateTransform
317317
* \param direction transform direction (defaults to ForwardTransform)
318318
* \returns transformed rectangle
319319
*/
320-
QgsRectangle transform( const QgsRectangle &rectangle, TransformDirection direction = ForwardTransform ) const;
320+
QgsRectangle transform( const QgsRectangle &rectangle, TransformDirection direction = ForwardTransform ) const SIP_THROW( QgsCsException );
321321

322322
/**
323323
* Transform an array of coordinates to the destination CRS.
@@ -329,7 +329,7 @@ class CORE_EXPORT QgsCoordinateTransform
329329
* \param z array of z coordinates to transform
330330
* \param direction transform direction (defaults to ForwardTransform)
331331
*/
332-
void transformCoords( int numPoint, double *x, double *y, double *z, TransformDirection direction = ForwardTransform ) const;
332+
void transformCoords( int numPoint, double *x, double *y, double *z, TransformDirection direction = ForwardTransform ) const SIP_THROW( QgsCsException );
333333

334334
/**
335335
* Returns true if the transform short circuits because the source and destination are equivalent.

‎src/core/qgsfeatureiterator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ class CORE_EXPORT QgsAbstractFeatureIterator
139139
* Will throw a QgsCsException if the rect cannot be transformed from the destination CRS.
140140
* \since QGIS 3.0
141141
*/
142-
QgsRectangle filterRectToSourceCrs( const QgsCoordinateTransform &transform ) const;
142+
QgsRectangle filterRectToSourceCrs( const QgsCoordinateTransform &transform ) const SIP_THROW( QgsCsException );
143143

144144
//! A copy of the feature request.
145145
QgsFeatureRequest mRequest;

0 commit comments

Comments
 (0)
Please sign in to comment.