Skip to content

Commit

Permalink
[processing] more raster handling fixes in SAGA provider
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexbruy
alexbruy committed Nov 9, 2017
1 parent 3822efa commit 2b218cc
Showing 1 changed file with 53 additions and 47 deletions.
100 changes: 53 additions & 47 deletions python/plugins/processing/algs/saga/SagaAlgorithm.py
View file
Expand Up @@ -150,10 +150,13 @@ def processAlgorithm(self, parameters, context, feedback):
if isinstance(param, QgsProcessingParameterRasterLayer): if isinstance(param, QgsProcessingParameterRasterLayer):
if param.name() not in parameters or parameters[param.name()] is None: if param.name() not in parameters or parameters[param.name()] is None:
continue continue
if parameters[param.name()].endswith('sdat'):
parameters[param.name()] = parameters[param.name()][:-4] + "sgrd" if parameters[param.name()].source().lower().endswith('sdat'):
elif not parameters[param.name()].endswith('sgrd'): self.exportedLayers[param.name()] = parameters[param.name()].source()[:-4] + 'sgrd'
exportCommand = self.exportRasterLayer(parameters[param.name()], context) if parameters[param.name()].source().lower().endswith('sgrd'):
self.exportedLayers[param.name()] = parameters[param.name()].source()
else:
exportCommand = self.exportRasterLayer(param.name(), parameters[param.name()])
if exportCommand is not None: if exportCommand is not None:
commands.append(exportCommand) commands.append(exportCommand)
elif isinstance(param, QgsProcessingParameterFeatureSource): elif isinstance(param, QgsProcessingParameterFeatureSource):
Expand All @@ -173,19 +176,24 @@ def processAlgorithm(self, parameters, context, feedback):
elif isinstance(param, QgsProcessingParameterMultipleLayers): elif isinstance(param, QgsProcessingParameterMultipleLayers):
if param.name() not in parameters or parameters[param.name()] is None: if param.name() not in parameters or parameters[param.name()] is None:
continue continue

layers = self.parameterAsLayerList(parameters, param.name(), context) layers = self.parameterAsLayerList(parameters, param.name(), context)
if layers is None or len(layers) == 0: if layers is None or len(layers) == 0:
continue continue
if param.layerType() == QgsProcessing.TypeRaster: if param.layerType() == QgsProcessing.TypeRaster:
for i, layerfile in enumerate(layers): files = []
if layerfile.endswith('sdat'): for i, layer in enumerate(layers):
layerfile = param.value[:-4] + "sgrd" if layer.source().lower().endswith('sdat'):
layers[i] = layerfile files.append(parameters[param.name()].source()[:-4] + 'sgrd')
elif not layerfile.endswith('sgrd'): if layer.source().lower().endswith('sgrd'):
exportCommand = self.exportRasterLayer(layerfile) files.append(parameters[param.name()].source())
else:
exportCommand = self.exportRasterLayer(param.name(), layer)
files.append(self.exportedLayers[param.name()])
if exportCommand is not None: if exportCommand is not None:
commands.append(exportCommand) commands.append(exportCommand)
param.value = ";".join(layers)
self.exportedLayers[param.name()] = files
else: else:
temp_params = deepcopy(parameters) temp_params = deepcopy(parameters)
for layer in layers: for layer in layers:
Expand Down Expand Up @@ -217,18 +225,14 @@ def processAlgorithm(self, parameters, context, feedback):
continue continue


