[GRASS-SVN] r58928 - grass/branches/develbranch_6/raster/r.li/r.li.setup

[svn_grass at osgeo.org]

Author: hamish
Date: 2014-02-07 00:17:53 -0800 (Fri, 07 Feb 2014)
New Revision: 58928

Modified:
   grass/branches/develbranch_6/raster/r.li/r.li.setup/r.li.setup.procedures.tcl
   grass/branches/develbranch_6/raster/r.li/r.li.setup/sample_area_vector.sh
Log:
enable vector points overlay for vector area samples by cat number

Modified: grass/branches/develbranch_6/raster/r.li/r.li.setup/r.li.setup.procedures.tcl
===================================================================
--- grass/branches/develbranch_6/raster/r.li/r.li.setup/r.li.setup.procedures.tcl	2014-02-07 08:06:56 UTC (rev 58927)
+++ grass/branches/develbranch_6/raster/r.li/r.li.setup/r.li.setup.procedures.tcl	2014-02-07 08:17:53 UTC (rev 58928)
@@ -247,7 +247,7 @@
 		tk_messageBox -message "WARNING: this configuration file will work only on $env(RASTER) raster map" -type ok -icon warning
 		#TODO change here
 		if { $env(RASTER) != "" && $env(VECTOR) != "" && $env(CONF) != "" } then {
-			catch { exec  $env(F_PATH)/sample_area_vector.sh  raster=$env(RASTER) vector=$env(VECTOR) conf=$env(TMP).set >@stdout 2>@stderr }
+			catch { exec  $env(F_PATH)/sample_area_vector.sh  raster=$env(RASTER) vector=$env(VECTOR) sites=$env(SITE) conf=$env(TMP).set >@stdout 2>@stderr }
 		} else {
 			tk_messageBox -message "Please set configuration file name, raster map and vector file to overlay" -type ok -icon error
 		}

Modified: grass/branches/develbranch_6/raster/r.li/r.li.setup/sample_area_vector.sh
===================================================================
--- grass/branches/develbranch_6/raster/r.li/r.li.setup/sample_area_vector.sh	2014-02-07 08:06:56 UTC (rev 58927)
+++ grass/branches/develbranch_6/raster/r.li/r.li.setup/sample_area_vector.sh	2014-02-07 08:17:53 UTC (rev 58928)
@@ -20,10 +20,16 @@
 #% type: string
 #% gisprompt: old,vector,vector
 #% key_desc: name
-#% description: Vector map where areas are defined
+#% description: Vector map containing areas
 #% required: yes
 #%end
 #%option
+#% key: sites
+#% type: string
+#% description: Vector points map to overlay
+#% required: no
+#%end
+#%option
 #% key: conf
 #% type: string
 #% key_desc: name
@@ -147,6 +153,11 @@
     # render extracted vector map  (prehaps fcolor=none for areas?)
     d.vect "$EXTRACT" type=boundary width=2
 
+    if [ -n "$GIS_OPT_SITES" ] ; then
+	d.vect map="$GIS_OPT_SITES" color=black fcolor=black size=9 icon=basic/circle
+	d.vect map="$GIS_OPT_SITES" color=red fcolor=red size=5 icon=basic/circle
+    fi
+
     echo " Area $i of $NUM_CATS (category $CAT)" | \
        d.text color=black size=2.5