Skip to content

Commit 793b712

Browse files
rldhontrldhont
committedApr 26, 2016
[Processing][GDAL] Well manage optional parameters
Because EXTRA and NO_DATA parameters are optional, the value can be `None` which is the same as `''`.
·
ltr-3_40archive/master_2
1 parent 0502265 commit 793b712

File tree

7 files changed

+52
-26
lines changed

7 files changed

+52
-26
lines changed
 

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,13 @@ def defineCharacteristics(self):
107107

108108
def getConsoleCommands(self):
109109
out = self.getOutputValue(self.OUTPUT)
110-
noData = unicode(self.getParameterValue(self.NO_DATA))
110+
noData = self.getParameterValue(self.NO_DATA)
111+
if noData is not None:
112+
noData = unicode(noData)
111113
projwin = unicode(self.getParameterValue(self.PROJWIN))
112-
extra = unicode(self.getParameterValue(self.EXTRA))
114+
extra = self.getParameterValue(self.EXTRA)
115+
if extra is not None:
116+
extra = unicode(extra)
113117
jpegcompression = unicode(self.getParameterValue(self.JPEGCOMPRESSION))
114118
predictor = unicode(self.getParameterValue(self.PREDICTOR))
115119
zlevel = unicode(self.getParameterValue(self.ZLEVEL))
@@ -123,7 +127,7 @@ def getConsoleCommands(self):
123127
arguments.append(GdalUtils.getFormatShortNameFromFilename(out))
124128
arguments.append('-ot')
125129
arguments.append(self.TYPE[self.getParameterValue(self.RTYPE)])
126-
if len(noData) > 0:
130+
if noData and len(noData) > 0:
127131
arguments.append('-a_nodata')
128132
arguments.append(noData)
129133

@@ -134,7 +138,7 @@ def getConsoleCommands(self):
134138
arguments.append(regionCoords[1])
135139
arguments.append(regionCoords[2])
136140

137-
if len(extra) > 0:
141+
if extra and len(extra) > 0:
138142
arguments.append(extra)
139143
if GdalUtils.getFormatShortNameFromFilename(out) == "GTiff":
140144
arguments.append("-co COMPRESS=" + compress)

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,15 @@ def getConsoleCommands(self):
125125
maskLayer = dataobjects.getObjectFromUri(
126126
self.getParameterValue(self.MASK))
127127
ogrMask = ogrConnectionString(mask)[1:-1]
128-
noData = unicode(self.getParameterValue(self.NO_DATA))
128+
noData = self.getParameterValue(self.NO_DATA)
129+
if noData is not None:
130+
noData = unicode(noData)
129131
addAlphaBand = self.getParameterValue(self.ALPHA_BAND)
130132
cropToCutline = self.getParameterValue(self.CROP_TO_CUTLINE)
131133
keepResolution = self.getParameterValue(self.KEEP_RESOLUTION)
132-
extra = unicode(self.getParameterValue(self.EXTRA))
134+
extra = self.getParameterValue(self.EXTRA)
135+
if extra is not None:
136+
extra = unicode(extra)
133137
jpegcompression = unicode(self.getParameterValue(self.JPEGCOMPRESSION))
134138
predictor = unicode(self.getParameterValue(self.PREDICTOR))
135139
zlevel = unicode(self.getParameterValue(self.ZLEVEL))
@@ -144,7 +148,7 @@ def getConsoleCommands(self):
144148
arguments.append('-q')
145149
arguments.append('-of')
146150
arguments.append(GdalUtils.getFormatShortNameFromFilename(out))
147-
if len(noData) > 0:
151+
if noData and len(noData) > 0:
148152
arguments.append('-dstnodata')
149153
arguments.append(noData)
150154

@@ -169,7 +173,7 @@ def getConsoleCommands(self):
169173
if addAlphaBand:
170174
arguments.append('-dstalpha')
171175

