fix displaying of the enum parameter options when static strings mode is

alexbruy · github-actions[bot] · commit 4d94ece71311 · 2023-04-24T01:17:24.000Z
active and multiple selection is enabled. Also improve conversion to
Python string
diff --git a/src/core/processing/qgsprocessingparameters.cpp b/src/core/processing/qgsprocessingparameters.cpp
@@ -4911,7 +4911,7 @@ QString QgsProcessingParameterEnum::valueAsPythonString( const QVariant &value,
 
   if ( mUsesStaticStrings )
   {
-    if ( value.type() == QVariant::StringList )
+    if ( value.type() == QVariant::List || value.type() == QVariant::StringList )
     {
       QStringList parts;
       const QStringList constList = value.toStringList();
diff --git a/src/gui/processing/qgsprocessingwidgetwrapperimpl.cpp b/src/gui/processing/qgsprocessingwidgetwrapperimpl.cpp
@@ -2445,8 +2445,19 @@ void QgsProcessingEnumPanelWidget::showDialog()
   if ( mParam )
   {
     availableOptions.reserve( mParam->options().size() );
-    for ( int i = 0; i < mParam->options().count(); ++i )
-      availableOptions << i;
+
+    if ( mParam->usesStaticStrings() )
+    {
+      for ( QString o : mParam->options() )
+      {
+        availableOptions << o;
+      }
+    }
+    else
+    {
+      for ( int i = 0; i < mParam->options().count(); ++i )
+        availableOptions << i;
+    }
   }
 
   const QStringList options = mParam ? mParam->options() : QStringList();

Original file line number	Diff line number	Diff line change
`@@ -4911,7 +4911,7 @@ QString QgsProcessingParameterEnum::valueAsPythonString( const QVariant &value,`
`4911`	`4911`
`4912`	`4912`	`if ( mUsesStaticStrings )`
`4913`	`4913`	`{`
`4914`		`- if ( value.type() == QVariant::StringList )`
	`4914`	`+ if ( value.type() == QVariant::List \|\| value.type() == QVariant::StringList )`
`4915`	`4915`	`{`
`4916`	`4916`	`QStringList parts;`
`4917`	`4917`	`const QStringList constList = value.toStringList();`