[QGIS Commit] r14591 - in trunk/qgis/src/plugins/grass: modules-6.3 modules-6.4 modules-common

svn_qgis at osgeo.org svn_qgis at osgeo.org
Sat Nov 13 08:40:04 EST 2010


Author: pcav
Date: 2010-11-13 05:40:04 -0800 (Sat, 13 Nov 2010)
New Revision: 14591

Added:
   trunk/qgis/src/plugins/grass/modules-common/r.cost.coord.qgm
   trunk/qgis/src/plugins/grass/modules-common/r.cost.rast.qgm
   trunk/qgis/src/plugins/grass/modules-common/r.cost.vect.qgm
   trunk/qgis/src/plugins/grass/modules-common/r.distance.qgm
   trunk/qgis/src/plugins/grass/modules-common/r.walk.coord.qgm
   trunk/qgis/src/plugins/grass/modules-common/r.walk.vect.qgm
Modified:
   trunk/qgis/src/plugins/grass/modules-6.3/default.qgc
   trunk/qgis/src/plugins/grass/modules-6.4/default.qgc
Log:
Added several GRASS modules - thanks Maciej Sieczka. Icons still missing, TBD

Modified: trunk/qgis/src/plugins/grass/modules-6.3/default.qgc
===================================================================
--- trunk/qgis/src/plugins/grass/modules-6.3/default.qgc	2010-11-13 13:05:59 UTC (rev 14590)
+++ trunk/qgis/src/plugins/grass/modules-6.3/default.qgc	2010-11-13 13:40:04 UTC (rev 14591)
@@ -184,7 +184,9 @@
                                 <grass name="r.sunmask.date.time"/> 
 			</section>
 			<section label="Terrain analysis">
-				<grass name="r.cost"/>
+				<grass name="r.cost.coord"/>
+				<grass name="r.cost.rast"/>
+				<grass name="r.cost.vect"/>
 				<grass name="r.drain"/>
 				<grass name="r.shaded.relief"/>
 				<grass name="r.slope.aspect.slope"/>
@@ -193,6 +195,9 @@
 				<grass name="r.texture"/>
 				<grass name="r.texture.bis"/>
 				<grass name="r.los"/>
+				<grass name="r.grow.distance"/>
+				<grass name="r.walk.coord"/>
+				<grass name="r.walk.vect"/>
 			</section>
 			<section label="Transform features">
 				<grass name="r.clump"/>
@@ -264,6 +269,7 @@
 				<grass name="r.covar"/>
 				<grass name="r.regression.line"/>
 				<grass name="r.coin"/>
+				<grass name="r.distance"/>
 			</section>
 		</section>
 	</section>

Modified: trunk/qgis/src/plugins/grass/modules-6.4/default.qgc
===================================================================
--- trunk/qgis/src/plugins/grass/modules-6.4/default.qgc	2010-11-13 13:05:59 UTC (rev 14590)
+++ trunk/qgis/src/plugins/grass/modules-6.4/default.qgc	2010-11-13 13:40:04 UTC (rev 14591)
@@ -207,7 +207,9 @@
                                 <grass name="r.sunmask.date.time"/> 
 			</section>
 			<section label="Terrain analysis">
-				<grass name="r.cost"/>
+				<grass name="r.cost.coord"/>
+				<grass name="r.cost.rast"/>
+				<grass name="r.cost.vect"/>
 				<grass name="r.drain"/>
 				<grass name="r.shaded.relief"/>
 				<grass name="r.slope.aspect.slope"/>
@@ -216,7 +218,9 @@
 				<grass name="r.texture"/>
 				<grass name="r.texture.bis"/>
 				<grass name="r.los"/>
-			      <grass name="r.grow.distance"/>
+				<grass name="r.grow.distance"/>
+				<grass name="r.walk.coord"/>
+				<grass name="r.walk.vect"/>
 			</section>
 			<section label="Transform features">
 				<grass name="r.clump"/>
@@ -289,6 +293,7 @@
 				<grass name="r.covar"/>
 				<grass name="r.regression.line"/>
 				<grass name="r.coin"/>
+				<grass name="r.distance"/>
 			</section>
 		</section>
 	</section>

Added: trunk/qgis/src/plugins/grass/modules-common/r.cost.coord.qgm
===================================================================
--- trunk/qgis/src/plugins/grass/modules-common/r.cost.coord.qgm	                        (rev 0)
+++ trunk/qgis/src/plugins/grass/modules-common/r.cost.coord.qgm	2010-11-13 13:40:04 UTC (rev 14591)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
+
+<qgisgrassmodule label="Generate raster of cumulative cost of moving between locations based on cost input raster and starting point(s) coordinates" module="r.cost">
+	<option key="input"/>
+	<option key="coordinate"/>
+	<option key="output"/>
+	<option key="max_cost" hidden="no"/>
+	<option key="stop_coordinate" hidden="no" advanced="yes"/>
+<!-- commented out until #3203 is fixed	<option key="stop_points" hidden="no" advanced="yes"/> -->
+	<option key="null_cost" hidden="no" advanced="yes"/>
+	<flag key="k" hidden="no" />
+	<flag key="n" hidden="no" advanced="yes"/>
+	<flag key="r" hidden="no" advanced="yes"/>
+</qgisgrassmodule>

