[processing] Fix duplicate parameter

nyalldawson · nyalldawson · commit 285bb0631b38 · 2018-01-28T19:09:12.000+11:00
And throw warnings when other duplicate parameters are registered.

GRASS has a lot.
diff --git a/src/analysis/processing/qgsalgorithmuniquevalueindex.cpp b/src/analysis/processing/qgsalgorithmuniquevalueindex.cpp
@@ -62,8 +62,6 @@ void QgsAddUniqueValueIndexAlgorithm::initAlgorithm( const QVariantMap & )
   classedOutput->setCreateByDefault( true );
   addParameter( classedOutput.release() );
 
-  addParameter( new QgsProcessingParameterFeatureSink( QStringLiteral( "OUTPUT" ), QObject::tr( "Layer with index field" ), QgsProcessing::TypeVector, QVariant(), true ) );
-
   std::unique_ptr< QgsProcessingParameterFeatureSink > summaryOutput = qgis::make_unique< QgsProcessingParameterFeatureSink >( QStringLiteral( "SUMMARY_OUTPUT" ),  QObject::tr( "Class summary" ),
       QgsProcessing::TypeVector, QVariant(), true );
   summaryOutput->setCreateByDefault( false );
diff --git a/src/core/processing/qgsprocessingalgorithm.cpp b/src/core/processing/qgsprocessingalgorithm.cpp
@@ -244,7 +244,10 @@ bool QgsProcessingAlgorithm::addParameter( QgsProcessingParameterDefinition *def
 
   // check for duplicate named parameters
   if ( QgsProcessingAlgorithm::parameterDefinition( definition->name() ) )
+  {
+    QgsLogger::warning( QStringLiteral( "Duplicate parameter %1 registered for alg %2" ).arg( definition->name(), id() ) );
     return false;
+  }
 
   if ( definition->isDestination() && mProvider )
   {
diff --git a/src/core/processing/qgsprocessingprovider.cpp b/src/core/processing/qgsprocessingprovider.cpp
@@ -75,7 +75,10 @@ bool QgsProcessingProvider::addAlgorithm( QgsProcessingAlgorithm *algorithm )
     return false;
 
   if ( mAlgorithms.contains( algorithm->name() ) )
+  {
+    QgsLogger::warning( QStringLiteral( "Duplicate algorithm name %1 for provider %2" ).arg( algorithm->name(), id() ) );
     return false;
+  }
 
   // init the algorithm - this allows direct querying of the algorithm's parameters
   // and outputs from the provider's copy

Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,10 @@ bool QgsProcessingAlgorithm::addParameter( QgsProcessingParameterDefinition *def`
`244`	`244`
`245`	`245`	`// check for duplicate named parameters`
`246`	`246`	`if ( QgsProcessingAlgorithm::parameterDefinition( definition->name() ) )`
	`247`	`+ {`
	`248`	`+ QgsLogger::warning( QStringLiteral( "Duplicate parameter %1 registered for alg %2" ).arg( definition->name(), id() ) );`
`247`	`249`	`return false;`
	`250`	`+ }`
`248`	`251`
`249`	`252`	`if ( definition->isDestination() && mProvider )`
`250`	`253`	`{`