Skip to content

Commit 189f804

Browse files
nyalldawsonnyalldawson
committed
Adapt more code to c++ API
1 parent ef59d0c commit 189f804

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+306
-332
lines changed

‎python/plugins/processing/algs/gdal/gdal2tiles.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626

2727
__revision__ = '$Format:%H$'
2828

29+
from qgis.core import QgsProcessingParameterDefinition
30+
2931
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
3032
from processing.core.parameters import ParameterRaster
3133
from processing.core.parameters import ParameterString
@@ -111,7 +113,7 @@ def __init__(self):
111113
None, False, True))
112114

113115
for param in params:
114-
param.isAdvanced = True
116+
param.setFlags(param.flags() | QgsProcessingParameterDefinition.FlagAdvanced)
115117
self.addParameter(param)
116118

117119
self.addOutput(OutputDirectory(self.OUTPUTDIR,

‎python/plugins/processing/algs/gdal/retile.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626

2727
__revision__ = '$Format:%H$'
2828

29+
from qgis.core import QgsProcessingParameterDefinition
30+
2931
from processing.algs.gdal.GdalAlgorithm import GdalAlgorithm
3032
from processing.core.parameters import ParameterString
3133
from processing.core.parameters import ParameterSelection
@@ -107,7 +109,7 @@ def __init__(self):
107109
None, False, True))
108110

109111
for param in params:
110-
param.isAdvanced = True
112+
param.setFlags(param.flags() | QgsProcessingParameterDefinition.FlagAdvanced)
111113
self.addParameter(param)
112114

113115
self.addOutput(OutputDirectory(self.TARGETDIR,

‎python/plugins/processing/algs/grass7/Grass7Algorithm.py‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@
3737
QgsApplication,
3838
QgsProcessingUtils,
3939
QgsMessageLog,
40-
QgsProcessingAlgorithm)
40+
QgsProcessingAlgorithm,
41+
QgsProcessingParameterDefinition)
4142
from qgis.utils import iface
4243

4344
from processing.core.GeoAlgorithm import GeoAlgorithm
@@ -183,7 +184,7 @@ def defineCharacteristicsFromFile(self):
183184
vectorOutputs += 1
184185
if isinstance(output, OutputHTML):
185186
self.addOutput(OutputFile("rawoutput",
186-
self.tr("{0} (raw output)").format(output.description),
187+
self.tr("{0} (raw output)").format(output.description()),
187188
"txt"))
188189
line = lines.readline().strip('\n').strip()
189190
except Exception as e:
@@ -203,17 +204,17 @@ def defineCharacteristicsFromFile(self):
203204
param = ParameterNumber(self.GRASS_SNAP_TOLERANCE_PARAMETER,
204205
'v.in.ogr snap tolerance (-1 = no snap)',
205206
-1, None, -1.0)
206-
param.isAdvanced = True
207+
param.setFlags(param.flags() | QgsProcessingParameterDefinition.FlagAdvanced)
207208
self.addParameter(param)
208209
param = ParameterNumber(self.GRASS_MIN_AREA_PARAMETER,
209210
'v.in.ogr min area', 0, None, 0.0001)
210-
param.isAdvanced = True
211+
param.setFlags(param.flags() | QgsProcessingParameterDefinition.FlagAdvanced)
211212
self.addParameter(param)
212213
if vectorOutputs == 1:
213214
param = ParameterSelection(self.GRASS_OUTPUT_TYPE_PARAMETER,
214215
'v.out.ogr output type',
215216
self.OUTPUT_TYPES)
216-
param.isAdvanced = True
217+
param.setFlags(param.flags() | QgsProcessingParameterDefinition.FlagAdvanced)
217218
self.addParameter(param)
218219

219220
def getDefaultCellsize(self):
@@ -395,36 +396,36 @@ def processCommand(self, parameters):
395396
command += ' ' + ' '.join(self.hardcodedStrings)
396397

