Skip to content

Commit

Permalink
[processing] explisitly load outputs as raster or vector depending
Browse files Browse the repository at this point in the history
on the output type. Don't rely on extension or other indirect attributes
  • Loading branch information
alexbruy committed May 26, 2017
1 parent 8361320 commit dc5ba8f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
6 changes: 4 additions & 2 deletions python/plugins/processing/gui/Postprocessing.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,11 @@ def handleAlgorithmResults(alg, context, feedback=None, showResults=True):
name = os.path.basename(out.value)
else:
name = out.description

isRaster = True if isinstance(out, OutputRaster) else False
dataobjects.load(out.value, name, alg.crs,
RenderingStyles.getStyle(alg.id(),
out.name))
RenderingStyles.getStyle(alg.id(), out.name),
isRaster)
except Exception:
QgsMessageLog.logMessage("Error loading result layer:\n" + traceback.format_exc(), 'Processing', QgsMessageLog.CRITICAL)
wrongLayers.append(out.description)
Expand Down
5 changes: 2 additions & 3 deletions python/plugins/processing/tools/dataobjects.py
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def getSupportedOutputRasterLayerExtensions():
return allexts


def load(fileName, name=None, crs=None, style=None):
def load(fileName, name=None, crs=None, style=None, isRaster=False):
"""Loads a layer/table into the current project, given its file.
"""

Expand All @@ -116,8 +116,7 @@ def load(fileName, name=None, crs=None, style=None):
if name is None:
name = os.path.split(fileName)[1]

suffix = os.path.splitext(fileName)[1][1:]
if suffix in getSupportedOutputRasterLayerExtensions():
if isRaster:
qgslayer = QgsRasterLayer(fileName, name)
if qgslayer.isValid():
if crs is not None and qgslayer.crs() is None:
Expand Down

0 comments on commit dc5ba8f

Please sign in to comment.