Skip to content

Commit d6fb718

Browse files
author
Médéric RIBREUX
committedNov 4, 2017
Fix layers loading...
1 parent 4b8b6a0 commit d6fb718

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed
 

‎python/plugins/processing/algs/grass7/Grass7Algorithm.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ def processInputs(self, parameters, context):
380380
paramName = param.name()
381381
if not paramName in parameters:
382382
continue
383-
if len(parameters[paramName]) == 0:
383+
if isinstance(parameters[paramName], str) and len(parameters[paramName]) == 0:
384384
continue
385385
# Raster inputs needs to be imported into temp GRASS DB
386386
if isinstance(param, QgsProcessingParameterRasterLayer):
@@ -675,12 +675,10 @@ def exportVectorLayerFromParameter(self, name, parameters, context):
675675
fileName = self.parameterAsOutputLayer(parameters, name, context)
676676
# Find if there is a dataType
677677
dataType = self.outType
678-
QgsMessageLog.logMessage('outType: {}'.format(dataType), 'DEBUG', QgsMessageLog.INFO)
679678
if self.outType == 'auto':
680679
parameter = self.parameterDefinition(name)
681680
if parameter:
682681
layerType = parameter.dataType()
683-
QgsMessageLog.logMessage('layerType: {}'.format(layerType), 'DEBUG', QgsMessageLog.INFO)
684682
if layerType in self.QGIS_OUTPUT_TYPES:
685683
dataType = self.QGIS_OUTPUT_TYPES[layerType]
686684

@@ -696,13 +694,12 @@ def exportVectorLayer(self, grassName, fileName, dataType='auto', layer=None, no
696694
"""
697695
for cmd in [self.commands, self.outputCommands]:
698696
cmd.append(
699-
'v.out.ogr{0} type={1}{2}input="{3}" output="{4}"{5}'.format(
697+
'v.out.ogr{0} type={1} {2} input="{3}" output="{4}" {5}'.format(
700698
'' if nocats else ' -c',
701699
dataType,
702-
' layer={}'.format(layer) if layer else '',
700+
'layer={}'.format(layer) if layer else '',
703701
grassName,
704702
fileName,
705-
os.path.splitext(os.path.basename(fileName))[0],
706703
'format=ESRI_Shapefile --overwrite'
707704
)
708705
)

0 commit comments

Comments
 (0)
Please sign in to comment.