397398
# Add algorithm command
398-
for param in self.parameters:
399+
for param in self.parameterDefinitions():
399400
if param.value is None or param.value == '':
400401
continue
401402
if param.name in [self.GRASS_REGION_CELLSIZE_PARAMETER, self.GRASS_REGION_EXTENT_PARAMETER, self.GRASS_MIN_AREA_PARAMETER, self.GRASS_SNAP_TOLERANCE_PARAMETER, self.GRASS_OUTPUT_TYPE_PARAMETER, self.GRASS_REGION_ALIGN_TO_RESOLUTION]:
402403
continue
403404
if isinstance(param, (ParameterRaster, ParameterVector)):
404405
value = param.value
405406
if value in list(self.exportedLayers.keys()):
406-
command += ' ' + param.name + '=' \
407+
command += ' ' + param.name() + '=' \
407408
+ self.exportedLayers[value]
408409
else:
409-
command += ' ' + param.name + '=' + value
410+
command += ' ' + param.name() + '=' + value
410411
elif isinstance(param, ParameterMultipleInput):
411412
s = param.value
412413
for layer in list(self.exportedLayers.keys()):
413414
s = s.replace(layer, self.exportedLayers[layer])
414415
s = s.replace(';', ',')
415-
command += ' ' + param.name + '=' + s
416+
command += ' ' + param.name() + '=' + s
416417
elif isinstance(param, ParameterBoolean):
417418
if param.value:
418-
command += ' ' + param.name
419+
command += ' ' + param.name()
419420
elif isinstance(param, ParameterSelection):
420421
idx = int(param.value)
421-
command += ' ' + param.name + '=' + str(param.options[idx][1])
422+
command += ' ' + param.name() + '=' + str(param.options[idx][1])
422423
elif isinstance(param, ParameterString):
423-
command += ' ' + param.name + '="' + str(param.value) + '"'
424+
command += ' ' + param.name() + '="' + str(param.value) + '"'
424425
elif isinstance(param, ParameterPoint):
425-
command += ' ' + param.name + '=' + str(param.value)
426+
command += ' ' + param.name() + '=' + str(param.value)
426427
else:
427-
command += ' ' + param.name + '="' + str(param.value) + '"'
428+
command += ' ' + param.name() + '="' + str(param.value) + '"'
428429

429430
for out in self.outputs:
430431
if isinstance(out, OutputFile):

‎python/plugins/processing/algs/grass7/ext/v_net_distance.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def processCommand(alg, parameters):
8181
for param in paramsToDelete:
8282
alg.parameters.remove(param)
8383

84-
alg.processCommand()
84+
alg.processCommand(parameters, context)
8585

8686
# Bring back the parameters:
8787
for param in paramsToDelete:

‎python/plugins/processing/algs/qgis/Heatmap.py‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131

3232
from qgis.core import (QgsFeatureRequest,
3333
QgsMessageLog,
34-
QgsProcessingUtils)
34+
QgsProcessingUtils,
35+
QgsProcessingParameterDefinition)
3536
from qgis.analysis import QgsKernelDensityEstimation
3637

3738
from processing.algs.qgis import QgisAlgorithm
@@ -88,7 +89,7 @@ def __init__(self):
8889

8990
radius_field_param = ParameterTableField(self.RADIUS_FIELD,
9091
self.tr('Radius from field'), self.INPUT_LAYER, optional=True, datatype=ParameterTableField.DATA_TYPE_NUMBER)
91-
radius_field_param.isAdvanced = True
92+
radius_field_param.setFlags(radius_field_param.flags() | QgsProcessingParameterDefinition.FlagAdvanced)
9293
self.addParameter(radius_field_param)
9394

9495
class ParameterHeatmapPixelSize(ParameterNumber):
@@ -108,20 +109,20 @@ def __init__(self, name='', description='', parent_layer=None, radius_param=None
108109

109110
weight_field_param = ParameterTableField(self.WEIGHT_FIELD,
110111
self.tr('Weight from field'), self.INPUT_LAYER, optional=True, datatype=ParameterTableField.DATA_TYPE_NUMBER)
111-
weight_field_param.isAdvanced = True
112+
weight_field_param.setFlags(weight_field_param.flags() | QgsProcessingParameterDefinition.FlagAdvanced)
112113
self.addParameter(weight_field_param)
113114
kernel_shape_param = ParameterSelection(self.KERNEL,
114115
self.tr('Kernel shape'), self.KERNELS)
115-
kernel_shape_param.isAdvanced = True
116+
kernel_shape_param.setFlags(kernel_shape_param.flags() | QgsProcessingParameterDefinition.FlagAdvanced)
116117
self.addParameter(kernel_shape_param)
117118
decay_ratio = ParameterNumber(self.DECAY,
118119
self.tr('Decay ratio (Triangular kernels only)'),
119120
-100.0, 100.0, 0.0)
120-
decay_ratio.isAdvanced = True
121+
decay_ratio.setFlags(decay_ratio.flags() | QgsProcessingParameterDefinition.FlagAdvanced)
121122
self.addParameter(decay_ratio)
122123
output_scaling = ParameterSelection(self.OUTPUT_VALUE,
123124
self.tr('Output value scaling'), self.OUTPUT_VALUES)
124-
output_scaling.isAdvanced = True
125+
output_scaling.setFlags(output_scaling.flags() | QgsProcessingParameterDefinition.FlagAdvanced)
125126
self.addParameter(output_scaling)
126127
self.addOutput(OutputRaster(self.OUTPUT_LAYER,
127128
self.tr('Heatmap')))

‎python/plugins/processing/algs/qgis/IdwInterpolation.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@
3030
from qgis.PyQt.QtGui import QIcon
3131

3232
from qgis.core import (QgsRectangle,
33-
QgsProcessingUtils)
33+
QgsProcessingUtils,
34+
QgsProcessingParameterDefinition)
3435
from qgis.analysis import (QgsInterpolator,
3536
QgsIDWInterpolator,
3637
QgsGridFileWriter
@@ -78,13 +79,13 @@ def __init__(self, name='', description=''):
7879

7980
def setValue(self, value):
8081
if value is None:
81-
if not self.optional:
82+
if not self.flags() & QgsProcessingParameterDefinition.FlagOptional:
8283
return False
8384
self.value = None
8485
return True
8586

8687
if value == '':
87-
if not self.optional:
88+
if not self.flags() & QgsProcessingParameterDefinition.FlagOptional:
8889
return False
8990

9091
if isinstance(value, str):

‎python/plugins/processing/algs/qgis/Orthogonalize.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
__revision__ = '$Format:%H$'
2727

2828
from qgis.core import (QgsApplication,
29-
QgsProcessingUtils)
29+
QgsProcessingUtils,
30+
QgsProcessingParameterDefinition)
3031
from processing.algs.qgis import QgisAlgorithm
3132
from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
3233
from processing.core.parameters import ParameterVector, ParameterNumber
@@ -66,7 +67,7 @@ def __init__(self):
6667
max_iterations = ParameterNumber(self.MAX_ITERATIONS,
6768
self.tr('Maximum algorithm iterations'),
6869
1, 10000, 1000)
69-
max_iterations.isAdvanced = True
70+
max_iterations.setFlags(max_iterations.flags() | QgsProcessingParameterDefinition.FlagAdvanced)
7071
self.addParameter(max_iterations)
7172

