Skip to content

Commit febf0a0

Browse files
nyalldawsonnyalldawson
committedJul 8, 2017
Rename method to more generic name - it's usable by vector layer outputs too
·
ltr-3_40final-3_0_0
1 parent d443bb3 commit febf0a0

File tree

8 files changed

+15
-15
lines changed

8 files changed

+15
-15
lines changed
 

‎python/core/processing/qgsprocessingalgorithm.sip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -559,9 +559,9 @@ class QgsProcessingAlgorithm
559559
:rtype: QgsRasterLayer
560560
%End
561561

562-
QString parameterAsRasterOutputLayer( const QVariantMap &parameters, const QString &name, QgsProcessingContext &context ) const;
562+
QString parameterAsOutputLayer( const QVariantMap &parameters, const QString &name, QgsProcessingContext &context ) const;
563563
%Docstring
564-
Evaluates the parameter with matching ``name`` to a raster output layer destination.
564+
Evaluates the parameter with matching ``name`` to a output layer destination.
565565
:rtype: str
566566
%End
567567

‎python/core/processing/qgsprocessingparameters.sip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -508,9 +508,9 @@ class QgsProcessingParameters
508508
:rtype: QgsRasterLayer
509509
%End
510510

511-
static QString parameterAsRasterOutputLayer( const QgsProcessingParameterDefinition *definition, const QVariantMap &parameters, QgsProcessingContext &context );
511+
static QString parameterAsOutputLayer( const QgsProcessingParameterDefinition *definition, const QVariantMap &parameters, QgsProcessingContext &context );
512512
%Docstring
513-
Evaluates the parameter with matching ``definition`` to a raster output layer destination.
513+
Evaluates the parameter with matching ``definition`` to a output layer destination.
514514
:rtype: str
515515
%End
516516

‎python/plugins/processing/algs/qgis/Aspect.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def processAlgorithm(self, parameters, context, feedback):
7878
inputFile = exportRasterLayer(self.parameterAsRasterLayer(parameters, self.INPUT, context))
7979
zFactor = self.parameterAsDouble(parameters, self.Z_FACTOR, context)
8080

81-
outputFile = self.parameterAsRasterOutputLayer(parameters, self.OUTPUT, context)
81+
outputFile = self.parameterAsOutputLayer(parameters, self.OUTPUT, context)
8282

8383
outputFormat = raster.formatShortNameFromFileName(outputFile)
8484

‎src/core/processing/qgsprocessingalgorithm.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -518,9 +518,9 @@ QgsRasterLayer *QgsProcessingAlgorithm::parameterAsRasterLayer( const QVariantMa
518518
return QgsProcessingParameters::parameterAsRasterLayer( parameterDefinition( name ), parameters, context );
519519
}
520520

521-
QString QgsProcessingAlgorithm::parameterAsRasterOutputLayer( const QVariantMap &parameters, const QString &name, QgsProcessingContext &context ) const
521+
QString QgsProcessingAlgorithm::parameterAsOutputLayer( const QVariantMap &parameters, const QString &name, QgsProcessingContext &context ) const
522522
{
523-
return QgsProcessingParameters::parameterAsRasterOutputLayer( parameterDefinition( name ), parameters, context );
523+
return QgsProcessingParameters::parameterAsOutputLayer( parameterDefinition( name ), parameters, context );
524524
}
525525

526526
QString QgsProcessingAlgorithm::parameterAsFileOutput( const QVariantMap &parameters, const QString &name, QgsProcessingContext &context ) const

‎src/core/processing/qgsprocessingalgorithm.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -529,9 +529,9 @@ class CORE_EXPORT QgsProcessingAlgorithm
529529
QgsRasterLayer *parameterAsRasterLayer( const QVariantMap &parameters, const QString &name, QgsProcessingContext &context ) const;
530530

531531
/**
532-
* Evaluates the parameter with matching \a name to a raster output layer destination.
532+
* Evaluates the parameter with matching \a name to a output layer destination.
533533
*/
534-
QString parameterAsRasterOutputLayer( const QVariantMap &parameters, const QString &name, QgsProcessingContext &context ) const;
534+
QString parameterAsOutputLayer( const QVariantMap &parameters, const QString &name, QgsProcessingContext &context ) const;
535535