172-
if len(extra) > 0:
176+
if extra and len(extra) > 0:
173177
arguments.append(extra)
174178
if GdalUtils.getFormatShortNameFromFilename(out) == "GTiff":
175179
arguments.append("-co COMPRESS=" + compress)

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@ def defineCharacteristics(self):
7373
def getConsoleCommands(self):
7474
interval = unicode(self.getParameterValue(self.INTERVAL))
7575
fieldName = unicode(self.getParameterValue(self.FIELD_NAME))
76-
extra = unicode(self.getParameterValue(self.EXTRA))
76+
extra = self.getParameterValue(self.EXTRA)
77+
if extra is not None:
78+
extra = unicode(extra)
7779

7880
arguments = []
7981
if len(fieldName) > 0:
@@ -82,7 +84,7 @@ def getConsoleCommands(self):
8284
arguments.append('-i')
8385
arguments.append(interval)
8486

85-
if len(extra) > 0:
87+
if extra and len(extra) > 0:
8688
arguments.append(extra)
8789

8890
arguments.append(self.getParameterValue(self.INPUT_RASTER))

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,14 @@ def defineCharacteristics(self):
9999

100100
def getConsoleCommands(self):
101101
out = self.getOutputValue(self.OUTPUT)
102-
extra = unicode(self.getParameterValue(self.EXTRA))
102+
extra = self.getParameterValue(self.EXTRA)
103+
if extra is not None:
104+
extra = unicode(extra)
103105
#debug = self.getParameterValue(self.DEBUG)
104106
formula = self.getParameterValue(self.FORMULA)
105-
noData = unicode(self.getParameterValue(self.NO_DATA))
107+
noData = self.getParameterValue(self.NO_DATA)
108+
if noData is not None:
109+
noData = unicode(noData)
106110

107111
arguments = []
108112
arguments.append('--calc')
@@ -111,10 +115,10 @@ def getConsoleCommands(self):
111115
arguments.append(GdalUtils.getFormatShortNameFromFilename(out))
112116
arguments.append('--type')
113117
arguments.append(self.TYPE[self.getParameterValue(self.RTYPE)])
114-
if len(noData) > 0:
118+
if noData and len(noData) > 0:
115119
arguments.append('--NoDataValue')
116120
arguments.append(noData)
117-
if len(extra) > 0:
121+
if extra and len(extra) > 0:
118122
arguments.append(extra)
119123
#if debug:
120124
# arguments.append('--debug')

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,9 @@ def defineCharacteristics(self):
126126
def getConsoleCommands(self):
127127
inLayer = self.getParameterValue(self.INPUT)
128128
ogrLayer = ogrConnectionString(inLayer)[1:-1]
129-
noData = unicode(self.getParameterValue(self.NO_DATA))
129+
noData = self.getParameterValue(self.NO_DATA)
130+
if noData is not None:
131+
noData = unicode(noData)
130132
jpegcompression = unicode(self.getParameterValue(self.JPEGCOMPRESSION))
131133
predictor = unicode(self.getParameterValue(self.PREDICTOR))
132134
zlevel = unicode(self.getParameterValue(self.ZLEVEL))
@@ -135,7 +137,9 @@ def getConsoleCommands(self):
135137
bigtiff = self.BIGTIFFTYPE[self.getParameterValue(self.BIGTIFF)]
136138
tfw = unicode(self.getParameterValue(self.TFW))
137139
out = self.getOutputValue(self.OUTPUT)
138-
extra = unicode(self.getParameterValue(self.EXTRA))
140+
extra = self.getParameterValue(self.EXTRA)
141+
if extra is not None:
142+
extra = unicode(extra)
139143
rastext = unicode(self.getParameterValue(self.RAST_EXT))
140144

141145
arguments = []
@@ -172,7 +176,7 @@ def getConsoleCommands(self):
172176
arguments.append(unicode(self.getParameterValue(self.WIDTH)))
173177
arguments.append(unicode(self.getParameterValue(self.HEIGHT)))
174178

175-
if len(noData) > 0:
179+
if noData and len(noData) > 0:
176180
arguments.append('-a_nodata')
177181
arguments.append(noData)
178182

