Skip to content

Commit c81c499

Browse files
alexbruyalexbruy
authoredAug 2, 2018
Merge pull request #7518 from alexbruy/homogenize-param
[processing] homogenize label for "additional creation options" parameter
2 parents 62a56b1 + f524460 commit c81c499

24 files changed

+24
-45
lines changed
 

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def initAlgorithm(self, config=None):
7171
optional=True))
7272

7373
options_param = QgsProcessingParameterString(self.OPTIONS,
74-
self.tr('Additional creation parameters'),
74+
self.tr('Additional creation options'),
7575
defaultValue='',
7676
optional=True)
7777
options_param.setFlags(options_param.flags() | QgsProcessingParameterDefinition.FlagAdvanced)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def initAlgorithm(self, config=None):
8585
defaultValue=False))
8686

8787
options_param = QgsProcessingParameterString(self.OPTIONS,
88-
self.tr('Additional creation parameters'),
88+
self.tr('Additional creation options'),
8989
defaultValue='',
9090
optional=True)
9191
options_param.setFlags(options_param.flags() | QgsProcessingParameterDefinition.FlagAdvanced)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def initAlgorithm(self, config=None):
7373
options=[i[0] for i in self.modes],
7474
defaultValue=2))
7575
options_param = QgsProcessingParameterString(self.OPTIONS,
76-
self.tr('Additional creation parameters'),
76+
self.tr('Additional creation options'),
7777
defaultValue='',
7878
optional=True)
7979

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ def initAlgorithm(self, config=None):
103103
defaultValue=0.0))
104104

105105
options_param = QgsProcessingParameterString(self.OPTIONS,
106-
self.tr('Additional creation parameters'),
106+
self.tr('Additional creation options'),
107107
defaultValue='',
108108
optional=True)
109109
options_param.setFlags(options_param.flags() | QgsProcessingParameterDefinition.FlagAdvanced)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ def initAlgorithm(self, config=None):
117117
defaultValue=0.0))
118118

119119
options_param = QgsProcessingParameterString(self.OPTIONS,
120-
self.tr('Additional creation parameters'),
120+
self.tr('Additional creation options'),
121121
defaultValue='',
122122
optional=True)
123123
options_param.setFlags(options_param.flags() | QgsProcessingParameterDefinition.FlagAdvanced)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ def initAlgorithm(self, config=None):
123123
defaultValue=0.0))
124124

125125
options_param = QgsProcessingParameterString(self.OPTIONS,
126-
self.tr('Additional creation parameters'),
126+
self.tr('Additional creation options'),
127127
defaultValue='',
128128
optional=True)
129129
options_param.setFlags(options_param.flags() | QgsProcessingParameterDefinition.FlagAdvanced)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ def initAlgorithm(self, config=None):
110110
defaultValue=0.0))
111111

112112
options_param = QgsProcessingParameterString(self.OPTIONS,
113-
self.tr('Additional creation parameters'),
113+
self.tr('Additional creation options'),
114114
defaultValue='',
115115
optional=True)
116116
options_param.setFlags(options_param.flags() | QgsProcessingParameterDefinition.FlagAdvanced)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def initAlgorithm(self, config=None):
8585
defaultValue=0.0))
8686

8787
options_param = QgsProcessingParameterString(self.OPTIONS,
88-
self.tr('Additional creation parameters'),
88+
self.tr('Additional creation options'),
8989
defaultValue='',
9090
optional=True)
9191
options_param.setFlags(options_param.flags() | QgsProcessingParameterDefinition.FlagAdvanced)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ def initAlgorithm(self, config=None):
9898
defaultValue=0.0))
9999

100100
options_param = QgsProcessingParameterString(self.OPTIONS,
101-
self.tr('Additional creation parameters'),
101+
self.tr('Additional creation options'),
102102
defaultValue='',
103103
optional=True)
104104
options_param.setFlags(options_param.flags() | QgsProcessingParameterDefinition.FlagAdvanced)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def initAlgorithm(self, config=None):
7474
defaultValue=False))
7575

7676
options_param = QgsProcessingParameterString(self.OPTIONS,
77-
self.tr('Additional creation parameters'),
77+
self.tr('Additional creation options'),
7878
defaultValue='',
7979
optional=True)
8080
options_param.setFlags(options_param.flags() | QgsProcessingParameterDefinition.FlagAdvanced)

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

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141

