From d66eff33e5b6479dfefda87cf57833119d617c02 Mon Sep 17 00:00:00 2001
From: pcav <pcav@c8812cc2-4d05-0410-92ff-de0c093fc19c>
Date: Wed, 9 Mar 2011 15:26:37 +0000
Subject: [PATCH] Improved v.distance and v.generalize GRASS modules

git-svn-id: http://svn.osgeo.org/qgis/trunk@15402 c8812cc2-4d05-0410-92ff-de0c093fc19c
---
 .../grass/modules-common/v.distance.qgm       | 11 ++++----
 .../grass/modules-common/v.generalize.qgm     | 26 +++++++++----------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/plugins/grass/modules-common/v.distance.qgm b/src/plugins/grass/modules-common/v.distance.qgm
index e5105d41d44..1a060b4f8a8 100644
--- a/src/plugins/grass/modules-common/v.distance.qgm
+++ b/src/plugins/grass/modules-common/v.distance.qgm
@@ -4,9 +4,10 @@
 <qgisgrassmodule label="Find nearest element in vector 'to' for elements in vector 'from'. Various information about this relation may be uploaded to attribute table of input vector 'from'" module="v.distance">
 	<option key="from" typemask="point" layeroption="from_layer"/>
 	<option key="to" typeoption="to_type" layeroption="to_layer"/>
-	<option key="upload"/>
-	<option key="dmax"/> 
-	<option key="dmin"/>
-	<field key="column" layer="from" type="integer,double" label="Attribute field" />
-	<option key="output"/>
+	<option key="upload" />
+        <field key="to_column" layer="to" type="string" label="(Optional) column to read labels" />
+	<field key="column" layer="from" type="integer,double,string" label="Attribute field to (over)write" />
+	<option key="output" advanced="yes"/>
+        <option key="dmax" advanced="yes"/> 
+        <option key="dmin" advanced="yes"/>
 </qgisgrassmodule>
diff --git a/src/plugins/grass/modules-common/v.generalize.qgm b/src/plugins/grass/modules-common/v.generalize.qgm
index 96bfb867d64..e0a18c296db 100644
--- a/src/plugins/grass/modules-common/v.generalize.qgm
+++ b/src/plugins/grass/modules-common/v.generalize.qgm
@@ -4,20 +4,20 @@
 <qgisgrassmodule label="Simplify vector" module="v.generalize">
 	<option key="input" typeoption="type" layeroption="layer" />
         <flag key="c" answer="on" hidden="yes" />
-	<option key="type" />
+	<option key="type" label="Feature type (for polygons, choose Boundary)"/>
 	<option key="method" />
-	<option key="threshold" answer="1.0" />
-	<option key="look_ahead" answer="7" />
-	<option key="reduction" answer="50" />
-	<option key="slide" answer="0.5" />
-	<option key="angle_thresh" answer="3" />
-	<option key="degree_thresh" answer="0" />
-	<option key="closeness_thresh" answer="0" />
-	<option key="betweeness_thresh" answer="0" />
-	<option key="alpha" answer="1.0" />
-	<option key="beta" answer="1.0" />
-	<option key="iterations" answer="1" />
-	<option key="layer" answer="1" />
+	<option key="threshold" answer="1.0" label="Maximal tolerance value (higher value=more simplification)" />
+	<option key="look_ahead" answer="7" advanced="yes" />
+	<option key="reduction" answer="50" advanced="yes" />
+	<option key="slide" answer="0.5" advanced="yes" />
+	<option key="angle_thresh" answer="3" advanced="yes" />
+	<option key="degree_thresh" answer="0" advanced="yes" />
+	<option key="closeness_thresh" answer="0" advanced="yes" />
+	<option key="betweeness_thresh" answer="0" advanced="yes" />
+	<option key="alpha" answer="1.0" advanced="yes" />
+	<option key="beta" answer="1.0" advanced="yes" />
+	<option key="iterations" answer="1" advanced="yes"/>
+	<option key="layer" answer="1" advanced="yes"/>
 	<flag key="r" />
 	<option key="output" />
 </qgisgrassmodule>