Skip to content

Commit

Permalink
Merge branch 'fix_saga_paramater' into release-2_18
Browse files Browse the repository at this point in the history
  • Loading branch information
alexbruy committed Sep 28, 2017
2 parents 26c61eb + c421ae7 commit 5e101aa
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions python/plugins/processing/algs/saga/SagaAlgorithm.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,18 +129,17 @@ def defineCharacteristicsFromFile(self):
line = lines.readline().strip('\n').strip()
hasRaster = False
for param in self.parameters:
if (isinstance(param, ParameterRaster) or
(isinstance(param, ParameterMultipleInput)
and param.type == ParameterMultipleInput.TYPE_RASTER)):
if (isinstance(param, ParameterRaster) or
(isinstance(param, ParameterMultipleInput)
and param.datatype == ParameterMultipleInput.TYPE_RASTER)):
hasRaster = True
break;
break

if (not self.noResamplingChoice and hasRaster):
param = ParameterSelection(self.RESAMPLING, "Resampling method", ["Nearest Neighbour", "Bilinear Interpolation", "Bicubic Spline Interpolation", "B-Spline Interpolation"], 3)
param.isAdvanced = True
self.addParameter(param)


def processAlgorithm(self, progress):
commands = list()
self.exportedLayers = {}
Expand Down

0 comments on commit 5e101aa

Please sign in to comment.