4242
class gdalcalc(GdalAlgorithm):
4343

44-
OPTIONS = 'OPTIONS'
4544
INPUT_A = 'INPUT_A'
4645
INPUT_B = 'INPUT_B'
4746
INPUT_C = 'INPUT_C'
@@ -57,10 +56,9 @@ class gdalcalc(GdalAlgorithm):
5756
FORMULA = 'FORMULA'
5857
OUTPUT = 'OUTPUT'
5958
NO_DATA = 'NO_DATA'
60-
EXTRA = 'EXTRA'
59+
OPTIONS = 'OPTIONS'
6160
RTYPE = 'RTYPE'
6261
TYPE = ['Byte', 'Int16', 'UInt16', 'UInt32', 'Int32', 'Float32', 'Float64']
63-
#DEBUG = 'DEBUG'
6462

6563
def __init__(self):
6664
super().__init__()
@@ -149,18 +147,9 @@ def initAlgorithm(self, config=None):
149147
self.tr('Output raster type'),
150148
options=self.TYPE,
151149
defaultValue=5))
152-
#self.addParameter(ParameterBoolean(
153-
# self.DEBUG, self.tr('Print debugging information'), False))
154-
self.addParameter(
155-
QgsProcessingParameterString(
156-
self.EXTRA,
157-
self.tr('Additional creation parameters'),
158-
'',
159-
optional=True))
160150

161-
# advanced raster params
162151
options_param = QgsProcessingParameterString(self.OPTIONS,
163-
self.tr('Additional creation parameters'),
152+
self.tr('Additional creation options'),
164153
defaultValue='',
165154
optional=True)
166155
options_param.setFlags(options_param.flags() | QgsProcessingParameterDefinition.FlagAdvanced)
@@ -191,10 +180,6 @@ def commandName(self):
191180

192181
def getConsoleCommands(self, parameters, context, feedback, executing=True):
193182
out = self.parameterAsOutputLayer(parameters, self.OUTPUT, context)
194-
extra = self.parameterAsString(parameters, self.EXTRA, context)
195-
# if extra is not None:
196-
# extra = str(extra)
197-
#debug = self.getParameterValue(parameters, self.DEBUG)
198183
formula = self.parameterAsString(parameters, self.FORMULA, context)
199184
if self.NO_DATA in parameters and parameters[self.NO_DATA] is not None:
200185
noData = self.parameterAsDouble(parameters, self.NO_DATA, context)
@@ -210,10 +195,6 @@ def getConsoleCommands(self, parameters, context, feedback, executing=True):
210195
if noData is not None:
211196
arguments.append('--NoDataValue')
212197
arguments.append(noData)
213-
if extra and len(extra) > 0:
214-
arguments.append(extra)
215-
#if debug:
216-
# arguments.append('--debug')
217198
layer = self.parameterAsRasterLayer(parameters, self.INPUT_A, context)
218199
if layer is None:
219200
raise QgsProcessingException(self.invalidRasterError(parameters, self.INPUT_A))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ def initAlgorithm(self, config=None):
101101
defaultValue=False))
102102

103103
options_param = QgsProcessingParameterString(self.OPTIONS,
104-
self.tr('Additional creation parameters'),
104+
self.tr('Additional creation options'),
105105
defaultValue='',
106106
optional=True)
107107
options_param.setFlags(options_param.flags() | QgsProcessingParameterDefinition.FlagAdvanced)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ def initAlgorithm(self, config=None):
9191
self.addParameter(nodata_out_param)
9292

9393
options_param = QgsProcessingParameterString(self.OPTIONS,
94-
self.tr('Additional creation parameters'),
94+
self.tr('Additional creation options'),
9595
defaultValue='',
9696
optional=True)
9797
options_param.setFlags(options_param.flags() | QgsProcessingParameterDefinition.FlagAdvanced)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def initAlgorithm(self, config=None):
6767
defaultValue=False))
6868

6969
options_param = QgsProcessingParameterString(self.OPTIONS,
70-
self.tr('Additional creation parameters'),
70+
self.tr('Additional creation options'),
7171
defaultValue='',
7272
optional=True)
7373
options_param.setFlags(options_param.flags() | QgsProcessingParameterDefinition.FlagAdvanced)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ def initAlgorithm(self, config=None):
102102
optional=True))
103103

