Skip to content

Commit 22246dc

Browse files
committed
Upgrade postgis widget wrappers to new API
1 parent 8af308d commit 22246dc

File tree

1 file changed

+16
-17
lines changed

1 file changed

+16
-17
lines changed

python/plugins/processing/gui/wrappers_postgis.py

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,16 @@
1818
"""
1919

2020

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+
2229
from qgis.PyQt.QtWidgets import QComboBox
2330

24-
from processing.core.parameters import (
25-
ParameterString,
26-
ParameterNumber,
27-
ParameterFile,
28-
ParameterTableField,
29-
ParameterExpression
30-
)
31-
from processing.core.outputs import OutputString
3231
from processing.gui.wrappers import (
3332
WidgetWrapper,
3433
ExpressionWidgetWrapperMixin,
@@ -57,8 +56,8 @@ def items(self):
5756

5857
if self.dialogType == DIALOG_MODELER:
5958
strings = self.dialog.getAvailableValuesOfType(
60-
[ParameterString, ParameterNumber, ParameterFile,
61-
ParameterTableField, ParameterExpression], OutputString)
59+
[QgsProcessingParameterString, QgsProcessingParameterNumber, QgsProcessingParameterFile,
60+
QgsProcessingParameterField, QgsProcessingParameterExpression], QgsProcessingOutputString)
6261
items = items + [(self.dialog.resolveValueDescription(s), s) for s in strings]
6362

6463
return items
@@ -91,7 +90,7 @@ def createWidget(self, connection_param=None):
9190

9291
def postInitialize(self, wrappers):
9392
for wrapper in wrappers:
94-
if wrapper.param.name == self._connection_param:
93+
if wrapper.param.name() == self._connection_param:
9594
self.connection_wrapper = wrapper
9695
self.setConnection(wrapper.value())
9796
wrapper.widgetValueHasChanged.connect(self.connectionChanged)
@@ -123,8 +122,8 @@ def refreshItems(self):
123122

124123
if self.dialogType == DIALOG_MODELER:
125124
strings = self.dialog.getAvailableValuesOfType(
126-
[ParameterString, ParameterNumber, ParameterFile,
127-
ParameterTableField, ParameterExpression], OutputString)
125+
[QgsProcessingParameterString, QgsProcessingParameterNumber, QgsProcessingParameterFile,
126+
QgsProcessingParameterField, QgsProcessingParameterExpression], QgsProcessingOutputString)
128127
for text, data in [(self.dialog.resolveValueDescription(s), s) for s in strings]:
129128
self._combo.addItem(text, data)
130129

@@ -162,7 +161,7 @@ def createWidget(self, schema_param=None):
162161

163162
def postInitialize(self, wrappers):
164163
for wrapper in wrappers:
165-
if wrapper.param.name == self._schema_param:
164+
if wrapper.param.name() == self._schema_param:
166165
self.schema_wrapper = wrapper
167166
self.setSchema(wrapper.database(), wrapper.value())
168167
wrapper.widgetValueHasChanged.connect(self.schemaChanged)
@@ -192,8 +191,8 @@ def refreshItems(self):
192191

193192
if self.dialogType == DIALOG_MODELER:
194193
strings = self.dialog.getAvailableValuesOfType(
195-
[ParameterString, ParameterNumber, ParameterFile,
196-
ParameterTableField, ParameterExpression], OutputString)
194+
[QgsProcessingParameterString, QgsProcessingParameterNumber, QgsProcessingParameterFile,
195+
QgsProcessingParameterField, QgsProcessingParameterExpression], QgsProcessingOutputString)
197196
for text, data in [(self.dialog.resolveValueDescription(s), s) for s in strings]:
198197
self._combo.addItem(text, data)
199198

0 commit comments

Comments
 (0)