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

Deprecate method without transformContext

Browse Source
This commit is contained in:
Alessandro Pasotti 2019-03-27 15:59:36 +01:00 committed by Nyall Dawson
parent e930bee9e2
commit f8dfdc4aa0
3 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
python/core/auto_generated/processing/qgsprocessingutils.sip.in
View File

@ -176,10 +176,22 @@ temporary layer store.
available in Python bindings as createFeatureSink() available in Python bindings as createFeatureSink()
%End %End
static QgsRectangle combineLayerExtents( const QList<QgsMapLayer *> &layers, const QgsCoordinateReferenceSystem &crs = QgsCoordinateReferenceSystem() );
static QgsRectangle combineLayerExtents( const QList<QgsMapLayer *> &layers, const QgsCoordinateReferenceSystem &crs, const QgsCoordinateTransformContext &transformContext );
%Docstring
Combines the extent of several map ``layers``. If specified, the target ``crs``
will be used to transform the layer's extent to the desired output reference system
using the specified ``transformContext``.
.. versionadded:: 3.10
%End
static QgsRectangle combineLayerExtents( const QList<QgsMapLayer *> &layers, const QgsCoordinateReferenceSystem &crs = QgsCoordinateReferenceSystem() ) /Deprecated/;
%Docstring %Docstring
Combines the extent of several map ``layers``. If specified, the target ``crs`` Combines the extent of several map ``layers``. If specified, the target ``crs``
will be used to transform the layer's extent to the desired output reference system. will be used to transform the layer's extent to the desired output reference system.
.. deprecated:: Use version with transformContext argument instead
%End %End
static QVariant generateIteratingDestination( const QVariant &input, const QVariant &id, QgsProcessingContext &context ); static QVariant generateIteratingDestination( const QVariant &input, const QVariant &id, QgsProcessingContext &context );

10
src/core/processing/qgsprocessingutils.cpp
View File

@ -627,7 +627,7 @@ void QgsProcessingUtils::createFeatureSinkPython( QgsFeatureSink **sink, QString
} }
QgsRectangle QgsProcessingUtils::combineLayerExtents( const QList<QgsMapLayer *> &layers, const QgsCoordinateReferenceSystem &crs ) QgsRectangle QgsProcessingUtils::combineLayerExtents( const QList<QgsMapLayer *> &layers, const QgsCoordinateReferenceSystem &crs, const QgsCoordinateTransformContext &transformContext )
{ {
QgsRectangle extent; QgsRectangle extent;
for ( const QgsMapLayer *layer : layers ) for ( const QgsMapLayer *layer : layers )
@ -638,7 +638,7 @@ QgsRectangle QgsProcessingUtils::combineLayerExtents( const QList<QgsMapLayer *>
if ( crs.isValid() ) if ( crs.isValid() )
{ {
//transform layer extent to target CRS //transform layer extent to target CRS
QgsCoordinateTransform ct( layer->crs(), crs, QgsProject::instance()->transformContext() ); QgsCoordinateTransform ct( layer->crs(), crs, transformContext );
try try
{ {
QgsRectangle reprojExtent = ct.transformBoundingBox( layer->extent() ); QgsRectangle reprojExtent = ct.transformBoundingBox( layer->extent() );
@ -659,6 +659,12 @@ QgsRectangle QgsProcessingUtils::combineLayerExtents( const QList<QgsMapLayer *>
return extent; return extent;
} }
// Deprecated
QgsRectangle QgsProcessingUtils::combineLayerExtents( const QList<QgsMapLayer *> &layers, const QgsCoordinateReferenceSystem &crs )
{
return QgsProcessingUtils::combineLayerExtents( layers, crs, QgsCoordinateTransformContext( ) );
}
QVariant QgsProcessingUtils::generateIteratingDestination( const QVariant &input, const QVariant &id, QgsProcessingContext &context ) QVariant QgsProcessingUtils::generateIteratingDestination( const QVariant &input, const QVariant &id, QgsProcessingContext &context )
{ {
if ( !input.isValid() ) if ( !input.isValid() )

12
src/core/processing/qgsprocessingutils.h
View File

@ -213,11 +213,21 @@ class CORE_EXPORT QgsProcessingUtils
*/ */
static void createFeatureSinkPython( QgsFeatureSink **sink SIP_OUT SIP_TRANSFERBACK, QString &destination SIP_INOUT, QgsProcessingContext &context, const QgsFields &fields, QgsWkbTypes::Type geometryType, const QgsCoordinateReferenceSystem &crs, const QVariantMap &createOptions = QVariantMap() ) SIP_THROW( QgsProcessingException ) SIP_PYNAME( createFeatureSink ); static void createFeatureSinkPython( QgsFeatureSink **sink SIP_OUT SIP_TRANSFERBACK, QString &destination SIP_INOUT, QgsProcessingContext &context, const QgsFields &fields, QgsWkbTypes::Type geometryType, const QgsCoordinateReferenceSystem &crs, const QVariantMap &createOptions = QVariantMap() ) SIP_THROW( QgsProcessingException ) SIP_PYNAME( createFeatureSink );
/**
* Combines the extent of several map \a layers. If specified, the target \a crs
* will be used to transform the layer's extent to the desired output reference system
* using the specified \a transformContext.
* \since QGIS 3.10
*/
static QgsRectangle combineLayerExtents( const QList<QgsMapLayer *> &layers, const QgsCoordinateReferenceSystem &crs, const QgsCoordinateTransformContext &transformContext );
/** /**
* Combines the extent of several map \a layers. If specified, the target \a crs * Combines the extent of several map \a layers. If specified, the target \a crs
* will be used to transform the layer's extent to the desired output reference system. * will be used to transform the layer's extent to the desired output reference system.
* \deprecated Use version with transformContext argument instead
*/ */
static QgsRectangle combineLayerExtents( const QList<QgsMapLayer *> &layers, const QgsCoordinateReferenceSystem &crs = QgsCoordinateReferenceSystem() ); Q_DECL_DEPRECATED static QgsRectangle combineLayerExtents( const QList<QgsMapLayer *> &layers, const QgsCoordinateReferenceSystem &crs = QgsCoordinateReferenceSystem() ) SIP_DEPRECATED;
/** /**
* Converts an \a input parameter value for use in source iterating mode, where one individual sink * Converts an \a input parameter value for use in source iterating mode, where one individual sink