Fix i.atcor algorithm

qgis · May 29, 2016 · 6b8f943 · 6b8f943
1 parent b40d2ff
commit 6b8f943
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 6 deletions.
diff --git a/python/plugins/processing/algs/grass7/description/i.atcorr.txt b/python/plugins/processing/algs/grass7/description/i.atcorr.txt
@@ -2,14 +2,15 @@ i.atcorr
 Performs atmospheric correction using the 6S algorithm.
 Imagery (i.*)
 ParameterRaster|input|Name of input raster map|False
-ParameterBoolean|-a|Input from ETM+ image taken after July 1, 2000|False
-ParameterBoolean|-b|Input from ETM+ image taken before July 1, 2000|False
+ParameterRange|range|Input imagery range [0,255]|0,255|True
 ParameterRaster|elevation|Input altitude raster map in m (optional)|True
 ParameterRaster|visibility|Input visibility raster map in km (optional)|True
 ParameterFile|parameters|Name of input text file|False|False
-ParameterRange|range|Input imagery range [0,255]|0,255
-ParameterBoolean|-o|Try to increase computation speed when altitude and/or visibility map is used|True
+ParameterRange|rescale|Rescale output raster map [0,255]|0,255|True
 OutputRaster|output|Atmospheric correction
-ParameterBoolean|-f|Output raster is floating point|False
-ParameterRange|rescale|Rescale output raster map [0,255]|0,255
+*ParameterBoolean|-i|Output raster map as integer|False
+*ParameterBoolean|-r|Input raster map converted to reflectance (default is radiance)|False
+*ParameterBoolean|-a|Input from ETM+ image taken after July 1, 2000|False
+*ParameterBoolean|-b|Input from ETM+ image taken before July 1, 2000|False
+
 
diff --git a/python/plugins/processing/tests/testdata/grass7_algorithm_tests.yaml b/python/plugins/processing/tests/testdata/grass7_algorithm_tests.yaml
@@ -599,3 +599,21 @@ tests:
       output:
         hash: f564acd642f6f0ea76cbe55d3565d083e055d2e81dde97365f786bad
         type: rasterhash
+
+  - algorithm: grass7:i.atcorr
+    name: GRASS7 i.atcorr
+    params:
+      GRASS_REGION_PARAMETER: '344500.0,358400.0,6682800.0,6693700.0'
+      input:
+        name: custom/grass7/raster_6class.tif
+        type: raster
+      visibility:
+        name: custom/grass7/raster_5class.tif
+        type: raster
+      parameters:
+        type: file
+        name: /home/medspx/projects/QGIS/python/plugins/processing/tests/testdata/custom/grass7/i.atcorr.txt
+    results:
+      output:
+        hash: fc3dbc04793ecba0a24400d489f3ebd0660400232602487e6861306c
+        type: rasterhash