Merge pull request #3110 from NaturalGIS/master

fix two SAGA statistics_grid modules
qgis · May 26, 2016 · ef3de2853822504e0ed203573a98ee0771463c65 · ef3de28
2 parents d783635 + 8cd6be5
commit ef3de2853822504e0ed203573a98ee0771463c65
diff --git a/python/plugins/processing/algs/saga/description/2.1.2/DirectionalStatisticsforSingleGrid.txt b/python/plugins/processing/algs/saga/description/2.1.2/DirectionalStatisticsforSingleGrid.txt
@@ -5,10 +5,10 @@ ParameterVector|POINTS|Points|-1|True
 ParameterNumber|DIRECTION|Direction [Degree]|None|None|0.0
 ParameterNumber|TOLERANCE|Tolerance [Degree]|None|None|0.0
 ParameterNumber|MAXDISTANCE|Maximum Distance [Cells]|None|None|0
-ParameterSelection|DISTANCE_WEIGHTING_WEIGHTING|Distance Weighting|[0] no distance weighting;[1] inverse distance to a power;[2] exponential;[3] gaussian weighting
-ParameterNumber|DISTANCE_WEIGHTING_IDW_POWER|Inverse Distance Weighting Power|None|None|1
-ParameterBoolean|DISTANCE_WEIGHTING_IDW_OFFSET|Inverse Distance Offset|True
-ParameterNumber|DISTANCE_WEIGHTING_BANDWIDTH|Gaussian and Exponential Weighting Bandwidth|None|None|1.0
+ParameterSelection|DISTANCE_WEIGHTING_DW_WEIGHTING|Distance Weighting|[0] no distance weighting;[1] inverse distance to a power;[2] exponential;[3] gaussian weighting
+ParameterNumber|DISTANCE_WEIGHTING_DW_IDW_POWER|Inverse Distance Weighting Power|None|None|1
+ParameterBoolean|DISTANCE_WEIGHTING_DW_IDW_OFFSET|Inverse Distance Offset|True
+ParameterNumber|DISTANCE_WEIGHTING_DW_BANDWIDTH|Gaussian and Exponential Weighting Bandwidth|None|None|1.0
 OutputRaster|MEAN|Arithmetic Mean
 OutputRaster|DIFMEAN|Difference from Arithmetic Mean
 OutputRaster|MIN|Minimum

diff --git a/python/plugins/processing/algs/saga/description/2.1.2/ResidualAnalysis(Grid).txt b/python/plugins/processing/algs/saga/description/2.1.2/ResidualAnalysis(Grid).txt
@@ -2,10 +2,10 @@ Residual analysis|Residual Analysis (Grid)
 statistics_grid
 ParameterRaster|GRID|Grid|False
 ParameterNumber|RADIUS|Radius (Cells)|1.0|None|7
-ParameterSelection|DISTANCE_WEIGHTING_WEIGHTING|Distance Weighting|[0] no distance weighting;[1] inverse distance to a power;[2] exponential;[3] gaussian weighting
-ParameterNumber|DISTANCE_WEIGHTING_IDW_POWER|Inverse Distance Weighting Power|None|None|1
-ParameterBoolean|DISTANCE_WEIGHTING_IDW_OFFSET|Inverse Distance Offset|True
-ParameterNumber|DISTANCE_WEIGHTING_BANDWIDTH|Gaussian and Exponential Weighting Bandwidth|None|None|1.0
+ParameterSelection|DISTANCE_WEIGHTING_DW_WEIGHTING|Distance Weighting|[0] no distance weighting;[1] inverse distance to a power;[2] exponential;[3] gaussian weighting
+ParameterNumber|DISTANCE_WEIGHTING_DW_IDW_POWER|Inverse Distance Weighting Power|None|None|1
+ParameterBoolean|DISTANCE_WEIGHTING_DW_IDW_OFFSET|Inverse Distance Offset|True
+ParameterNumber|DISTANCE_WEIGHTING_DW_BANDWIDTH|Gaussian and Exponential Weighting Bandwidth|None|None|1.0
 OutputRaster|MEAN|Mean Value
 OutputRaster|DIFF|Difference from Mean Value
 OutputRaster|STDDEV|Standard Deviation