if isinstance(param, (QgsProcessingParameterRasterLayer, QgsProcessingParameterFeatureSource)): if isinstance(param, (QgsProcessingParameterRasterLayer, QgsProcessingParameterFeatureSource)):
command += ' -' + param.name() + ' "' \ command += ' -{} "{}"'.format(param.name(), self.exportedLayers[param.name()])
+ self.exportedLayers[param.name()] + '"'
elif isinstance(param, QgsProcessingParameterMultipleLayers): elif isinstance(param, QgsProcessingParameterMultipleLayers):
s = parameters[param.name()] command += ' -{} "{}"'.format(param.name(), ';'.join(self.exportedLayers[param.name()]))
for layer in list(self.exportedLayers.keys()):
s = s.replace(layer, self.exportedLayers[layer])
command += ' -' + ';'.join(self.exportedLayers[param.name()]) + ' "' + s + '"'
elif isinstance(param, QgsProcessingParameterBoolean): elif isinstance(param, QgsProcessingParameterBoolean):
if self.parameterAsBool(parameters, param.name(), context): if self.parameterAsBool(parameters, param.name(), context):
command += ' -' + param.name().strip() + " true" command += ' -{} true'.format(param.name().strip())
else: else:
command += ' -' + param.name().strip() + " false" command += ' -{} false'.format(param.name().strip())
elif isinstance(param, QgsProcessingParameterMatrix): elif isinstance(param, QgsProcessingParameterMatrix):
tempTableFile = getTempFilename('txt') tempTableFile = getTempFilename('txt')
with open(tempTableFile, 'w') as f: with open(tempTableFile, 'w') as f:
Expand All @@ -237,7 +241,7 @@ def processAlgorithm(self, parameters, context, feedback):
for i in range(0, len(values), 3): for i in range(0, len(values), 3):
s = values[i] + '\t' + values[i + 1] + '\t' + values[i + 2] + '\n' s = values[i] + '\t' + values[i + 1] + '\t' + values[i + 2] + '\n'
f.write(s) f.write(s)
command += ' -' + param.name() + ' "' + tempTableFile + '"' command += ' -{} "{}"'.format(param.name(), tempTableFile)
elif isinstance(param, QgsProcessingParameterExtent): elif isinstance(param, QgsProcessingParameterExtent):
# 'We have to substract/add half cell size, since SAGA is # 'We have to substract/add half cell size, since SAGA is
# center based, not corner based # center based, not corner based
Expand All @@ -252,39 +256,37 @@ def processAlgorithm(self, parameters, context, feedback):
values.append(rect.yMaximum()) values.append(rect.yMaximum())


for i in range(4): for i in range(4):
command += ' -' + self.extentParamNames[i] + ' ' \ command += ' -{} {}'.format(self.extentParamNames[i], float(values[i]) + offset[i])
+ str(float(values[i]) + offset[i])
elif isinstance(param, QgsProcessingParameterNumber): elif isinstance(param, QgsProcessingParameterNumber):
command += ' -' + param.name() + ' ' + str(self.parameterAsDouble(parameters, param.name(), context)) command += ' -{} {}'.format(param.name(), self.parameterAsDouble(parameters, param.name(), context))
elif isinstance(param, QgsProcessingParameterEnum): elif isinstance(param, QgsProcessingParameterEnum):
command += ' -' + param.name() + ' ' + str(self.parameterAsEnum(parameters, param.name(), context)) command += ' -{} {}'.format(param.name(), self.parameterAsEnum(parameters, param.name(), context))
elif isinstance(param, (QgsProcessingParameterString, QgsProcessingParameterFile)): elif isinstance(param, (QgsProcessingParameterString, QgsProcessingParameterFile)):
command += ' -' + param.name() + ' "' + self.parameterAsFile(parameters, param.name(), context) + '"' command += ' -{} "{}"'.format(param.name(), self.parameterAsFile(parameters, param.name(), context))
elif isinstance(param, (QgsProcessingParameterString, QgsProcessingParameterField)): elif isinstance(param, (QgsProcessingParameterString, QgsProcessingParameterField)):
command += ' -' + param.name() + ' "' + self.parameterAsString(parameters, param.name(), context) + '"' command += ' -{} "{}"'.format(param.name(), self.parameterAsString(parameters, param.name(), context))


output_layers = [] output_layers = []
output_files = {} output_files = {}
for out in self.destinationParameterDefinitions(): for out in self.destinationParameterDefinitions():
# TODO # TODO
# command += ' -' + out.name() + ' "' + out.getCompatibleFileName(self) + '"' # command += ' -' + out.name() + ' "' + out.getCompatibleFileName(self) + '"'
file = self.parameterAsOutputLayer(parameters, out.name(), context) filePath = self.parameterAsOutputLayer(parameters, out.name(), context)
if isinstance(out, (QgsProcessingParameterRasterDestination, QgsProcessingParameterVectorDestination)): if isinstance(out, (QgsProcessingParameterRasterDestination, QgsProcessingParameterVectorDestination)):
output_layers.append(file) output_layers.append(filePath)
output_files[out.name()] = file output_files[out.name()] = filePath
command += ' -' + out.name() + ' "' + file + '"' command += ' -{} "{}"'.format(out.name(), filePath)