104104
options_param = QgsProcessingParameterString(self.OPTIONS,
105-
self.tr('Additional creation parameters'),
105+
self.tr('Additional creation options'),
106106
defaultValue='',
107107
optional=True)
108108
options_param.setFlags(options_param.flags() | QgsProcessingParameterDefinition.FlagAdvanced)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ def initAlgorithm(self, config=None):
107107
optional=True))
108108

109109
options_param = QgsProcessingParameterString(self.OPTIONS,
110-
self.tr('Additional creation parameters'),
110+
self.tr('Additional creation options'),
111111
defaultValue='',
112112
optional=True)
113113
options_param.setFlags(options_param.flags() | QgsProcessingParameterDefinition.FlagAdvanced)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ def initAlgorithm(self, config=None):
111111
optional=True))
112112

113113
options_param = QgsProcessingParameterString(self.OPTIONS,
114-
self.tr('Additional creation parameters'),
114+
self.tr('Additional creation options'),
115115
defaultValue='',
116116
optional=True)
117117
options_param.setMetadata({

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def initAlgorithm(self, config=None):
6363
defaultValue=False))
6464

6565
options_param = QgsProcessingParameterString(self.OPTIONS,
66-
self.tr('Additional creation parameters'),
66+
self.tr('Additional creation options'),
6767
defaultValue='',
6868
optional=True)
6969
options_param.setFlags(options_param.flags() | QgsProcessingParameterDefinition.FlagAdvanced)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def initAlgorithm(self, config=None):
7878
defaultValue=False))
7979

8080
options_param = QgsProcessingParameterString(self.OPTIONS,
81-
self.tr('Additional creation parameters'),
81+
self.tr('Additional creation options'),
8282
defaultValue='',
8383
optional=True)
8484
options_param.setFlags(options_param.flags() | QgsProcessingParameterDefinition.FlagAdvanced)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def initAlgorithm(self, config=None):
6262
defaultValue=False))
6363

6464
options_param = QgsProcessingParameterString(self.OPTIONS,
65-
self.tr('Additional creation parameters'),
65+
self.tr('Additional creation options'),
6666
defaultValue='',
6767
optional=True)
6868
options_param.setFlags(options_param.flags() | QgsProcessingParameterDefinition.FlagAdvanced)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def initAlgorithm(self, config=None):
7676
defaultValue=False))
7777

7878
options_param = QgsProcessingParameterString(self.OPTIONS,
79-
self.tr('Additional creation parameters'),
79+
self.tr('Additional creation options'),
8080
defaultValue='',
8181
optional=True)
8282
options_param.setFlags(options_param.flags() | QgsProcessingParameterDefinition.FlagAdvanced)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def initAlgorithm(self, config=None):
6161
defaultValue=False))
6262

6363
options_param = QgsProcessingParameterString(self.OPTIONS,
64-
self.tr('Additional creation parameters'),
64+
self.tr('Additional creation options'),
6565
defaultValue='',
6666
optional=True)
6767
options_param.setFlags(options_param.flags() | QgsProcessingParameterDefinition.FlagAdvanced)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ def initAlgorithm(self, config=None):
104104
optional=True))
105105

106106
options_param = QgsProcessingParameterString(self.OPTIONS,
107-
self.tr('Additional creation parameters'),
107+
self.tr('Additional creation options'),
108108
defaultValue='',
109109
optional=True)
110110
options_param.setFlags(options_param.flags() | QgsProcessingParameterDefinition.FlagAdvanced)

‎python/plugins/processing/tests/GdalAlgorithmsTest.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -649,7 +649,6 @@ def testGdalCalc(self):
649649
'NO_DATA': None,
650650
'BAND_F': -1,
651651
'BAND_B': -1,
652-
'EXTRA': '',
653652
'RTYPE': 5,
654653
'INPUT_F': None,
655654
'BAND_E': -1,
@@ -672,7 +671,6 @@ def testGdalCalc(self):
672671
'NO_DATA': None,
673672
'BAND_F': -1,
674673
'BAND_B': -1,
675-
'EXTRA': '',
676674
'RTYPE': 5,
677675
'INPUT_F': None,
678676
'BAND_E': -1,

0 commit comments

Comments
 (0)