|
18 | 18 | """ |
19 | 19 |
|
20 | 20 |
|
21 | | -from qgis.core import QgsSettings |
| 21 | +from qgis.core import (QgsSettings, |
| 22 | + QgsProcessingParameterNumber, |
| 23 | + QgsProcessingParameterFile, |
| 24 | + QgsProcessingParameterField, |
| 25 | + QgsProcessingParameterExpression, |
| 26 | + QgsProcessingOutputString, |
| 27 | + QgsProcessingParameterString) |
| 28 | + |
22 | 29 | from qgis.PyQt.QtWidgets import QComboBox |
23 | 30 |
|
24 | | -from processing.core.parameters import ( |
25 | | - ParameterString, |
26 | | - ParameterNumber, |
27 | | - ParameterFile, |
28 | | - ParameterTableField, |
29 | | - ParameterExpression |
30 | | -) |
31 | | -from processing.core.outputs import OutputString |
32 | 31 | from processing.gui.wrappers import ( |
33 | 32 | WidgetWrapper, |
34 | 33 | ExpressionWidgetWrapperMixin, |
@@ -57,8 +56,8 @@ def items(self): |
57 | 56 |
|
58 | 57 | if self.dialogType == DIALOG_MODELER: |
59 | 58 | strings = self.dialog.getAvailableValuesOfType( |
60 | | - [ParameterString, ParameterNumber, ParameterFile, |
61 | | - ParameterTableField, ParameterExpression], OutputString) |
| 59 | + [QgsProcessingParameterString, QgsProcessingParameterNumber, QgsProcessingParameterFile, |
| 60 | + QgsProcessingParameterField, QgsProcessingParameterExpression], QgsProcessingOutputString) |
62 | 61 | items = items + [(self.dialog.resolveValueDescription(s), s) for s in strings] |
63 | 62 |
|
64 | 63 | return items |
@@ -91,7 +90,7 @@ def createWidget(self, connection_param=None): |
91 | 90 |
|
92 | 91 | def postInitialize(self, wrappers): |
93 | 92 | for wrapper in wrappers: |
94 | | - if wrapper.param.name == self._connection_param: |
| 93 | + if wrapper.param.name() == self._connection_param: |
95 | 94 | self.connection_wrapper = wrapper |
96 | 95 | self.setConnection(wrapper.value()) |
97 | 96 | wrapper.widgetValueHasChanged.connect(self.connectionChanged) |
@@ -123,8 +122,8 @@ def refreshItems(self): |
123 | 122 |
|
124 | 123 | if self.dialogType == DIALOG_MODELER: |
125 | 124 | strings = self.dialog.getAvailableValuesOfType( |
126 | | - [ParameterString, ParameterNumber, ParameterFile, |
127 | | - ParameterTableField, ParameterExpression], OutputString) |
| 125 | + [QgsProcessingParameterString, QgsProcessingParameterNumber, QgsProcessingParameterFile, |
| 126 | + QgsProcessingParameterField, QgsProcessingParameterExpression], QgsProcessingOutputString) |
128 | 127 | for text, data in [(self.dialog.resolveValueDescription(s), s) for s in strings]: |
129 | 128 | self._combo.addItem(text, data) |
130 | 129 |
|
@@ -162,7 +161,7 @@ def createWidget(self, schema_param=None): |
162 | 161 |
|
163 | 162 | def postInitialize(self, wrappers): |
164 | 163 | for wrapper in wrappers: |
165 | | - if wrapper.param.name == self._schema_param: |
| 164 | + if wrapper.param.name() == self._schema_param: |
166 | 165 | self.schema_wrapper = wrapper |
167 | 166 | self.setSchema(wrapper.database(), wrapper.value()) |
168 | 167 | wrapper.widgetValueHasChanged.connect(self.schemaChanged) |
@@ -192,8 +191,8 @@ def refreshItems(self): |
192 | 191 |
|
193 | 192 | if self.dialogType == DIALOG_MODELER: |
194 | 193 | strings = self.dialog.getAvailableValuesOfType( |
195 | | - [ParameterString, ParameterNumber, ParameterFile, |
196 | | - ParameterTableField, ParameterExpression], OutputString) |
| 194 | + [QgsProcessingParameterString, QgsProcessingParameterNumber, QgsProcessingParameterFile, |
| 195 | + QgsProcessingParameterField, QgsProcessingParameterExpression], QgsProcessingOutputString) |
197 | 196 | for text, data in [(self.dialog.resolveValueDescription(s), s) for s in strings]: |
198 | 197 | self._combo.addItem(text, data) |
199 | 198 |
|
|
0 commit comments