7273
self.addOutput(OutputVector(self.OUTPUT_LAYER, self.tr('Orthogonalized')))

‎python/plugins/processing/algs/qgis/RasterCalculator.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def evaluateForModeler(self, value, model):
7474
param = i.param
7575
if isinstance(param, ParameterRaster):
7676
new = "{}@".format(os.path.basename(param.value))
77-
old = "{}@".format(param.name)
77+
old = "{}@".format(param.name())
7878
value = value.replace(old, new)
7979

8080
for alg in list(model.algs.values()):
@@ -164,7 +164,7 @@ def processBeforeAddingToModeler(self, algorithm, model):
164164
for i in list(model.inputs.values()):
165165
param = i.param
166166
if isinstance(param, ParameterRaster) and "{}@".format(param.name) in expression:
167-
values.append(ValueFromInput(param.name))
167+
values.append(ValueFromInput(param.name()))
168168

169169
if algorithm.name:
170170
dependent = model.getDependentAlgorithms(algorithm.name)

‎python/plugins/processing/algs/qgis/Relief.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
from qgis.PyQt.QtGui import QIcon, QColor
3131

3232
from qgis.analysis import QgsRelief
33-
33+
from qgis.core import QgsProcessingParameterDefinition
3434
from processing.algs.qgis import QgisAlgorithm
3535
from processing.core.parameters import (Parameter,
3636
ParameterRaster,
@@ -74,13 +74,13 @@ def __init__(self, name='', description='', parent=None, optional=True):
7474

7575
def setValue(self, value):
7676
if value is None:
77-
if not self.optional:
77+
if not self.flags() & QgsProcessingParameterDefinition.FlagOptional:
7878
return False
7979
self.value = None
8080
return True
8181

8282
if value == '':
83-
if not self.optional:
83+
if not self.flags() & QgsProcessingParameterDefinition.FlagOptional:
8484
return False
8585

8686
if isinstance(value, str):

‎python/plugins/processing/algs/qgis/ServiceAreaFromLayer.py‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,15 @@
3131
from qgis.PyQt.QtCore import QVariant
3232
from qgis.PyQt.QtGui import QIcon
3333

34-
from qgis.core import QgsWkbTypes, QgsUnitTypes, QgsFeature, QgsGeometry, QgsField, QgsFields, QgsFeatureRequest, QgsProcessingUtils
34+
from qgis.core import (QgsWkbTypes,
35+
QgsUnitTypes,
36+
QgsFeature,
37+
QgsGeometry,
38+
QgsField,
39+
QgsFields,
40+
QgsFeatureRequest,
41+
QgsProcessingUtils,
42+
QgsProcessingParameterDefinition)
3543
from qgis.analysis import (QgsVectorLayerDirector,
3644
QgsNetworkDistanceStrategy,
3745
QgsNetworkSpeedStrategy,
@@ -134,7 +142,7 @@ def __init__(self):
134142
0.0, 99999999.999999, 0.0))
135143

136144
for p in params:
137-
p.isAdvanced = True
145+
p.setFlags(p.flags() | QgsProcessingParameterDefinition.FlagAdvanced)
138146
self.addParameter(p)
139147

140148
self.addOutput(OutputVector(self.OUTPUT_POINTS,

0 commit comments

Comments
 (0)