Skip to content

Commit 52f4c5e

Browse files
nyalldawsonnyalldawson
authoredJul 7, 2017
Merge pull request #4799 from nyalldawson/m2
Run processing algorithms using task manager
2 parents 29c4fcf + 240dd19 commit 52f4c5e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+1323
-515
lines changed
 

‎python/analysis/vector/qgsgeometrysnapper.sip

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ class QgsGeometrySnapper : QObject
3333
EndPointToEndPoint,
3434
};
3535

36-
QgsGeometrySnapper( QgsVectorLayer *referenceLayer );
36+
QgsGeometrySnapper( QgsFeatureSource *referenceSource );
3737
%Docstring
38-
Constructor for QgsGeometrySnapper. A reference layer which contains geometries to snap to must be
38+
Constructor for QgsGeometrySnapper. A reference feature source which contains geometries to snap to must be
3939
set. It is assumed that all geometries snapped using this object will have the
40-
same CRS as the reference layer (ie, no reprojection is performed).
40+
same CRS as the reference source (ie, no reprojection is performed).
4141
%End
4242

4343
QgsGeometry snapGeometry( const QgsGeometry &geometry, double snapTolerance, SnapMode mode = PreferNodes ) const;

‎python/core/core.sip

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,5 +104,7 @@ done:
104104
%Include core_auto.sip
105105

106106
%VirtualErrorHandler processing_exception_handler
107-
throw QgsProcessingException( getTraceback() );
107+
QString trace = getTraceback();
108+
SIP_RELEASE_GIL( sipGILState );
109+
throw QgsProcessingException( trace );
108110
%End

0 commit comments

Comments
 (0)