More followups to SAGA raster parameter handling

nyalldawson · alexbruy · commit 178708590d78 · 2017-11-09T18:54:13.000+02:00
diff --git a/python/plugins/processing/algs/saga/SagaAlgorithm.py b/python/plugins/processing/algs/saga/SagaAlgorithm.py
@@ -30,17 +30,17 @@
 import importlib
 from qgis.core import (QgsProcessingUtils,
                        QgsProcessingException,
-                       QgsMessageLog)
+                       QgsMessageLog,
+                       QgsProcessingParameterRasterLayer,
+                       QgsProcessingParameterNumber)
 from processing.core.ProcessingConfig import ProcessingConfig
 from processing.core.parameters import (getParameterFromString,
                                         ParameterExtent,
-                                        ParameterRaster,
                                         ParameterVector,
                                         ParameterTable,
                                         ParameterMultipleInput,
                                         ParameterBoolean,
                                         ParameterFixedTable,
-                                        ParameterNumber,
                                         ParameterSelection)
 from processing.core.outputs import (getOutputFromString,
                                      OutputVector,
@@ -145,13 +145,13 @@ def processAlgorithm(self, parameters, context, feedback):
         # 1: Export rasters to sgrd and vectors to shp
         # Tables must be in dbf format. We check that.
         for param in self.parameterDefinitions():
-            if isinstance(param, ParameterRaster):
+            if isinstance(param, QgsProcessingParameterRasterLayer):
                 if param.name() not in parameters or parameters[param.name()] is None:
                     continue
                 if parameters[param.name()].endswith('sdat'):
                     parameters[param.name()] = parameters[param.name()][:-4] + "sgrd"
                 elif not parameters[param.name()].endswith('sgrd'):
-                    exportCommand = self.exportRasterLayer(parameters[param.name()])
+                    exportCommand = self.exportRasterLayer(parameters[param.name()], context)
                     if exportCommand is not None:
                         commands.append(exportCommand)
             if isinstance(param, ParameterVector):
@@ -214,7 +214,7 @@ def processAlgorithm(self, parameters, context, feedback):
         for param in self.parameterDefinitions():
             if not param.name() in parameters or parameters[param.name()] is None:
                 continue
-            if isinstance(param, (ParameterRaster, ParameterVector, ParameterTable)):
+            if isinstance(param, (QgsProcessingParameterRasterLayer, ParameterVector, ParameterTable)):
                 value = parameters[param.name()]
                 if value in list(self.exportedLayers.keys()):
                     command += ' -' + param.name() + ' "' \
@@ -249,7 +249,7 @@ def processAlgorithm(self, parameters, context, feedback):
                 for i in range(4):
                     command += ' -' + self.extentParamNames[i] + ' ' \
                         + str(float(values[i]) + offset[i])
-            elif isinstance(param, (ParameterNumber, ParameterSelection)):
+            elif isinstance(param, (QgsProcessingParameterNumber, ParameterSelection)):
                 command += ' -' + param.name() + ' ' + str(param.value)
             else:
                 command += ' -' + param.name() + ' "' + str(param.value) + '"'
@@ -322,9 +322,8 @@ def getOutputCellsize(self, parameters):
                 break
         return cellsize
 
-    def exportRasterLayer(self, source):
+    def exportRasterLayer(self, source, context):
         global sessionExportedLayers
-        context = dataobjects.createContext()
         if source in sessionExportedLayers:
             exportedLayer = sessionExportedLayers[source]
             if os.path.exists(exportedLayer):
@@ -354,7 +353,7 @@ def checkParameterValues(self, parameters, context):
         extent = None
         for param in self.parameterDefinitions():
             files = []
-            if isinstance(param, ParameterRaster):
+            if isinstance(param, QgsProcessingParameterRasterLayer):
                 files = [parameters[param.name()]]
             elif (isinstance(param, ParameterMultipleInput) and
                     param.datatype == ParameterMultipleInput.TYPE_RASTER):