Added: trunk/qgis/src/plugins/grass/modules-common/r.cost.rast.qgm
===================================================================
--- trunk/qgis/src/plugins/grass/modules-common/r.cost.rast.qgm	                        (rev 0)
+++ trunk/qgis/src/plugins/grass/modules-common/r.cost.rast.qgm	2010-11-13 13:40:04 UTC (rev 14591)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
+
+<qgisgrassmodule label="Generate raster of cumulative cost of moving between locations based on cost input raster and starting point(s) raster" module="r.cost">
+	<option key="input"/>
+	<option key="start_rast"/>
+	<option key="output"/>
+	<option key="max_cost" hidden="no"/>
+	<option key="stop_coordinate" hidden="no" advanced="yes"/>
+<!-- commented out until #3203 is fixed <option key="stop_points" hidden="no" advanced="yes"/> -->
+	<option key="null_cost" hidden="no" advanced="yes"/>
+	<flag key="k" hidden="no" />
+	<flag key="n" hidden="no" advanced="yes"/>
+	<flag key="r" hidden="no" advanced="yes"/>
+</qgisgrassmodule>

Added: trunk/qgis/src/plugins/grass/modules-common/r.cost.vect.qgm
===================================================================
--- trunk/qgis/src/plugins/grass/modules-common/r.cost.vect.qgm	                        (rev 0)
+++ trunk/qgis/src/plugins/grass/modules-common/r.cost.vect.qgm	2010-11-13 13:40:04 UTC (rev 14591)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
+
+<qgisgrassmodule label="Generate raster of cumulative cost of moving between locations based on cost input raster and starting point(s) vector" module="r.cost">
+	<option key="input"/>
+	<option key="start_points"/>
+	<option key="output"/>
+	<option key="max_cost" hidden="no"/>
+	<option key="stop_coordinate" hidden="no" advanced="yes"/>
+<!-- commented out until #3203 is fixed <option key="stop_points" hidden="no" advanced="yes"/> -->
+	<option key="null_cost" hidden="no" advanced="yes"/>
+	<flag key="k" hidden="no" />
+	<flag key="n" hidden="no" advanced="yes"/>
+	<flag key="r" hidden="no" advanced="yes"/>
+</qgisgrassmodule>

Added: trunk/qgis/src/plugins/grass/modules-common/r.distance.qgm
===================================================================
--- trunk/qgis/src/plugins/grass/modules-common/r.distance.qgm	                        (rev 0)
+++ trunk/qgis/src/plugins/grass/modules-common/r.distance.qgm	2010-11-13 13:40:04 UTC (rev 14591)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
+
+<qgisgrassmodule label="Locate the closest points between objects in two raster maps" module="r.distance">
+        <option key="maps" option="map1"/>
+        <option key="maps" option="map2"/>
+</qgisgrassmodule>
+

Added: trunk/qgis/src/plugins/grass/modules-common/r.walk.coord.qgm
===================================================================
--- trunk/qgis/src/plugins/grass/modules-common/r.walk.coord.qgm	                        (rev 0)
+++ trunk/qgis/src/plugins/grass/modules-common/r.walk.coord.qgm	2010-11-13 13:40:04 UTC (rev 14591)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
+
+<qgisgrassmodule label="Generate raster of cumulative cost of moving between x,y points, based on elevation and friction input rasters" module="r.walk">
+	<option key="elevation"/>
+	<option key="friction"/>
+        <option key="coordinate"/>
+	<option key="output"/>
+	<flag key="k" hidden="no"/>
+        <option key="stop_coordinate" advanced="yes"/>
+<!-- commented out until #3203 is fixed <option key="stop_points" hidden="no" advanced="yes"/> -->
+	<option key="max_cost" advanced="yes"/>
+	<option key="lambda" advanced="yes"/>
+	<option key="slope_factor" advanced="yes"/>
+	<option key="null_cost" advanced="yes"/>
+	<flag key="n" hidden="no" advanced="yes"/>
+	<flag key="r" hidden="no" advanced="yes"/>
+</qgisgrassmodule>

Added: trunk/qgis/src/plugins/grass/modules-common/r.walk.vect.qgm
===================================================================
--- trunk/qgis/src/plugins/grass/modules-common/r.walk.vect.qgm	                        (rev 0)
+++ trunk/qgis/src/plugins/grass/modules-common/r.walk.vect.qgm	2010-11-13 13:40:04 UTC (rev 14591)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE qgisgrassmodule SYSTEM "http://mrcc.com/qgisgrassmodule.dtd">
+
+<qgisgrassmodule label="Generate raster of cumulative cost of moving between vector points, based on elevation and friction input rasters" module="r.walk">
+	<option key="elevation"/>
+	<option key="friction"/>
+	<option key="start_points"/>
+	<option key="output"/>
+        <option key="stop_coordinate" advanced="yes"/>
+<!-- commented out until #3203 is fixed <option key="stop_points" hidden="no" advanced="yes"/> -->
+	<option key="max_cost" advanced="yes"/>
+	<option key="lambda" advanced="yes"/>
+	<option key="slope_factor" advanced="yes"/>
+	<option key="null_cost" advanced="yes"/>
+	<flag key="k" hidden="no"/>
+	<flag key="n" hidden="no" advanced="yes"/>
+	<flag key="r" hidden="no" advanced="yes"/>
+</qgisgrassmodule>



More information about the QGIS-commit mailing list