536536
/**
537537
* Evaluates the parameter with matching \a name to a file based output destination.

‎src/core/processing/qgsprocessingparameters.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ QgsRasterLayer *QgsProcessingParameters::parameterAsRasterLayer( const QgsProces
413413
return qobject_cast< QgsRasterLayer *>( parameterAsLayer( definition, parameters, context ) );
414414
}
415415

416-
QString QgsProcessingParameters::parameterAsRasterOutputLayer( const QgsProcessingParameterDefinition *definition, const QVariantMap &parameters, QgsProcessingContext &context )
416+
QString QgsProcessingParameters::parameterAsOutputLayer( const QgsProcessingParameterDefinition *definition, const QVariantMap &parameters, QgsProcessingContext &context )
417417
{
418418
QVariant val;
419419
if ( definition )

‎src/core/processing/qgsprocessingparameters.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -543,9 +543,9 @@ class CORE_EXPORT QgsProcessingParameters
543543
static QgsRasterLayer *parameterAsRasterLayer( const QgsProcessingParameterDefinition *definition, const QVariantMap &parameters, QgsProcessingContext &context );
544544

545545
/**
546-
* Evaluates the parameter with matching \a definition to a raster output layer destination.
546+
* Evaluates the parameter with matching \a definition to a output layer destination.
547547
*/
548-
static QString parameterAsRasterOutputLayer( const QgsProcessingParameterDefinition *definition, const QVariantMap &parameters, QgsProcessingContext &context );
548+
static QString parameterAsOutputLayer( const QgsProcessingParameterDefinition *definition, const QVariantMap &parameters, QgsProcessingContext &context );
549549

550550
/**
551551
* Evaluates the parameter with matching \a definition to a file based output destination.

‎tests/src/core/testqgsprocessing.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3696,9 +3696,9 @@ void TestQgsProcessing::parameterRasterOut()
36963696

36973697
QVariantMap params;
36983698
params.insert( "non_optional", "test.tif" );
3699-
QCOMPARE( QgsProcessingParameters::parameterAsRasterOutputLayer( def.get(), params, context ), QStringLiteral( "test.tif" ) );
3699+
QCOMPARE( QgsProcessingParameters::parameterAsOutputLayer( def.get(), params, context ), QStringLiteral( "test.tif" ) );
37003700
params.insert( "non_optional", QgsProcessingOutputLayerDefinition( "test.tif" ) );
3701-
QCOMPARE( QgsProcessingParameters::parameterAsRasterOutputLayer( def.get(), params, context ), QStringLiteral( "test.tif" ) );
3701+
QCOMPARE( QgsProcessingParameters::parameterAsOutputLayer( def.get(), params, context ), QStringLiteral( "test.tif" ) );
37023702

37033703
QCOMPARE( def->valueAsPythonString( QStringLiteral( "abc" ), context ), QStringLiteral( "'abc'" ) );
37043704
QCOMPARE( def->valueAsPythonString( QVariant::fromValue( QgsProcessingOutputLayerDefinition( "abc" ) ), context ), QStringLiteral( "QgsProcessingOutputLayerDefinition('abc')" ) );
@@ -3738,7 +3738,7 @@ void TestQgsProcessing::parameterRasterOut()
37383738
QVERIFY( def->checkValueIsAcceptable( QgsProcessingOutputLayerDefinition( "layer1231123" ) ) );
37393739

37403740
params.insert( "optional", QVariant() );
3741-
QCOMPARE( QgsProcessingParameters::parameterAsRasterOutputLayer( def.get(), params, context ), QStringLiteral( "default.tif" ) );
3741+
QCOMPARE( QgsProcessingParameters::parameterAsOutputLayer( def.get(), params, context ), QStringLiteral( "default.tif" ) );
37423742

37433743
code = def->asScriptCode();
37443744
QCOMPARE( code, QStringLiteral( "##optional=optional rasterOut default.tif" ) );

0 commit comments

Comments
 (0)
Please sign in to comment.