diff --git a/python/plugins/processing/algs/saga/description/2.1.3/DirectionalStatisticsforSingleGrid.txt b/python/plugins/processing/algs/saga/description/2.1.3/DirectionalStatisticsforSingleGrid.txt
@@ -5,10 +5,10 @@ ParameterVector|POINTS|Points|-1|True
 ParameterNumber|DIRECTION|Direction [Degree]|None|None|0.0
 ParameterNumber|TOLERANCE|Tolerance [Degree]|None|None|0.0
 ParameterNumber|MAXDISTANCE|Maximum Distance [Cells]|None|None|0
-ParameterSelection|DISTANCE_WEIGHTING_WEIGHTING|Distance Weighting|[0] no distance weighting;[1] inverse distance to a power;[2] exponential;[3] gaussian weighting
-ParameterNumber|DISTANCE_WEIGHTING_IDW_POWER|Inverse Distance Weighting Power|None|None|1
-ParameterBoolean|DISTANCE_WEIGHTING_IDW_OFFSET|Inverse Distance Offset|True
-ParameterNumber|DISTANCE_WEIGHTING_BANDWIDTH|Gaussian and Exponential Weighting Bandwidth|None|None|1.0
+ParameterSelection|DISTANCE_WEIGHTING_DW_WEIGHTING|Distance Weighting|[0] no distance weighting;[1] inverse distance to a power;[2] exponential;[3] gaussian weighting
+ParameterNumber|DISTANCE_WEIGHTING_DW_IDW_POWER|Inverse Distance Weighting Power|None|None|1
+ParameterBoolean|DISTANCE_WEIGHTING_DW_IDW_OFFSET|Inverse Distance Offset|True
+ParameterNumber|DISTANCE_WEIGHTING_DW_BANDWIDTH|Gaussian and Exponential Weighting Bandwidth|None|None|1.0
 OutputRaster|MEAN|Arithmetic Mean
 OutputRaster|DIFMEAN|Difference from Arithmetic Mean
 OutputRaster|MIN|Minimum

diff --git a/python/plugins/processing/algs/saga/description/2.1.3/ResidualAnalysis(Grid).txt b/python/plugins/processing/algs/saga/description/2.1.3/ResidualAnalysis(Grid).txt
@@ -2,10 +2,10 @@ Residual analysis|Residual Analysis (Grid)
 statistics_grid
 ParameterRaster|GRID|Grid|False
 ParameterNumber|RADIUS|Radius (Cells)|1.0|None|7
-ParameterSelection|DISTANCE_WEIGHTING_WEIGHTING|Distance Weighting|[0] no distance weighting;[1] inverse distance to a power;[2] exponential;[3] gaussian weighting
-ParameterNumber|DISTANCE_WEIGHTING_IDW_POWER|Inverse Distance Weighting Power|None|None|1
-ParameterBoolean|DISTANCE_WEIGHTING_IDW_OFFSET|Inverse Distance Offset|True
-ParameterNumber|DISTANCE_WEIGHTING_BANDWIDTH|Gaussian and Exponential Weighting Bandwidth|None|None|1.0
+ParameterSelection|DISTANCE_WEIGHTING_DW_WEIGHTING|Distance Weighting|[0] no distance weighting;[1] inverse distance to a power;[2] exponential;[3] gaussian weighting
+ParameterNumber|DISTANCE_WEIGHTING_DW_IDW_POWER|Inverse Distance Weighting Power|None|None|1
+ParameterBoolean|DISTANCE_WEIGHTING_DW_IDW_OFFSET|Inverse Distance Offset|True
+ParameterNumber|DISTANCE_WEIGHTING_DW_BANDWIDTH|Gaussian and Exponential Weighting Bandwidth|None|None|1.0
 OutputRaster|MEAN|Mean Value
 OutputRaster|DIFF|Difference from Mean Value
 OutputRaster|STDDEV|Standard Deviation

