From eb186c4928cde49110c9621edcbc284c23ab3035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A9d=C3=A9ric=20RIBREUX?= Date: Sat, 19 Mar 2016 10:05:24 +0100 Subject: [PATCH] Remove merge conflict on r.cost algorithms --- .../algs/grass7/description/r.cost.coords.txt | 14 -------------- .../algs/grass7/description/r.cost.points.txt | 14 -------------- .../algs/grass7/description/r.cost.rast.txt | 13 ------------- 3 files changed, 41 deletions(-) delete mode 100644 python/plugins/processing/algs/grass7/description/r.cost.coords.txt delete mode 100644 python/plugins/processing/algs/grass7/description/r.cost.points.txt delete mode 100644 python/plugins/processing/algs/grass7/description/r.cost.rast.txt diff --git a/python/plugins/processing/algs/grass7/description/r.cost.coords.txt b/python/plugins/processing/algs/grass7/description/r.cost.coords.txt deleted file mode 100644 index a1d550caf34..00000000000 --- a/python/plugins/processing/algs/grass7/description/r.cost.coords.txt +++ /dev/null @@ -1,14 +0,0 @@ -r.cost -r.cost.coords - Creates a raster layer of cumulative cost of moving across a raster layer whose cell values represent cost from a list of coordinates. -Raster (r.*) -ParameterRaster|input|Unit cost layer|False -ParameterString|start_coordinates|Coordinates of starting point(s) (a list of E,N)|None|False|False -ParameterString|stop_coordinates|Coordinates of stopping point(s) (a list of E,N)|None|False|True -ParameterNumber|max_cost|Maximum cumulative cost|None|None|0.0|True -ParameterNumber|null_cost|Cost assigned to null cells. By default, null cells are excluded|None|None|None|True -*ParameterNumber|memory|Maximum memory to be used in MB|0|None|300|True -*ParameterBoolean|-k|Use the 'Knight's move'; slower, but more accurate|False -*ParameterBoolean|-n|Keep null values in output raster layer|False -OutputRaster|output|Cumulative cost -OutputRaster|nearest|Nearest start points -OutputRaster|outdir|Movement Directions diff --git a/python/plugins/processing/algs/grass7/description/r.cost.points.txt b/python/plugins/processing/algs/grass7/description/r.cost.points.txt deleted file mode 100644 index 9663f4a3c1d..00000000000 --- a/python/plugins/processing/algs/grass7/description/r.cost.points.txt +++ /dev/null @@ -1,14 +0,0 @@ -r.cost -r.cost.points - Creates a raster layer of cumulative cost of moving across a raster layer whose cell values represent cost from a vector point layer. -Raster (r.*) -ParameterRaster|input|Unit cost layer|False -ParameterVector|start_points|Start points|0|False -ParameterVector|stop_points|Stop points|0|True -ParameterNumber|max_cost|Maximum cumulative cost|None|None|0.0|True -ParameterNumber|null_cost|Cost assigned to null cells. By default, null cells are excluded|None|None|None|True -*ParameterNumber|memory|Maximum memory to be used in MB|0|None|300|True -*ParameterBoolean|-k|Use the 'Knight's move'; slower, but more accurate|False -*ParameterBoolean|-n|Keep null values in output raster layer|False -OutputRaster|output|Cumulative cost -OutputRaster|nearest|Nearest start points -OutputRaster|outdir|Movement Directions diff --git a/python/plugins/processing/algs/grass7/description/r.cost.rast.txt b/python/plugins/processing/algs/grass7/description/r.cost.rast.txt deleted file mode 100644 index 4192727b9c9..00000000000 --- a/python/plugins/processing/algs/grass7/description/r.cost.rast.txt +++ /dev/null @@ -1,13 +0,0 @@ -r.cost -r.cost.rast - Creates a raster layer of cumulative cost of moving across a raster layer whose cell values represent cost from a raster of starting points. -Raster (r.*) -ParameterRaster|input|Unit cost layer|False -ParameterRaster|start_raster|Name of starting raster points map (all non-NULL cells are starting points)|False -ParameterNumber|max_cost|Maximum cumulative cost|None|None|0.0|True -ParameterNumber|null_cost|Cost assigned to null cells. By default, null cells are excluded|None|None|None|True -*ParameterNumber|memory|Maximum memory to be used in MB|0|None|300|True -*ParameterBoolean|-k|Use the 'Knight's move'; slower, but more accurate|False -*ParameterBoolean|-n|Keep null values in output raster layer|False -OutputRaster|output|Cumulative cost -OutputRaster|nearest|Nearest start points -OutputRaster|outdir|Movement Directions