Skip to content

Commit

Permalink
Merge pull request #2869 from NaturalGIS/processing_fix_saga_223_chan…
Browse files Browse the repository at this point in the history 
…ged_modules

[processing] fix/adds SAGA 2.2.3 tools
  • Loading branch information
@alexbruy
alexbruy committed Mar 6, 2016
2 parents 2eb8243 + f8ea9d9 commit 6289786
Show file tree
Hide file tree
Showing 17 changed files with 145 additions and 33 deletions.
12 changes: 12 additions & 0 deletions python/plugins/processing/algs/saga/description/2.2.2/ConfusionMatrix(GridPolygons).txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Confusion Matrix (Polygons / Grid)
imagery_classification
ParameterRaster|GRID|Classification|False
ParameterTable|GRID_LUT|Look-up Table|True
ParameterTableField|GRID_LUT_MIN|Value|GRID_LUT|-1|True
ParameterTableField|GRID_LUT_MAX|Value (Maximum)|GRID_LUT|-1|True
ParameterTableField|GRID_LUT_NAM|Name|GRID_LUT|-1|True
ParameterVector|POLYGONS|Polygons|2|False
ParameterTableField|FIELD|Classes|POLYGONS|-1|False
OutputTable|CONFUSION|Confusion Matrix
OutputTable|CLASSES|Class Values
OutputTable|SUMMARY|Summary
14 changes: 14 additions & 0 deletions python/plugins/processing/algs/saga/description/2.2.2/DiversityOfCategories.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
Diversity of Categories
grid_analysis
ParameterRaster|CATEGORIES|Categories|False
ParameterSelection|SEARCH_MODE|Search Mode|[0] square;[1] circle|1
ParameterNumber|SEARCH_RADIUS|Search Radius Distance|1.0|3|3
ParameterSelection|NB_CASE|Connectivity Neighbourhood|[0] Rook's case;[1] Queen's case|1
ParameterSelection|DW_WEIGHTING|Weighting Function|[0] no distance weighting;[1] inverse distance to a power;[2] exponential;[3] gaussian weighting
ParameterNumber|DW_IDW_POWER|Inverse Distance Weighting Power|0.0|None|1
ParameterBoolean|DW_IDW_OFFSET|Inverse Distance Offset|True
ParameterNumber|DW_BANDWIDTH|Gaussian and Exponential Weighting Bandwidth|0.0|None|0.7
OutputRaster|DIVERSITY|Diversity
OutputRaster|SIZE_MEAN|Average Size
OutputRaster|SIZE_SKEW|Skewness
OutputRaster|CONNECTIVITY|Connectivity
18 changes: 10 additions & 8 deletions python/plugins/processing/algs/saga/description/2.2.2/GridStatisticsforPolygons.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@ Grid Statistics for Polygons
shapes_grid
ParameterMultipleInput|GRIDS|Grids|3|False
ParameterVector|POLYGONS|Polygons|2|False
ParameterBoolean|COUNT |Number of Cells|True
ParameterBoolean|MIN |Minimum|True
ParameterBoolean|MAX |Maximum|True
ParameterBoolean|RANGE |Range|True
ParameterBoolean|SUM |Sum|True
ParameterBoolean|MEAN |Mean|True
ParameterBoolean|VAR |Variance|True
ParameterBoolean|STDDEV |Standard Deviation|True
ParameterSelection|METHOD|Method|[0] Standard;[1] Shape wise, supports overlapping polygons|1
ParameterSelection|NAMING|Grid Naming|[0] Grid number;[1] Grid name|1
ParameterBoolean|COUNT|Number of Cells|True
ParameterBoolean|MIN|Minimum|True
ParameterBoolean|MAX|Maximum|True
ParameterBoolean|RANGE|Range|True
ParameterBoolean|SUM|Sum|True
ParameterBoolean|MEAN|Mean|True
ParameterBoolean|VAR|Variance|True
ParameterBoolean|STDDEV|Standard Deviation|True
ParameterNumber|QUANTILE|Quantiles|None|None|0
OutputVector|RESULT|Statistics
9 changes: 5 additions & 4 deletions python/plugins/processing/algs/saga/description/2.2.2/ResidualAnalysis(Grid).txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ 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
ParameterBoolean|BCENTER|Include Center Cell|True
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
Expand Down
12 changes: 12 additions & 0 deletions python/plugins/processing/algs/saga/description/2.2.3/ConfusionMatrix(GridPolygons).txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Confusion Matrix (Polygons / Grid)
imagery_classification
ParameterRaster|GRID|Classification|False
ParameterTable|GRID_LUT|Look-up Table|True
ParameterTableField|GRID_LUT_MIN|Value|GRID_LUT|-1|True
ParameterTableField|GRID_LUT_MAX|Value (Maximum)|GRID_LUT|-1|True
ParameterTableField|GRID_LUT_NAM|Name|GRID_LUT|-1|True
ParameterVector|POLYGONS|Polygons|2|False
ParameterTableField|FIELD|Classes|POLYGONS|-1|False
OutputTable|CONFUSION|Confusion Matrix
OutputTable|CLASSES|Class Values
OutputTable|SUMMARY|Summary
8 changes: 0 additions & 8 deletions python/plugins/processing/algs/saga/description/2.2.3/CreateGraticule.txt
View file