diff --git a/python/plugins/processing/algs/saga/description/2.1.4/DirectionalStatisticsforSingleGrid.txt b/python/plugins/processing/algs/saga/description/2.1.4/DirectionalStatisticsforSingleGrid.txt
@@ -5,10 +5,10 @@ ParameterVector|POINTS|Points|-1|True
 ParameterNumber|DIRECTION|Direction [Degree]|None|None|0.0
 ParameterNumber|TOLERANCE|Tolerance [Degree]|None|None|0.0
 ParameterNumber|MAXDISTANCE|Maximum Distance [Cells]|None|None|0
-ParameterSelection|DISTANCE_WEIGHTING_WEIGHTING|Distance Weighting|[0] no distance weighting;[1] inverse distance to a power;[2] exponential;[3] gaussian weighting
-ParameterNumber|DISTANCE_WEIGHTING_IDW_POWER|Inverse Distance Weighting Power|None|None|1
-ParameterBoolean|DISTANCE_WEIGHTING_IDW_OFFSET|Inverse Distance Offset|True
-ParameterNumber|DISTANCE_WEIGHTING_BANDWIDTH|Gaussian and Exponential Weighting Bandwidth|None|None|1.0
+ParameterSelection|DISTANCE_WEIGHTING_DW_WEIGHTING|Distance Weighting|[0] no distance weighting;[1] inverse distance to a power;[2] exponential;[3] gaussian weighting
+ParameterNumber|DISTANCE_WEIGHTING_DW_IDW_POWER|Inverse Distance Weighting Power|None|None|1
+ParameterBoolean|DISTANCE_WEIGHTING_DW_IDW_OFFSET|Inverse Distance Offset|True
+ParameterNumber|DISTANCE_WEIGHTING_DW_BANDWIDTH|Gaussian and Exponential Weighting Bandwidth|None|None|1.0
 OutputRaster|MEAN|Arithmetic Mean
 OutputRaster|DIFMEAN|Difference from Arithmetic Mean
 OutputRaster|MIN|Minimum

diff --git a/python/plugins/processing/algs/saga/description/2.1.4/ResidualAnalysis(Grid).txt b/python/plugins/processing/algs/saga/description/2.1.4/ResidualAnalysis(Grid).txt
@@ -2,10 +2,10 @@ Residual analysis|Residual Analysis (Grid)
 statistics_grid
 ParameterRaster|GRID|Grid|False
 ParameterNumber|RADIUS|Radius (Cells)|1.0|None|7
-ParameterSelection|DISTANCE_WEIGHTING_WEIGHTING|Distance Weighting|[0] no distance weighting;[1] inverse distance to a power;[2] exponential;[3] gaussian weighting
-ParameterNumber|DISTANCE_WEIGHTING_IDW_POWER|Inverse Distance Weighting Power|None|None|1
-ParameterBoolean|DISTANCE_WEIGHTING_IDW_OFFSET|Inverse Distance Offset|True
-ParameterNumber|DISTANCE_WEIGHTING_BANDWIDTH|Gaussian and Exponential Weighting Bandwidth|None|None|1.0
+ParameterSelection|DISTANCE_WEIGHTING_DW_WEIGHTING|Distance Weighting|[0] no distance weighting;[1] inverse distance to a power;[2] exponential;[3] gaussian weighting
+ParameterNumber|DISTANCE_WEIGHTING_DW_IDW_POWER|Inverse Distance Weighting Power|None|None|1
+ParameterBoolean|DISTANCE_WEIGHTING_DW_IDW_OFFSET|Inverse Distance Offset|True
+ParameterNumber|DISTANCE_WEIGHTING_DW_BANDWIDTH|Gaussian and Exponential Weighting Bandwidth|None|None|1.0
 OutputRaster|MEAN|Mean Value
 OutputRaster|DIFF|Difference from Mean Value
 OutputRaster|STDDEV|Standard Deviation

