Skip to content

Commit 91c1277

Browse files
nyalldawsonnyalldawson
committed
[processing] Swap more QGIS and GDAL algorithm parameters to distance params
1 parent 1173506 commit 91c1277

9 files changed

+41
-37
lines changed

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

+6-5
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
__revision__ = '$Format:%H$'
2727

2828
from qgis.core import (QgsProcessing,
29+
QgsProcessingParameterDistance,
2930
QgsProcessingParameterDefinition,
3031
QgsProcessingParameterFeatureSource,
3132
QgsProcessingParameterField,
@@ -57,11 +58,11 @@ def initAlgorithm(self, config=None):
5758
self.addParameter(QgsProcessingParameterString(self.GEOMETRY,
5859
self.tr('Geometry column name'),
5960
defaultValue='geometry'))
60-
self.addParameter(QgsProcessingParameterNumber(self.DISTANCE,
61-
self.tr('Buffer distance'),
62-
type=QgsProcessingParameterNumber.Double,
63-
minValue=0.0,
64-
defaultValue=10.0))
61+
self.addParameter(QgsProcessingParameterDistance(self.DISTANCE,
62+
self.tr('Buffer distance'),
63+
parentParameterName=self.INPUT,
64+
minValue=0.0,
65+
defaultValue=10.0))
6566
self.addParameter(QgsProcessingParameterField(self.FIELD,
6667
self.tr('Dissolve by attribute'),
6768
None,

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

+5-4
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
from qgis.core import (QgsProcessing,
2929
QgsProcessingParameterDefinition,
30+
QgsProcessingParameterDistance,
3031
QgsProcessingParameterFeatureSource,
3132
QgsProcessingParameterString,
3233
QgsProcessingParameterNumber,
@@ -53,10 +54,10 @@ def initAlgorithm(self, config=None):
5354
self.addParameter(QgsProcessingParameterString(self.GEOMETRY,
5455
self.tr('Geometry column name'),
5556
defaultValue='geometry'))
56-
self.addParameter(QgsProcessingParameterNumber(self.DISTANCE,
57-
self.tr('Offset distance (left-sided: positive, right-sided: negative)'),
58-
type=QgsProcessingParameterNumber.Double,
59-
defaultValue=10))
57+
self.addParameter(QgsProcessingParameterDistance(self.DISTANCE,
58+
self.tr('Offset distance (left-sided: positive, right-sided: negative)'),
59+
parentParameterName=self.INPUT,
60+
defaultValue=10))
6061

6162
options_param = QgsProcessingParameterString(self.OPTIONS,
6263
self.tr('Additional creation options'),

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

+5-4
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
from qgis.core import (QgsProcessing,
2929
QgsProcessingParameterDefinition,
30+
QgsProcessingParameterDistance,
3031
QgsProcessingParameterFeatureSource,
3132
QgsProcessingParameterEnum,
3233
QgsProcessingParameterField,
@@ -62,10 +63,10 @@ def initAlgorithm(self, config=None):
6263
self.addParameter(QgsProcessingParameterString(self.GEOMETRY,
6364
self.tr('Geometry column name'),
6465
defaultValue='geometry'))
65-
self.addParameter(QgsProcessingParameterNumber(self.DISTANCE,
66-
self.tr('Buffer distance'),
67-
type=QgsProcessingParameterNumber.Double,
68-
defaultValue=10))
66+
self.addParameter(QgsProcessingParameterDistance(self.DISTANCE,
67+
self.tr('Buffer distance'),
68+
defaultValue=10,
69+
parentParameterName=self.INPUT))
6970
self.addParameter(QgsProcessingParameterEnum(self.BUFFER_SIDE,
7071
self.tr('Buffer side'),
7172
options=self.bufferSides,

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

+5-4
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
QgsProcessingParameterEnum,
3232
QgsProcessingParameterNumber,
3333
QgsProcessingParameterFeatureSink,
34+
QgsProcessingParameterDistance,
3435
QgsFeature,
3536
QgsFeatureSink,
3637
QgsGeometry,
@@ -68,10 +69,10 @@ def initAlgorithm(self, config=None):
6869
[QgsProcessing.TypeVectorPoint]))
6970
self.addParameter(QgsProcessingParameterEnum(self.SHAPE,
7071
self.tr('Buffer shape'), options=self.shapes))
71-
self.addParameter(QgsProcessingParameterNumber(self.WIDTH, self.tr('Width'), type=QgsProcessingParameterNumber.Double,
72-
minValue=0.0000001, maxValue=999999999.0, defaultValue=1.0))
73-
self.addParameter(QgsProcessingParameterNumber(self.HEIGHT, self.tr('Height'), type=QgsProcessingParameterNumber.Double,
74-
minValue=0.0000001, maxValue=999999999.0, defaultValue=1.0))
72+
self.addParameter(QgsProcessingParameterDistance(self.WIDTH, self.tr('Width'), parentParameterName=self.INPUT,
73+
minValue=0.0000001, maxValue=999999999.0, defaultValue=1.0))
74+
self.addParameter(QgsProcessingParameterDistance(self.HEIGHT, self.tr('Height'), parentParameterName=self.INPUT,
75+
minValue=0.0000001, maxValue=999999999.0, defaultValue=1.0))
7576
self.addParameter(QgsProcessingParameterNumber(self.ROTATION, self.tr('Rotation'), type=QgsProcessingParameterNumber.Double,
7677
minValue=0.0, maxValue=360.0, optional=True))
7778
self.addParameter(QgsProcessingParameterNumber(self.SEGMENTS,

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
QgsField,
4444
QgsProcessing,
4545
QgsProcessingParameterBoolean,
46+
QgsProcessingParameterDistance,
4647
QgsProcessingParameterEnum,
4748
QgsProcessingParameterPoint,
4849
QgsProcessingParameterField,
@@ -146,10 +147,9 @@ def initAlgorithm(self, config=None):
146147
self.tr('Default speed (km/h)'),
147148
QgsProcessingParameterNumber.Double,
148149
5.0, False, 0, 99999999.99))
149-
params.append(QgsProcessingParameterNumber(self.TOLERANCE,
150-
self.tr('Topology tolerance'),
151-
QgsProcessingParameterNumber.Double,
152-
0.0, False, 0, 99999999.99))
150+
params.append(QgsProcessingParameterDistance(self.TOLERANCE,
151+
self.tr('Topology tolerance'),
152+
0.0, self.INPUT, False, 0, 99999999.99))
153153
params.append(QgsProcessingParameterBoolean(self.INCLUDE_BOUNDS,
154154
self.tr('Include upper/lower bound points'),
155155
defaultValue=False))

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
QgsField,
4242
QgsProcessing,
4343
QgsProcessingParameterBoolean,
44+
QgsProcessingParameterDistance,
4445
QgsProcessingParameterEnum,
4546
QgsProcessingParameterPoint,
4647
QgsProcessingParameterField,
@@ -143,10 +144,9 @@ def initAlgorithm(self, config=None):
143144
self.tr('Default speed (km/h)'),
144145
QgsProcessingParameterNumber.Double,
145146
5.0, False, 0, 99999999.99))
146-
params.append(QgsProcessingParameterNumber(self.TOLERANCE,
147-
self.tr('Topology tolerance'),
148-
QgsProcessingParameterNumber.Double,
149-
0.0, False, 0, 99999999.99))
147+
params.append(QgsProcessingParameterDistance(self.TOLERANCE,
148+
self.tr('Topology tolerance'),
149+
0.0, self.INPUT, False, 0, 99999999.99))
150150
params.append(QgsProcessingParameterBoolean(self.INCLUDE_BOUNDS,
151151
self.tr('Include upper/lower bound points'),
152152
defaultValue=False))

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
QgsProcessingParameterPoint,
4545
QgsProcessingParameterField,
4646
QgsProcessingParameterNumber,
47+
QgsProcessingParameterDistance,
4748
QgsProcessingParameterString,
4849
QgsProcessingParameterFeatureSource,
4950
QgsProcessingParameterFeatureSink,
@@ -139,10 +140,9 @@ def initAlgorithm(self, config=None):
139140
self.tr('Default speed (km/h)'),
140141
QgsProcessingParameterNumber.Double,
141142
5.0, False, 0, 99999999.99))
142-
params.append(QgsProcessingParameterNumber(self.TOLERANCE,
143-
self.tr('Topology tolerance'),
144-
QgsProcessingParameterNumber.Double,
145-
0.0, False, 0, 99999999.99))
143+
params.append(QgsProcessingParameterDistance(self.TOLERANCE,
144+
self.tr('Topology tolerance'),
145+
0.0, self.INPUT, False, 0, 99999999.99))
146146

147147
for p in params:
148148
p.setFlags(p.flags() | QgsProcessingParameterDefinition.FlagAdvanced)

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
QgsPointXY,
4343
QgsProcessing,
4444
QgsProcessingParameterEnum,
45+
QgsProcessingParameterDistance,
4546
QgsProcessingParameterPoint,
4647
QgsProcessingParameterField,
4748
QgsProcessingParameterNumber,
@@ -140,10 +141,9 @@ def initAlgorithm(self, config=None):
140141
self.tr('Default speed (km/h)'),
141142
QgsProcessingParameterNumber.Double,
142143
5.0, False, 0, 99999999.99))
143-
params.append(QgsProcessingParameterNumber(self.TOLERANCE,
144-
self.tr('Topology tolerance'),
145-
QgsProcessingParameterNumber.Double,
146-
0.0, False, 0, 99999999.99))
144+
params.append(QgsProcessingParameterDistance(self.TOLERANCE,
145+
self.tr('Topology tolerance'),
146+
0.0, self.INPUT, False, 0, 99999999.99))
147147

148148
for p in params:
149149
p.setFlags(p.flags() | QgsProcessingParameterDefinition.FlagAdvanced)

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
QgsProcessing,
4242
QgsProcessingException,
4343
QgsProcessingOutputNumber,
44+
QgsProcessingParameterDistance,
4445
QgsProcessingParameterEnum,
4546
QgsProcessingParameterPoint,
4647
QgsProcessingParameterField,
@@ -140,10 +141,9 @@ def initAlgorithm(self, config=None):
140141
self.tr('Default speed (km/h)'),
141142
QgsProcessingParameterNumber.Double,
142143
5.0, False, 0, 99999999.99))
143-
params.append(QgsProcessingParameterNumber(self.TOLERANCE,
144-
self.tr('Topology tolerance'),
145-
QgsProcessingParameterNumber.Double,
146-
0.0, False, 0, 99999999.99))
144+
params.append(QgsProcessingParameterDistance(self.TOLERANCE,
145+
self.tr('Topology tolerance'),
146+
0.0, self.INPUT, False, 0, 99999999.99))
147147

148148
for p in params:
149149
p.setFlags(p.flags() | QgsProcessingParameterDefinition.FlagAdvanced)

0 commit comments

Comments
 (0)