sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-06-18 00:04:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix layers loading...

Browse Source
This commit is contained in:
Médéric RIBREUX 2017-10-22 19:03:39 +02:00
parent 4b8b6a09c8
commit d6fb7181aa
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
python/plugins/processing/algs/grass7/Grass7Algorithm.py
View File

@ -380,7 +380,7 @@ class Grass7Algorithm(QgsProcessingAlgorithm):
paramName = param.name()
if not paramName in parameters:
continue
if len(parameters[paramName]) == 0:
if isinstance(parameters[paramName], str) and len(parameters[paramName]) == 0:
continue
# Raster inputs needs to be imported into temp GRASS DB
if isinstance(param, QgsProcessingParameterRasterLayer):
@ -675,12 +675,10 @@ class Grass7Algorithm(QgsProcessingAlgorithm):
fileName = self.parameterAsOutputLayer(parameters, name, context)
# Find if there is a dataType
dataType = self.outType
QgsMessageLog.logMessage('outType: {}'.format(dataType), 'DEBUG', QgsMessageLog.INFO)
if self.outType == 'auto':
parameter = self.parameterDefinition(name)
if parameter:
layerType = parameter.dataType()
QgsMessageLog.logMessage('layerType: {}'.format(layerType), 'DEBUG', QgsMessageLog.INFO)
if layerType in self.QGIS_OUTPUT_TYPES:
dataType = self.QGIS_OUTPUT_TYPES[layerType]
@ -696,13 +694,12 @@ class Grass7Algorithm(QgsProcessingAlgorithm):
"""
for cmd in [self.commands, self.outputCommands]:
cmd.append(
'v.out.ogr{0} type={1}{2}input="{3}" output="{4}"{5}'.format(
'v.out.ogr{0} type={1} {2} input="{3}" output="{4}" {5}'.format(
'' if nocats else ' -c',
dataType,
' layer={}'.format(layer) if layer else '',
'layer={}'.format(layer) if layer else '',
grassName,
fileName,
os.path.splitext(os.path.basename(fileName))[0],
'format=ESRI_Shapefile --overwrite'
)
)