Skip to content

Commit fde5c89

Browse files
alexbruyalexbruy
committedOct 11, 2017
fix typos and add tests for gdal algorithms
·
ltr-3_40final-3_0_0
1 parent 9b74d9f commit fde5c89

19 files changed

+404461
-227
lines changed
 

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ def getConsoleCommands(self, parameters, context, feedback):
133133
arguments.append('-of')
134134
arguments.append(QgsRasterFileWriter.driverForExtension(os.path.splitext(out)[1]))
135135

136-
if self.parameterAsBool(self.KEEP_RESOLUTION):
136+
if self.parameterAsBool(parameters, self.KEEP_RESOLUTION, context):
137137
arguments.append('-tr')
138138
arguments.append(str(inLayer.rasterUnitsPerPixelX()))
139139
arguments.append(str(-inLayer.rasterUnitsPerPixelY()))
@@ -145,10 +145,10 @@ def getConsoleCommands(self, parameters, context, feedback):
145145
arguments.append('-cwhere')
146146
arguments.append(maskLayer.subsetString())
147147

148-
if self.parameterAsBool(self.CROP_TO_CUTLINE):
148+
if self.parameterAsBool(parameters, self.CROP_TO_CUTLINE, context):
149149
arguments.append('-crop_to_cutline')
150150

151-
if self.parameterAsBool(self.ALPHA_BAND):
151+
if self.parameterAsBool(parameters, self.ALPHA_BAND, context):
152152
arguments.append('-dstalpha')
153153

154154
if nodata:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

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

28+
import os
2829
from qgis.core import (QgsRasterFileWriter,
2930
QgsProcessingParameterDefinition,
3031
QgsProcessingParameterRasterLayer,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ def getConsoleCommands(self, parameters, context, feedback):
186186
arguments.append('-of')
187187
arguments.append(QgsRasterFileWriter.driverForExtension(os.path.splitext(out)[1]))
188188

189+
options = self.parameterAsString(parameters, self.OPTIONS, context)
189190
if options:
190191
arguments.append('-co')
191192
arguments.append(options)

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ def initAlgorithm(self, config=None):
128128
self.addParameter(dataType_param)
129129

130130
self.addParameter(QgsProcessingParameterRasterDestination(self.OUTPUT,
131-
self.tr('Interpolated (IDW)')))
131+
self.tr('Interpolated (IDW with NN search)')))
132132

133133
def name(self):
134134
return 'gridinversedistancenearestneighbor'
@@ -171,6 +171,7 @@ def getConsoleCommands(self, parameters, context, feedback):
171171
arguments.append('-of')
172172
arguments.append(QgsRasterFileWriter.driverForExtension(os.path.splitext(out)[1]))
173173

174+
options = self.parameterAsString(parameters, self.OPTIONS, context)
174175
if options:
175176
arguments.append('-co')
176177
arguments.append(options)

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ def initAlgorithm(self, config=None):
103103
self.addParameter(dataType_param)
104104

105105
self.addParameter(QgsProcessingParameterRasterDestination(self.OUTPUT,
106-
self.tr('Interpolated (IDW)')))
106+
self.tr('Interpolated (Linear)')))
107107

108108
def name(self):
109109
return 'gridlinear'
@@ -142,6 +142,7 @@ def getConsoleCommands(self, parameters, context, feedback):
142142
arguments.append('-of')
143143
arguments.append(QgsRasterFileWriter.driverForExtension(os.path.splitext(out)[1]))
144144

145+
options = self.parameterAsString(parameters, self.OPTIONS, context)
145146
if options:
146147
arguments.append('-co')
147148
arguments.append(options)

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ def getConsoleCommands(self, parameters, context, feedback):
157157
arguments.append('-of')
158158
arguments.append(QgsRasterFileWriter.driverForExtension(os.path.splitext(out)[1]))
159159

160+
options = self.parameterAsString(parameters, self.OPTIONS, context)
160161
if options:
161162
arguments.append('-co')
162163
arguments.append(options)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,15 +89,15 @@ def group(self):
8989
def getConsoleCommands(self, parameters, context, feedback):
9090
arguments = []
9191
arguments.append('-md')
92-
arguments.append(str(self.parameterAsInt(self.DISTANCE)))
92+
arguments.append(str(self.parameterAsInt(parameters, self.DISTANCE, context)))
9393

94-
nIterations = self.parameterAsInt(self.ITERATIONS)
94+
nIterations = self.parameterAsInt(parameters, self.ITERATIONS, context)
9595
if nIterations:
9696
arguments.append('-si')
9797
arguments.append(str(nIterations))
9898

9999
arguments.append('-b')
100-
arguments.append(str(self.parameterAsInt(self.BAND)))
100+
arguments.append(str(self.parameterAsInt(parameters, self.BAND, context)))
101101

102102
if self.parameterAsBool(parameters, self.NO_MASK, context):
103103
arguments.append('-nomask')

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,6 @@ def getConsoleCommands(self, parameters, context, feedback):
153153
arguments.append('-f {}'.format(outFormat))
154154

155155
arguments.append(output)
156-
arguments.extend(' '.join(layers))
156+
arguments.append(' '.join(layers))
157157

158158
return ['gdaltindex', GdalUtils.escapeAndJoin(arguments)]

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@ def icon(self):
9292

9393
def getConsoleCommands(self, parameters, context, feedback):
9494
inLayer = self.parameterAsRasterLayer(parameters, self.INPUT, context)
95+
96+
arguments = []
9597
arguments.append(inLayer.source())
9698

9799
out = self.parameterAsOutputLayer(parameters, self.OUTPUT, context)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ def icon(self):
8787
def getConsoleCommands(self, parameters, context, feedback):
8888
arguments = []
8989
arguments.append('-st')
90-
arguments.append(str(self.parameterAsInt(self.THRESHOLD)))
90+
arguments.append(str(self.parameterAsInt(parameters, self.THRESHOLD, context)))
9191

9292
if self.parameterAsBool(parameters, self.EIGHT_CONNECTEDNESS, context):
9393
arguments.append('-8')

0 commit comments

Comments
 (0)