Skip to content

Commit

Permalink
Fix layers loading...
Browse files Browse the repository at this point in the history
  • Loading branch information
Médéric RIBREUX committed Nov 4, 2017
1 parent 4b8b6a0 commit d6fb718
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions python/plugins/processing/algs/grass7/Grass7Algorithm.py
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ def processInputs(self, parameters, context):
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):
Expand Down Expand Up @@ -675,12 +675,10 @@ def exportVectorLayerFromParameter(self, name, parameters, context):
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]

Expand All @@ -696,13 +694,12 @@ def exportVectorLayer(self, grassName, fileName, dataType='auto', layer=None, no
"""
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'
)
)
Expand Down

0 comments on commit d6fb718

Please sign in to comment.