commands.append(command) commands.append(command)


# special treatment for RGB algorithm # special treatment for RGB algorithm
# TODO: improve this and put this code somewhere else # TODO: improve this and put this code somewhere else
for out in self.destinationParameterDefinitions(): for out in self.destinationParameterDefinitions():
if isinstance(out, QgsProcessingParameterRasterDestination): if isinstance(out, QgsProcessingParameterRasterDestination):
filename = out.getCompatibleFileName(self) filename = self.parameterAsOutputLayer(parameters, out.name(), context)
filename2 = filename + '.sgrd' filename2 = os.path.splitext(filename)[0] + '.sgrd'
if self.cmdname == 'RGB Composite': if self.cmdname == 'RGB Composite':
commands.append('io_grid_image 0 -IS_RGB -GRID:"' + filename2 + commands.append('io_grid_image 0 -IS_RGB -GRID:"{}" -FILE:"{}"'.format(filename2, filename))
'" -FILE:"' + filename + '"')


# 3: Run SAGA # 3: Run SAGA
commands = self.editCommands(commands) commands = self.editCommands(commands)
Expand All @@ -300,8 +302,8 @@ def processAlgorithm(self, parameters, context, feedback):


if crs is not None: if crs is not None:
for out in output_layers: for out in output_layers:
prjFile = os.path.splitext(out)[0] + ".prj" prjFile = os.path.splitext(out)[0] + '.prj'
with open(prjFile, "w") as f: with open(prjFile, 'w') as f:
f.write(crs.toWkt()) f.write(crs.toWkt())


result = {} result = {}
Expand Down Expand Up @@ -344,28 +346,32 @@ def getOutputCellsize(self, parameters, context):
break break
return cellsize return cellsize


def exportRasterLayer(self, source, context): def exportRasterLayer(self, parameterName, layer):
global sessionExportedLayers global sessionExportedLayers
if source in sessionExportedLayers: if layer.source() in sessionExportedLayers:
exportedLayer = sessionExportedLayers[source] exportedLayer = sessionExportedLayers[layer.source()]
if os.path.exists(exportedLayer): if os.path.exists(exportedLayer):
self.exportedLayers[source] = exportedLayer self.exportedLayers[parameterName] = exportedLayer
return None return None
else: else:
del sessionExportedLayers[source] del sessionExportedLayers[layer.source()]
layer = QgsProcessingUtils.mapLayerFromString(source, context, False)
if layer: if layer:
filename = str(layer.name()) filename = layer.name()
else: else:
filename = os.path.basename(source) filename = os.path.basename(layer.source())

validChars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789:' validChars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789:'
filename = ''.join(c for c in filename if c in validChars) filename = ''.join(c for c in filename if c in validChars)

if len(filename) == 0: if len(filename) == 0:
filename = 'layer' filename = 'layer'

destFilename = QgsProcessingUtils.generateTempFilename(filename + '.sgrd') destFilename = QgsProcessingUtils.generateTempFilename(filename + '.sgrd')
self.exportedLayers[source] = destFilename sessionExportedLayers[layer.source()] = destFilename
sessionExportedLayers[source] = destFilename self.exportedLayers[parameterName] = destFilename
return 'io_gdal 0 -TRANSFORM 1 -RESAMPLING 3 -GRIDS "' + destFilename + '" -FILES "' + source + '"'
return 'io_gdal 0 -TRANSFORM 1 -RESAMPLING 3 -GRIDS "{}" -FILES "{}"'.format(destFilename, layer.source())


def checkParameterValues(self, parameters, context): def checkParameterValues(self, parameters, context):
""" """
Expand Down

0 comments on commit 2b218cc

Please sign in to comment.