diff --git a/python/plugins/processing/algs/saga/description/2.2.0/DirectionalStatisticsforSingleGrid.txt b/python/plugins/processing/algs/saga/description/2.2.0/DirectionalStatisticsforSingleGrid.txt
@@ -5,10 +5,10 @@ ParameterVector|POINTS|Points|-1|True
 ParameterNumber|DIRECTION|Direction [Degree]|None|None|0.0
 ParameterNumber|TOLERANCE|Tolerance [Degree]|None|None|0.0
 ParameterNumber|MAXDISTANCE|Maximum Distance [Cells]|None|None|0
-ParameterSelection|DISTANCE_WEIGHTING_WEIGHTING|Distance Weighting|[0] no distance weighting;[1] inverse distance to a power;[2] exponential;[3] gaussian weighting
-ParameterNumber|DISTANCE_WEIGHTING_IDW_POWER|Inverse Distance Weighting Power|None|None|1
-ParameterBoolean|DISTANCE_WEIGHTING_IDW_OFFSET|Inverse Distance Offset|True
-ParameterNumber|DISTANCE_WEIGHTING_BANDWIDTH|Gaussian and Exponential Weighting Bandwidth|None|None|1.0
+ParameterSelection|DISTANCE_WEIGHTING_DW_WEIGHTING|Distance Weighting|[0] no distance weighting;[1] inverse distance to a power;[2] exponential;[3] gaussian weighting
+ParameterNumber|DISTANCE_WEIGHTING_DW_IDW_POWER|Inverse Distance Weighting Power|None|None|1
+ParameterBoolean|DISTANCE_WEIGHTING_DW_IDW_OFFSET|Inverse Distance Offset|True
+ParameterNumber|DISTANCE_WEIGHTING_DW_BANDWIDTH|Gaussian and Exponential Weighting Bandwidth|None|None|1.0
 OutputRaster|MEAN|Arithmetic Mean
 OutputRaster|DIFMEAN|Difference from Arithmetic Mean
 OutputRaster|MIN|Minimum

diff --git a/python/plugins/processing/algs/saga/description/2.2.0/ResidualAnalysis(Grid).txt b/python/plugins/processing/algs/saga/description/2.2.0/ResidualAnalysis(Grid).txt
@@ -2,10 +2,10 @@ Residual analysis|Residual Analysis (Grid)
 statistics_grid
 ParameterRaster|GRID|Grid|False
 ParameterNumber|RADIUS|Radius (Cells)|1.0|None|7
-ParameterSelection|DISTANCE_WEIGHTING_WEIGHTING|Distance Weighting|[0] no distance weighting;[1] inverse distance to a power;[2] exponential;[3] gaussian weighting
-ParameterNumber|DISTANCE_WEIGHTING_IDW_POWER|Inverse Distance Weighting Power|None|None|1
-ParameterBoolean|DISTANCE_WEIGHTING_IDW_OFFSET|Inverse Distance Offset|True
-ParameterNumber|DISTANCE_WEIGHTING_BANDWIDTH|Gaussian and Exponential Weighting Bandwidth|None|None|1.0
+ParameterSelection|DISTANCE_WEIGHTING_DW_WEIGHTING|Distance Weighting|[0] no distance weighting;[1] inverse distance to a power;[2] exponential;[3] gaussian weighting
+ParameterNumber|DISTANCE_WEIGHTING_DW_IDW_POWER|Inverse Distance Weighting Power|None|None|1
+ParameterBoolean|DISTANCE_WEIGHTING_DW_IDW_OFFSET|Inverse Distance Offset|True
+ParameterNumber|DISTANCE_WEIGHTING_DW_BANDWIDTH|Gaussian and Exponential Weighting Bandwidth|None|None|1.0
 OutputRaster|MEAN|Mean Value
 OutputRaster|DIFF|Difference from Mean Value
 OutputRaster|STDDEV|Standard Deviation

