fix #49973

vcloarec · nyalldawson · commit e4f40eaf766a · 2022-11-19T12:05:54.000+10:00
diff --git a/src/analysis/processing/qgsalgorithmexportmesh.cpp b/src/analysis/processing/qgsalgorithmexportmesh.cpp
@@ -210,7 +210,7 @@ void QgsExportMeshOnElement::initAlgorithm( const QVariantMap &configuration )
                   QStringLiteral( "DATASET_GROUPS" ),
                   QObject::tr( "Dataset groups" ),
                   QStringLiteral( "INPUT" ),
-                  supportedDataType() ) );
+                  supportedDataType(), true ) );
 
   addParameter( new QgsProcessingParameterMeshDatasetTime(
                   QStringLiteral( "DATASET_TIME" ),
@@ -333,7 +333,7 @@ QVariantMap QgsExportMeshOnElement::processAlgorithm( const QVariantMap &paramet
 
   QList<QgsMeshDatasetGroupMetadata> metaList;
   metaList.reserve( mDataPerGroup.size() );
-  for ( const DataGroup &dataGroup : mDataPerGroup )
+  for ( const DataGroup &dataGroup : std::as_const( mDataPerGroup ) )
     metaList.append( dataGroup.metadata );
   QgsFields fields = createFields( metaList, mExportVectorOption );
 
diff --git a/src/core/processing/qgsprocessingparametermeshdataset.cpp b/src/core/processing/qgsprocessingparametermeshdataset.cpp
@@ -117,18 +117,13 @@ QList<int> QgsProcessingParameterMeshDatasetGroups::valueAsDatasetGroup( const Q
   QList<int> ret;
 
   // if invalid or empty, return only the group 0
-  if ( !value.isValid() )
-    ret << 0;
-  else
+  if ( value.isValid() )
   {
     if ( value.type() == QVariant::List )
     {
       const QVariantList varList = value.toList();
-      if ( varList.isEmpty() )
-        ret << 0;
-      else
-        for ( const QVariant &v : varList )
-          ret << v.toInt();
+      for ( const QVariant &v : varList )
+        ret << v.toInt();
     }
     else
     {
diff --git a/tests/src/analysis/testqgsprocessing.cpp b/tests/src/analysis/testqgsprocessing.cpp
@@ -8560,8 +8560,8 @@ void TestQgsProcessing::parameterMeshDatasetGroups()
   QgsProject project;
   context.setProject( &project );
 
-  QCOMPARE( QgsProcessingParameterMeshDatasetGroups::valueAsDatasetGroup( QVariant() ), QList<int>( {0} ) );
-  QCOMPARE( QgsProcessingParameterMeshDatasetGroups::valueAsDatasetGroup( QVariantList() ), QList<int>( {0} ) );
+  QCOMPARE( QgsProcessingParameterMeshDatasetGroups::valueAsDatasetGroup( QVariant() ), QList<int>() );
+  QCOMPARE( QgsProcessingParameterMeshDatasetGroups::valueAsDatasetGroup( QVariantList() ), QList<int>() );
   QCOMPARE( QgsProcessingParameterMeshDatasetGroups::valueAsDatasetGroup( 3 ), QList<int>( {3} ) );
   QCOMPARE( QgsProcessingParameterMeshDatasetGroups::valueAsDatasetGroup( QVariant( "3" ) ), QList<int>( {3} ) );
   QCOMPARE( QgsProcessingParameterMeshDatasetGroups::valueAsDatasetGroup( QVariantList( { "3", "4", "5"} ) ), QList<int>( {3, 4, 5 } ) );

Original file line number	Diff line number	Diff line change
`@@ -117,18 +117,13 @@ QList<int> QgsProcessingParameterMeshDatasetGroups::valueAsDatasetGroup( const Q`
`117`	`117`	`QList<int> ret;`
`118`	`118`
`119`	`119`	`// if invalid or empty, return only the group 0`
`120`		`- if ( !value.isValid() )`
`121`		`- ret << 0;`
`122`		`- else`
	`120`	`+ if ( value.isValid() )`
`123`	`121`	`{`
`124`	`122`	`if ( value.type() == QVariant::List )`
`125`	`123`	`{`
`126`	`124`	`const QVariantList varList = value.toList();`
`127`		`- if ( varList.isEmpty() )`
`128`		`- ret << 0;`
`129`		`- else`
`130`		`- for ( const QVariant &v : varList )`
`131`		`- ret << v.toInt();`
	`125`	`+ for ( const QVariant &v : varList )`
	`126`	`+ ret << v.toInt();`
`132`	`127`	`}`
`133`	`128`	`else`
`134`	`129`	`{`