This file was deleted.

9 changes: 9 additions & 0 deletions python/plugins/processing/algs/saga/description/2.2.3/CreateLinesGraticule.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Create Lines Graticule|Create Graticule
shapes_tools
Hardcoded|-TYPE 0
ParameterVector|EXTENT|Extent|-1|True
Extent EXTENT_X_MIN EXTENT_X_MAX EXTENT_Y_MIN EXTENT_Y_MAX
ParameterNumber|DIVISION_X|Division Width|None|None|1.0
ParameterNumber|DIVISION_Y|Division Height|None|None|1.0
ParameterSelection|ALIGNMENT|Alignment|[0] Bottom left;[1] Top left;[2] Bottom right;[3] Top right;[4] Centered|0
OutputVector|GRATICULE_LINE|Lines Graticule
9 changes: 9 additions & 0 deletions python/plugins/processing/algs/saga/description/2.2.3/CreatePolygonsGraticule.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Create Polygons Graticule|Create Graticule
shapes_tools
Hardcoded|-TYPE 1
ParameterVector|EXTENT|Extent|-1|True
Extent EXTENT_X_MIN EXTENT_X_MAX EXTENT_Y_MIN EXTENT_Y_MAX
ParameterNumber|DIVISION_X|Division Width|None|None|1.0
ParameterNumber|DIVISION_Y|Division Height|None|None|1.0
ParameterSelection|ALIGNMENT|Alignment|[0] Bottom left;[1] Top left;[2] Bottom right;[3] Top right;[4] Centered|0
OutputVector|GRATICULE_RECT|Rectangle Graticule
11 changes: 11 additions & 0 deletions python/plugins/processing/algs/saga/description/2.2.3/DiffusiveHillslopeEvolution(ADI).txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Diffusive Hillslope Evolution (ADI)
sim_qm_of_esp
ParameterRaster|DEM|Elevation|False
ParameterRaster|CHANNELS|Channel Mask|True
ParameterBoolean|UPDATE|Update|True
ParameterNumber|KAPPA|Diffusivity [m2/kyr]|0.0|None|10.0
ParameterNumber|DURATION|Simulation Time [kyr]|0.0|None|10000.0
ParameterSelection|TIMESTEP|Time Step|[0] user defined;[1] automatically|1
ParameterNumber|DTIME|Time Step [kyr]|0.0|None|1000.0
OutputRaster|MODEL|Modelled Elevation
OutputRaster|DIFF|Elevation Difference
11 changes: 11 additions & 0 deletions python/plugins/processing/algs/saga/description/2.2.3/DiffusiveHillslopeEvolution(FTCS).txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Diffusive Hillslope Evolution (FTCS)
sim_qm_of_esp
ParameterRaster|DEM|Elevation|False
ParameterBoolean|UPDATE|Update|True
ParameterNumber|KAPPA|Diffusivity [m2/kyr]|0.0|None|1.0
ParameterNumber|DURATION|Simulation Time [kyr]|0.0|None|100.0
ParameterSelection|TIMESTEP|Time Step|[0] user defined;[1] automatically|1
ParameterNumber|DTIME|Time Step [kyr]|0.0|None|10.0
ParameterSelection|NEIGHBOURS|Neighbourhood|[0] Neumann;[1] Moore|1
OutputRaster|MODEL|Modelled Elevation
OutputRaster|DIFF|Elevation Difference
15 changes: 15 additions & 0 deletions python/plugins/processing/algs/saga/description/2.2.3/DiversityOfCategories.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Diversity of Categories
grid_analysis
ParameterRaster|CATEGORIES|Categories|False
ParameterSelection|SEARCH_MODE|Search Mode|[0] square;[1] circle|1
ParameterNumber|SEARCH_RADIUS|Search Radius Distance|1.0|3|3
ParameterSelection|NB_CASE|Connectivity Neighbourhood|[0] Rook's case;[1] Queen's case|1
ParameterSelection|DW_WEIGHTING|Weighting Function|[0] no distance weighting;[1] inverse distance to a power;[2] exponential;[3] gaussian weighting
ParameterNumber|DW_IDW_POWER|Inverse Distance Weighting Power|0.0|None|1
ParameterBoolean|DW_IDW_OFFSET|Inverse Distance Offset|True
ParameterNumber|DW_BANDWIDTH|Gaussian and Exponential Weighting Bandwidth|0.0|None|0.7
OutputRaster|COUNT|Number of Categories
OutputRaster|DIVERSITY|Diversity
OutputRaster|SIZE_MEAN|Average Size
OutputRaster|SIZE_SKEW|Skewness
OutputRaster|CONNECTIVITY|Connectivity
6 changes: 6 additions & 0 deletions python/plugins/processing/algs/saga/description/2.2.3/FillSinks(QMofESP).txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Fill Sinks (QM of ESP)
sim_qm_of_esp
ParameterRaster|DEM|DEM|False
ParameterNumber|DZFILL|Fill Increment|0.0|None|0.01
OutputRaster|FILLED|DEM Without Sinks
OutputRaster|SINKS|Sinks
6 changes: 6 additions & 0 deletions python/plugins/processing/algs/saga/description/2.2.3/FlowAccumulation(QMofESP).txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Flow Accumulation (QM of ESP)
sim_qm_of_esp
ParameterRaster|DEM|DEM|False
ParameterSelection|PREPROC|Preprocessing|[0] none;[1] fill sinks temporarily;[2] fill sinks permanently|1
ParameterNumber|DZFILL|Fill Increment|0.00|None|0.01
OutputRaster|FLOW|Contributing Area
20 changes: 11 additions & 9 deletions python/plugins/processing/algs/saga/description/2.2.3/GridStatisticsforPolygons.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@ Grid Statistics for Polygons
shapes_grid
ParameterMultipleInput|GRIDS|Grids|3|False
ParameterVector|POLYGONS|Polygons|2|False
ParameterBoolean|COUNT |Number of Cells|True
ParameterBoolean|MIN |Minimum|True
ParameterBoolean|MAX |Maximum|True
ParameterBoolean|RANGE |Range|True
ParameterBoolean|SUM |Sum|True
ParameterBoolean|MEAN |Mean|True
ParameterBoolean|VAR |Variance|True
ParameterBoolean|STDDEV |Standard Deviation|True
ParameterSelection|METHOD|Method|[0] Standard;[1] Shape wise, supports overlapping polygons|1
ParameterSelection|NAMING|Grid Naming|[0] Grid number;[1] Grid name|1
ParameterBoolean|COUNT|Number of Cells|True
ParameterBoolean|MIN|Minimum|True
ParameterBoolean|MAX|Maximum|True
ParameterBoolean|RANGE|Range|True
ParameterBoolean|SUM|Sum|True
ParameterBoolean|MEAN|Mean|True
ParameterBoolean|VAR|Variance|True
ParameterBoolean|STDDEV|Standard Deviation|True
ParameterNumber|QUANTILE|Quantiles|None|None|0
OutputVector|RESULT|Statistics
OutputVector|RESULT|Statistics
1 change: 1 addition & 0 deletions python/plugins/processing/algs/saga/description/2.2.3/Mosaicking.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ Mosaick raster layers|Mosaicking
grid_tools
AllowUnmatching
ParameterMultipleInput|GRIDS|Input Grids|3|False
ParameterString|NAME|Name|Mosaic
ParameterSelection|TYPE|Preferred data storage type|[0] 1 bit;[1] 1 byte unsigned integer;[2] 1 byte signed integer;[3] 2 byte unsigned integer;[4] 2 byte signed integer;[5] 4 byte unsigned integer;[6] 4 byte signed integer;[7] 4 byte floating point;[8] 8 byte floating point|7
ParameterSelection|INTERPOL|Interpolation|[0] Nearest Neighbor;[1] Bilinear Interpolation;[2] Inverse Distance Interpolation;[3] Bicubic Spline Interpolation;[4] B-Spline Interpolation|0
ParameterSelection|OVERLAP|Overlapping Areas|[0] first;[1] last;[2] minimum;[3] maximum;[4] mean;[5] blend boundary;[6] feathering|1
Expand Down
10 changes: 6 additions & 4 deletions python/plugins/processing/algs/saga/description/2.2.3/ResidualAnalysis(Grid).txt
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
Residual analysis|Residual Analysis (Grid)
statistics_grid
ParameterRaster|GRID|Grid|False
ParameterSelection|MODE|Search Mode|[0] square;[1] circle|1
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
ParameterBoolean|BCENTER|Include Center Cell|True
ParameterSelection|DISTANCE_WEIGHTING_DW_WEIGHTING|Distance Weighting|[0] no distance weighting;[1] inverse distance to a power;[2] exponential;[3] gaussian weighting|0
ParameterNumber|DISTANCE_WEIGHTING_DW_IDW_POWER|Inverse Distance Weighting Power|0.0|None|1
ParameterBoolean|DISTANCE_WEIGHTING_DW_IDW_OFFSET|Inverse Distance Offset|True
ParameterNumber|DISTANCE_WEIGHTING_DW_BANDWIDTH|Gaussian and Exponential Weighting Bandwidth|0.0|None|1.0
OutputRaster|MEAN|Mean Value
OutputRaster|DIFF|Difference from Mean Value
OutputRaster|STDDEV|Standard Deviation
Expand Down
7 changes: 7 additions & 0 deletions python/plugins/processing/algs/saga/description/2.2.3/SuccessiveFlowRouting.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Successive Flow Routing
sim_qm_of_esp
ParameterRaster|DEM|DEM|False
ParameterNumber|ITERATIONS|Iterations|1|None|100
ParameterNumber|RUNOFF|Runoff|None|None|1.00
ParameterNumber|MANNING|Manning's Roughness|None|None|0.20
OutputRaster|FLOW|Flow

0 comments on commit 6289786

Please sign in to comment.