fix QgsProcessingParameters::parameterAsInts

qgis · Jun 10, 2021 · 3aaff14 · 3aaff14
1 parent 16a05d3
commit 3aaff14
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/src/core/processing/qgsprocessingparametermeshdataset.cpp b/src/core/processing/qgsprocessingparametermeshdataset.cpp
@@ -123,7 +123,6 @@ QList<int> QgsProcessingParameterMeshDatasetGroups::valueAsDatasetGroup( const Q
   {
     if ( value.type() == QVariant::List )
     {
-      //here we can't use  QgsProcessingParameters::parameterAsInts() because this method return empty list when first value is 0...
       const QVariantList varList = value.toList();
       if ( varList.isEmpty() )
         ret << 0;

diff --git a/src/core/processing/qgsprocessingparameters.cpp b/src/core/processing/qgsprocessingparameters.cpp
@@ -280,9 +280,8 @@ QList< int > QgsProcessingParameters::parameterAsInts( const QgsProcessingParame
     }
   }
 
-  if ( ( resultList.isEmpty() || resultList.at( 0 ) == 0 ) )
+  if ( resultList.isEmpty() )
   {
-    resultList.clear();
     // check default
     if ( definition->defaultValue().isValid() )
     {

diff --git a/src/gui/processing/qgsprocessingmeshdatasetwidget.cpp b/src/gui/processing/qgsprocessingmeshdatasetwidget.cpp
@@ -299,9 +299,7 @@ void QgsProcessingMeshDatasetGroupsWidgetWrapper::setWidgetValue( const QVariant
   if ( value.type() == QVariant::List )
   {
     //here we can't use  QgsProcessingParameters::parameterAsInts() because this method return empry list when first value is 0...
-    const QVariantList varList = value.toList();
+    datasetGroupIndexes = QgsProcessingParameters::parameterAsInts( parameterDefinition(), value, context );
-    for ( const QVariant &v : varList )
-      datasetGroupIndexes.append( QgsProcessingParameters::parameterAsInt( parameterDefinition(), v, context ) );
   }
   else
     datasetGroupIndexes.append( QgsProcessingParameters::parameterAsInt( parameterDefinition(), value, context ) );