diff --git a/python/plugins/processing/algs/saga/description/2.2.2/DirectionalStatisticsforSingleGrid.txt b/python/plugins/processing/algs/saga/description/2.2.2/DirectionalStatisticsforSingleGrid.txt
@@ -5,10 +5,10 @@ ParameterVector|POINTS|Points|-1|True
 ParameterNumber|DIRECTION|Direction [Degree]|None|None|0.0
 ParameterNumber|TOLERANCE|Tolerance [Degree]|None|None|0.0
 ParameterNumber|MAXDISTANCE|Maximum Distance [Cells]|None|None|0
-ParameterSelection|DISTANCE_WEIGHTING_WEIGHTING|Distance Weighting|[0] no distance weighting;[1] inverse distance to a power;[2] exponential;[3] gaussian weighting
-ParameterNumber|DISTANCE_WEIGHTING_IDW_POWER|Inverse Distance Weighting Power|None|None|1
-ParameterBoolean|DISTANCE_WEIGHTING_IDW_OFFSET|Inverse Distance Offset|True
-ParameterNumber|DISTANCE_WEIGHTING_BANDWIDTH|Gaussian and Exponential Weighting Bandwidth|None|None|1.0
+ParameterSelection|DISTANCE_WEIGHTING_DW_WEIGHTING|Distance Weighting|[0] no distance weighting;[1] inverse distance to a power;[2] exponential;[3] gaussian weighting
+ParameterNumber|DISTANCE_WEIGHTING_DW_IDW_POWER|Inverse Distance Weighting Power|None|None|1
+ParameterBoolean|DISTANCE_WEIGHTING_DW_IDW_OFFSET|Inverse Distance Offset|True
+ParameterNumber|DISTANCE_WEIGHTING_DW_BANDWIDTH|Gaussian and Exponential Weighting Bandwidth|None|None|1.0
 OutputRaster|MEAN|Arithmetic Mean
 OutputRaster|DIFMEAN|Difference from Arithmetic Mean
 OutputRaster|MIN|Minimum

diff --git a/python/plugins/processing/algs/saga/description/2.2.3/DirectionalStatisticsforSingleGrid.txt b/python/plugins/processing/algs/saga/description/2.2.3/DirectionalStatisticsforSingleGrid.txt
@@ -5,10 +5,10 @@ ParameterVector|POINTS|Points|-1|True
 ParameterNumber|DIRECTION|Direction [Degree]|None|None|0.0
 ParameterNumber|TOLERANCE|Tolerance [Degree]|None|None|0.0
 ParameterNumber|MAXDISTANCE|Maximum Distance [Cells]|None|None|0
-ParameterSelection|DISTANCE_WEIGHTING_WEIGHTING|Distance Weighting|[0] no distance weighting;[1] inverse distance to a power;[2] exponential;[3] gaussian weighting
-ParameterNumber|DISTANCE_WEIGHTING_IDW_POWER|Inverse Distance Weighting Power|None|None|1
-ParameterBoolean|DISTANCE_WEIGHTING_IDW_OFFSET|Inverse Distance Offset|True
-ParameterNumber|DISTANCE_WEIGHTING_BANDWIDTH|Gaussian and Exponential Weighting Bandwidth|None|None|1.0
+ParameterSelection|DISTANCE_WEIGHTING_DW_WEIGHTING|Distance Weighting|[0] no distance weighting;[1] inverse distance to a power;[2] exponential;[3] gaussian weighting
+ParameterNumber|DISTANCE_WEIGHTING_DW_IDW_POWER|Inverse Distance Weighting Power|None|None|1
+ParameterBoolean|DISTANCE_WEIGHTING_DW_IDW_OFFSET|Inverse Distance Offset|True
+ParameterNumber|DISTANCE_WEIGHTING_DW_BANDWIDTH|Gaussian and Exponential Weighting Bandwidth|None|None|1.0
 OutputRaster|MEAN|Arithmetic Mean
 OutputRaster|DIFMEAN|Difference from Arithmetic Mean
 OutputRaster|MIN|Minimum