partial fix for SAGA RGB composite tool

(cherry picked from commit 25bfca4)
qgis · Dec 4, 2018 · 3f0bc70 · 3f0bc70
1 parent 9fff1fb
commit 3f0bc70
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/python/plugins/processing/algs/saga/SagaAlgorithm.py b/python/plugins/processing/algs/saga/SagaAlgorithm.py
@@ -321,7 +321,7 @@ def processAlgorithm(self, parameters, context, feedback):
                 filename = self.parameterAsOutputLayer(parameters, out.name(), context)
                 filename2 = os.path.splitext(filename)[0] + '.sgrd'
                 if self.cmdname == 'RGB Composite':
-                    commands.append('io_grid_image 0 -IS_RGB -GRID:"{}" -FILE:"{}"'.format(filename2, filename))
+                    commands.append('io_grid_image 0 -COLOURING 4 -GRID:"{}" -FILE:"{}"'.format(filename2, filename))
 
         # 3: Run SAGA
         commands = self.editCommands(commands)

diff --git a/python/plugins/processing/algs/saga/description/RGBComposite.txt b/python/plugins/processing/algs/saga/description/RGBComposite.txt
@@ -1,24 +1,24 @@
 RGB Composite
 grid_visualisation
-QgsProcessingParameterRasterLayer|GRID_R|R|None|False
-QgsProcessingParameterRasterLayer|GRID_G|G|None|False
-QgsProcessingParameterRasterLayer|GRID_B|B|None|False
+QgsProcessingParameterRasterLayer|R_GRID|R|None|False
+QgsProcessingParameterRasterLayer|G_GRID|G|None|False
+QgsProcessingParameterRasterLayer|B_GRID|B|None|False
 QgsProcessingParameterEnum|R_METHOD|Method for R value|0 - 255;Rescale to 0 - 255;User defined rescale;Percentiles;Percentage of standard deviation
 QgsProcessingParameterEnum|G_METHOD|Method for G value|0 - 255;Rescale to 0 - 255;User defined rescale;Percentiles;Percentage of standard deviation
 QgsProcessingParameterEnum|B_METHOD|Method for B value|0 - 255;Rescale to 0 - 255;User defined rescale;Percentiles;Percentage of standard deviation
 QgsProcessingParameterNumber|R_RANGE_MIN|Rescale Range for RED min|QgsProcessingParameterNumber.Integer|0|False|0|255
 QgsProcessingParameterNumber|R_RANGE_MAX|Rescale Range for RED max|QgsProcessingParameterNumber.Integer|255|False|0|255
 QgsProcessingParameterNumber|R_PERCTL_MIN|Percentiles Range for RED max|QgsProcessingParameterNumber.Integer|1|False|1|99
 QgsProcessingParameterNumber|R_PERCTL_MAX|Percentiles Range for RED max|QgsProcessingParameterNumber.Integer|99|False|1|99
-QgsProcessingParameterNumber|R_PERCENT|Percentage of standard deviation for RED|QgsProcessingParameterNumber.Double|150.0|False|0|None
+QgsProcessingParameterNumber|R_STDDEV|Standard deviation for RED|QgsProcessingParameterNumber.Double|2.0|False|0|None
 QgsProcessingParameterNumber|G_RANGE_MIN|Rescale Range for GREEN min|QgsProcessingParameterNumber.Integer|0|False|0|255
 QgsProcessingParameterNumber|G_RANGE_MAX|Rescale Range for GREEN max|QgsProcessingParameterNumber.Integer|255|False|0|255
 QgsProcessingParameterNumber|G_PERCTL_MIN|Percentiles Range for GREEN max|QgsProcessingParameterNumber.Integer|1|False|1|99
 QgsProcessingParameterNumber|G_PERCTL_MAX|Percentiles Range for GREEN max|QgsProcessingParameterNumber.Integer|99|False|1|99
-QgsProcessingParameterNumber|G_PERCENT|Percentage of standard deviation for GREEN|QgsProcessingParameterNumber.Double|150.0|False|0|None
+QgsProcessingParameterNumber|G_STDDEV|Standard deviation for GREEN|QgsProcessingParameterNumber.Double|2.0|False|0|None
 QgsProcessingParameterNumber|B_RANGE_MIN|Rescale Range for BLUE min|QgsProcessingParameterNumber.Integer|0|False|0|255
 QgsProcessingParameterNumber|B_RANGE_MAX|Rescale Range for BLUE max|QgsProcessingParameterNumber.Integer|255|False|0|255
 QgsProcessingParameterNumber|B_PERCTL_MIN|Percentiles Range for BLUE max|QgsProcessingParameterNumber.Integer|1|False|1|99
 QgsProcessingParameterNumber|B_PERCTL_MAX|Percentiles Range for BLUE max|QgsProcessingParameterNumber.Integer|99|False|1|99
-QgsProcessingParameterNumber|B_PERCENT|Percentage of standard deviation for BLUE|QgsProcessingParameterNumber.Double|150.0|False|0|None
-QgsProcessingParameterRasterDestination|GRID_RGB|Output RGB
+QgsProcessingParameterNumber|B_STDDEV|Standard deviation for BLUE|QgsProcessingParameterNumber.Double|2.0|False|0|None
+QgsProcessingParameterRasterDestination|RGB|Output RGB