[processing] fixed saga algorithms when input is an sdat file

qgis · Jun 24, 2015 · feb8d38 · feb8d38
1 parent 848cd44
commit feb8d38
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/python/plugins/processing/algs/saga/SagaAlgorithm212.py b/python/plugins/processing/algs/saga/SagaAlgorithm212.py
@@ -111,9 +111,10 @@ def processAlgorithm(self, progress):
             if isinstance(param, ParameterRaster):
                 if param.value is None:
                     continue
-                value = param.value
+                if param.value.endswith('sdat'):
-                if not value.endswith('sgrd'):
+                    param.value = param.value[:-4] + "sgrd"
-                    exportCommand = self.exportRasterLayer(value)
+                elif not param.value.endswith('sgrd'):
+                    exportCommand = self.exportRasterLayer(param.value)
                     if exportCommand is not None:
                         commands.append(exportCommand)
             if isinstance(param, ParameterVector):
@@ -143,11 +144,15 @@ def processAlgorithm(self, progress):
                 if layers is None or len(layers) == 0:
                     continue
                 if param.datatype == ParameterMultipleInput.TYPE_RASTER:
-                    for layerfile in layers:
+                    for i, layerfile in enumerate(layers):
-                        if not layerfile.endswith('sgrd'):
+                        if layerfile.endswith('sdat'):
+                            layerfile = param.value[:-4] + "sgrd"
+                            layers[i] = layerfile
+                        elif not layerfile.endswith('sgrd'):
                             exportCommand = self.exportRasterLayer(layerfile)
                             if exportCommand is not None:
                                 commands.append(exportCommand)
+                        param.value = ";".join(layers)
                 elif param.datatype == ParameterMultipleInput.TYPE_VECTOR_ANY:
                     for layerfile in layers:
                         layer = dataobjects.getObjectFromUri(layerfile, False)

diff --git a/python/plugins/processing/algs/saga/SagaAlgorithm213.py b/python/plugins/processing/algs/saga/SagaAlgorithm213.py
@@ -61,9 +61,10 @@ def processAlgorithm(self, progress):
             if isinstance(param, ParameterRaster):
                 if param.value is None:
                     continue
-                value = param.value
+                if param.value.endswith('sdat'):
-                if not value.endswith('sgrd'):
+                    param.value = param.value[:-4] + "sgrd"
-                    exportCommand = self.exportRasterLayer(value)
+                elif not param.value.endswith('sgrd'):
+                    exportCommand = self.exportRasterLayer(param.value)
                     if exportCommand is not None:
                         commands.append(exportCommand)
             if isinstance(param, ParameterVector):
@@ -93,11 +94,15 @@ def processAlgorithm(self, progress):
                 if layers is None or len(layers) == 0:
                     continue
                 if param.datatype == ParameterMultipleInput.TYPE_RASTER:
-                    for layerfile in layers:
+                    for i, layerfile in enumerate(layers):
-                        if not layerfile.endswith('sgrd'):
+                        if layerfile.endswith('sdat'):
+                            layerfile = param.value[:-4] + "sgrd"
+                            layers[i] = layerfile
+                        elif not layerfile.endswith('sgrd'):
                             exportCommand = self.exportRasterLayer(layerfile)
                             if exportCommand is not None:
                                 commands.append(exportCommand)
+                        param.value = ";".join(layers)
                 elif param.datatype == ParameterMultipleInput.TYPE_VECTOR_ANY:
                     for layerfile in layers:
                         layer = dataobjects.getObjectFromUri(layerfile, False)