Merge pull request #4903 from NaturalGIS/master

alexbruy · web-flow · commit 22162b96a9b3 · 2017-07-22T08:18:48.000+03:00
[processing] fix SAGA LTR mosaiking tool
diff --git a/python/plugins/processing/algs/saga/SagaAlgorithm.py b/python/plugins/processing/algs/saga/SagaAlgorithm.py
@@ -181,7 +181,7 @@ def processAlgorithm(self, parameters, context, feedback):
                 layers = param.value.split(';')
                 if layers is None or len(layers) == 0:
                     continue
-                if param.datatype == dataobjects.TYPE_RASTER:
+                if param.datatype == ParameterMultipleInput.TYPE_RASTER:
                     for i, layerfile in enumerate(layers):
                         if layerfile.endswith('sdat'):
                             layerfile = param.value[:-4] + "sgrd"
@@ -358,7 +358,7 @@ def checkParameterValues(self, parameters, context):
             if isinstance(param, ParameterRaster):
                 files = [parameters[param.name()]]
             elif (isinstance(param, ParameterMultipleInput) and
-                    param.datatype == dataobjects.TYPE_RASTER):
+                    param.datatype == ParameterMultipleInput.TYPE_RASTER):
                 if param.value is not None:
                     files = param.value.split(";")
             for f in files:
diff --git a/python/plugins/processing/algs/saga/description/Mosaicking.txt b/python/plugins/processing/algs/saga/description/Mosaicking.txt
@@ -4,7 +4,7 @@ AllowUnmatching
 ParameterMultipleInput|GRIDS|Input Grids|3|False
 ParameterString|NAME|Name|Mosaic
 ParameterSelection|TYPE|Preferred data storage type|[0] 1 bit;[1] 1 byte unsigned integer;[2] 1 byte signed integer;[3] 2 byte unsigned integer;[4] 2 byte signed integer;[5] 4 byte unsigned integer;[6] 4 byte signed integer;[7] 4 byte floating point;[8] 8 byte floating point|7
-ParameterSelection|INTERPOL|Interpolation|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation|0
+ParameterSelection|RESAMPLING|Interpolation|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation|0
 ParameterSelection|OVERLAP|Overlapping Areas|[0] first;[1] last;[2] minimum;[3] maximum;[4] mean;[5] blend boundary;[6] feathering|1
 ParameterNumber|BLEND_DIST|Blending Distance|0.0|None|10.0
 ParameterSelection|MATCH|Match|[0] none;[1] regression|0