@@ -190,7 +194,7 @@ def getConsoleCommands(self):
190194
arguments.append("-co TFW=YES")
191195
if len(bigtiff) > 0:
192196
arguments.append("-co BIGTIFF=" + bigtiff)
193-
if len(extra) > 0:
197+
if extra and len(extra) > 0:
194198
arguments.append(extra)
195199
arguments.append('-l')
196200

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,13 +129,17 @@ def getConsoleCommands(self):
129129
out = self.getOutputValue(translate.OUTPUT)
130130
outsize = unicode(self.getParameterValue(self.OUTSIZE))
131131
outsizePerc = unicode(self.getParameterValue(self.OUTSIZE_PERC))
132-
noData = unicode(self.getParameterValue(self.NO_DATA))
132+
noData = self.getParameterValue(self.NO_DATA)
133+
if noData is not None:
134+
noData = unicode(noData)
133135
expand = unicode(self.getParameterFromName(
134136
self.EXPAND).options[self.getParameterValue(self.EXPAND)])
135137
projwin = unicode(self.getParameterValue(self.PROJWIN))
136138
crsId = self.getParameterValue(self.SRS)
137139
sds = self.getParameterValue(self.SDS)
138-
extra = unicode(self.getParameterValue(self.EXTRA))
140+
extra = self.getParameterValue(self.EXTRA)
141+
if extra is not None:
142+
extra = unicode(extra)
139143
jpegcompression = unicode(self.getParameterValue(self.JPEGCOMPRESSION))
140144
predictor = unicode(self.getParameterValue(self.PREDICTOR))
141145
zlevel = unicode(self.getParameterValue(self.ZLEVEL))
@@ -157,7 +161,7 @@ def getConsoleCommands(self):
157161
arguments.append('-outsize')
158162
arguments.append(outsize)
159163
arguments.append(outsize)
160-
if len(noData) > 0:
164+
if noData and len(noData) > 0:
161165
arguments.append('-a_nodata')
162166
arguments.append(noData)
163167
if expand != 'none':
@@ -180,7 +184,7 @@ def getConsoleCommands(self):
180184
arguments.append(unicode(crsId))
181185
if sds:
182186
arguments.append('-sds')
183-
if len(extra) > 0:
187+
if extra and len(extra) > 0:
184188
arguments.append(extra)
185189
if GdalUtils.getFormatShortNameFromFilename(out) == "GTiff":
186190
arguments.append("-co COMPRESS=" + compress)

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,9 @@ def defineCharacteristics(self):
118118
self.addOutput(OutputRaster(self.OUTPUT, self.tr('Reprojected')))
119119

120120
def getConsoleCommands(self):
121-
noData = unicode(self.getParameterValue(self.NO_DATA))
121+
noData = self.getParameterValue(self.NO_DATA)
122+
if noData is not None:
123+
noData = unicode(noData)
122124
srccrs = self.getParameterValue(self.SOURCE_SRS)
123125
dstcrs = self.getParameterValue(self.DEST_SRS)
124126
jpegcompression = unicode(self.getParameterValue(self.JPEGCOMPRESSION))
@@ -139,7 +141,7 @@ def getConsoleCommands(self):
139141
if len(dstcrs) > 0:
140142
arguments.append('-t_srs')
141143
arguments.append(dstcrs)
142-
if len(noData) > 0:
144+
if noData and len(noData) > 0:
143145
arguments.append('-dstnodata')
144146
arguments.append(noData)
145147
arguments.append('-r')
@@ -152,7 +154,9 @@ def getConsoleCommands(self):
152154
arguments.append('-tr')
153155
arguments.append(unicode(self.getParameterValue(self.TR)))
154156
arguments.append(unicode(self.getParameterValue(self.TR)))
155-
extra = unicode(self.getParameterValue(self.EXTRA))
157+
extra = self.getParameterValue(self.EXTRA)
158+
if extra is not None:
159+
extra = unicode(extra)
156160
regionCoords = rastext.split(',')
157161
try:
158162
rastext = []
@@ -165,7 +169,7 @@ def getConsoleCommands(self):
165169
rastext = []
166170
if rastext:
167171
arguments.extend(rastext)
168-
if len(extra) > 0:
172+
if extra and len(extra) > 0:
169173
arguments.append(extra)
170174
if GdalUtils.getFormatShortNameFromFilename(out) == "GTiff":
171175
arguments.append("-co COMPRESS=" + compress)

0 commit comments

Comments
 (0)
Please sign in to comment.