[processing] use native enum parameter definition widget

qgis · Mar 26, 2020 · 87eefa3 · 87eefa3
1 parent 48af1c0
commit 87eefa3
Show file tree

Hide file tree

Showing 6 changed files with 86 additions and 261 deletions.
diff --git a/python/plugins/processing/gui/enummodelerwidget.py b/python/plugins/processing/gui/enummodelerwidget.py
diff --git a/python/plugins/processing/modeler/ModelerParameterDefinitionDialog.py b/python/plugins/processing/modeler/ModelerParameterDefinitionDialog.py
@@ -53,7 +53,6 @@
                        QgsProcessingParameterScale,
                        QgsProcessingParameterRange,
                        QgsProcessingParameterRasterLayer,
-                       QgsProcessingParameterEnum,
                        QgsProcessingParameterVectorLayer,
                        QgsProcessingParameterField,
                        QgsProcessingParameterFeatureSource,
@@ -65,7 +64,6 @@
                        QgsProcessingParameterRasterDestination,
                        QgsProcessingParameterVectorDestination)
 
-from processing.gui.enummodelerwidget import EnumModelerWidget
 from processing.gui.matrixmodelerwidget import MatrixModelerWidget
 from processing.core import parameters
 from processing.modeler.exceptions import UndefinedParameterException
@@ -83,7 +81,6 @@ def use_legacy_dialog(param=None, paramType=None):
                          parameters.PARAMETER_NUMBER,
                          parameters.PARAMETER_DISTANCE,
                          parameters.PARAMETER_SCALE,
-                         parameters.PARAMETER_ENUM,
                          parameters.PARAMETER_MATRIX,
                          parameters.PARAMETER_MAP_LAYER):
             return True
@@ -95,7 +92,6 @@ def use_legacy_dialog(param=None, paramType=None):
                                 QgsProcessingParameterNumber,
                                 QgsProcessingParameterDistance,
                                 QgsProcessingParameterScale,
-                                QgsProcessingParameterEnum,
                                 QgsProcessingParameterMatrix,
                                 QgsProcessingParameterMapLayer,
                                 QgsProcessingDestinationParameter)):
@@ -299,14 +295,6 @@ def setupUi(self):
                 if default:
                     self.defaultTextBox.setText(str(default))
             self.verticalLayout.addWidget(self.defaultTextBox)
-        elif self.paramType == parameters.PARAMETER_ENUM or \
-                isinstance(self.param, QgsProcessingParameterEnum):
-            self.widget = EnumModelerWidget(self)
-            if self.param is not None:
-                self.widget.setAllowMultiple(bool(self.param.allowMultiple()))
-                self.widget.setOptions(self.param.options())
-                self.widget.setDefault(self.param.defaultValue())
-            self.verticalLayout.addWidget(self.widget)
         elif self.paramType == parameters.PARAMETER_MATRIX or \
                 isinstance(self.param, QgsProcessingParameterMatrix):
             self.widget = MatrixModelerWidget(self)
@@ -486,9 +474,6 @@ def accept(self):
                 QMessageBox.warning(self, self.tr('Unable to define parameter'),
                                     self.tr('Wrong or missing parameter values'))
                 return
-        elif (self.paramType == parameters.PARAMETER_ENUM
-                or isinstance(self.param, QgsProcessingParameterEnum)):
-            self.param = QgsProcessingParameterEnum(name, description, self.widget.options(), self.widget.allowMultiple(), self.widget.defaultOptions())
         elif (self.paramType == parameters.PARAMETER_MATRIX
                 or isinstance(self.param, QgsProcessingParameterMatrix)):
             self.param = QgsProcessingParameterMatrix(name, description, hasFixedNumberRows=self.widget.fixedRows(), headers=self.widget.headers(), defaultValue=self.widget.value())

diff --git a/python/plugins/processing/ui/enummodelerwidgetbase.ui b/python/plugins/processing/ui/enummodelerwidgetbase.ui
diff --git a/src/gui/processing/qgsprocessingwidgetwrapperimpl.cpp b/src/gui/processing/qgsprocessingwidgetwrapperimpl.cpp
@@ -52,6 +52,7 @@
 #include "qgsdatabaseschemacombobox.h"
 #include "qgsdatabasetablecombobox.h"
 #include "qgsextentwidget.h"
+#include "qgsprocessingenummodelerwidget.h"
 #include <QToolButton>
 #include <QLabel>
 #include <QHBoxLayout>
@@ -2015,6 +2016,32 @@ void QgsProcessingEnumCheckboxPanelWidget::deselectAll()
 // QgsProcessingEnumWidgetWrapper
 //
 
+QgsProcessingEnumParameterDefinitionWidget::QgsProcessingEnumParameterDefinitionWidget( QgsProcessingContext &context, const QgsProcessingParameterWidgetContext &widgetContext, const QgsProcessingParameterDefinition *definition, const QgsProcessingAlgorithm *algorithm, QWidget *parent )
+  : QgsProcessingAbstractParameterDefinitionWidget( context, widgetContext, definition, algorithm, parent )
+{
+  QVBoxLayout *vlayout = new QVBoxLayout();
+  vlayout->setMargin( 0 );
+  vlayout->setContentsMargins( 0, 0, 0, 0 );
+
+  mEnumWidget = new QgsProcessingEnumModelerWidget();
+  if ( const QgsProcessingParameterEnum *enumParam = dynamic_cast<const QgsProcessingParameterEnum *>( definition ) )
+  {
+    mEnumWidget->setAllowMultiple( enumParam->allowMultiple() );
+    mEnumWidget->setOptions( enumParam->options() );
+    mEnumWidget->setDefaultOptions( enumParam->defaultValue() );
+  }
+  vlayout->addWidget( mEnumWidget );
+  setLayout( vlayout );
+}
+
+QgsProcessingParameterDefinition *QgsProcessingEnumParameterDefinitionWidget::createParameter( const QString &name, const QString &description, QgsProcessingParameterDefinition::Flags flags ) const
+{
+  auto param = qgis::make_unique< QgsProcessingParameterEnum >( name, description, mEnumWidget->options(), mEnumWidget->allowMultiple(), mEnumWidget->defaultOptions() );
+  param->setFlags( flags );
+  return param.release();
+}
+
+
 QgsProcessingEnumWidgetWrapper::QgsProcessingEnumWidgetWrapper( const QgsProcessingParameterDefinition *parameter, QgsProcessingGui::WidgetType type, QWidget *parent )
   : QgsAbstractProcessingParameterWidgetWrapper( parameter, type, parent )
 {
@@ -2153,6 +2180,11 @@ QgsAbstractProcessingParameterWidgetWrapper *QgsProcessingEnumWidgetWrapper::cre
   return new QgsProcessingEnumWidgetWrapper( parameter, type );
 }
 
+QgsProcessingAbstractParameterDefinitionWidget *QgsProcessingEnumWidgetWrapper::createParameterDefinitionWidget( QgsProcessingContext &context, const QgsProcessingParameterWidgetContext &widgetContext, const QgsProcessingParameterDefinition *definition, const QgsProcessingAlgorithm *algorithm )
+{
+  return new QgsProcessingEnumParameterDefinitionWidget( context, widgetContext, definition, algorithm );
+}
+
 //
 // QgsProcessingLayoutWidgetWrapper
 //