[GRASS-SVN] r46991 - in grass/trunk/raster/r.li: r.li.cwed r.li.dominance r.li.edgedensity r.li.mpa r.li.mps r.li.padcv r.li.padrange r.li.padsd r.li.patchdensity r.li.patchnum r.li.pielou r.li.renyi r.li.richness r.li.setup r.li.shannon r.li.shape r.li.simpson

svn_grass at osgeo.org svn_grass at osgeo.org
Tue Jul 5 06:33:16 EDT 2011


Author: neteler
Date: 2011-07-05 03:33:16 -0700 (Tue, 05 Jul 2011)
New Revision: 46991

Modified:
   grass/trunk/raster/r.li/r.li.cwed/cwed.c
   grass/trunk/raster/r.li/r.li.dominance/dominance.c
   grass/trunk/raster/r.li/r.li.edgedensity/edgedensity.c
   grass/trunk/raster/r.li/r.li.mpa/mpa.c
   grass/trunk/raster/r.li/r.li.mps/mps.c
   grass/trunk/raster/r.li/r.li.padcv/padcv.c
   grass/trunk/raster/r.li/r.li.padrange/padrange.c
   grass/trunk/raster/r.li/r.li.padsd/padsd.c
   grass/trunk/raster/r.li/r.li.patchdensity/main.c
   grass/trunk/raster/r.li/r.li.patchnum/main.c
   grass/trunk/raster/r.li/r.li.pielou/pielou.c
   grass/trunk/raster/r.li/r.li.renyi/renyi.c
   grass/trunk/raster/r.li/r.li.richness/richness.c
   grass/trunk/raster/r.li/r.li.setup/masked_area_selection
   grass/trunk/raster/r.li/r.li.setup/sample_area_vector.sh
   grass/trunk/raster/r.li/r.li.setup/square_mouse_selection.sh
   grass/trunk/raster/r.li/r.li.shannon/shannon.c
   grass/trunk/raster/r.li/r.li.shape/main.c
   grass/trunk/raster/r.li/r.li.simpson/simpson.c
Log:
renamed conf parameter to config

Modified: grass/trunk/raster/r.li/r.li.cwed/cwed.c
===================================================================
--- grass/trunk/raster/r.li/r.li.cwed/cwed.c	2011-07-05 10:28:23 UTC (rev 46990)
+++ grass/trunk/raster/r.li/r.li.cwed/cwed.c	2011-07-05 10:33:16 UTC (rev 46991)
@@ -54,7 +54,7 @@
     raster = G_define_standard_option(G_OPT_R_INPUT);
 
     conf = G_define_option();
-    conf->key = "conf";
+    conf->key = "config";
     conf->description = _("Configuration file");
     conf->type = TYPE_STRING;
     conf->required = YES;

Modified: grass/trunk/raster/r.li/r.li.dominance/dominance.c
===================================================================
--- grass/trunk/raster/r.li/r.li.dominance/dominance.c	2011-07-05 10:28:23 UTC (rev 46990)
+++ grass/trunk/raster/r.li/r.li.dominance/dominance.c	2011-07-05 10:33:16 UTC (rev 46991)
@@ -49,7 +49,7 @@
     raster = G_define_standard_option(G_OPT_R_INPUT);
 
     conf = G_define_option();
-    conf->key = "conf";
+    conf->key = "config";
     conf->description = _("Configuration file");
     conf->gisprompt = "old_file,file,input";
     conf->type = TYPE_STRING;

Modified: grass/trunk/raster/r.li/r.li.edgedensity/edgedensity.c
===================================================================
--- grass/trunk/raster/r.li/r.li.edgedensity/edgedensity.c	2011-07-05 10:28:23 UTC (rev 46990)
+++ grass/trunk/raster/r.li/r.li.edgedensity/edgedensity.c	2011-07-05 10:33:16 UTC (rev 46991)
@@ -46,7 +46,7 @@
     raster = G_define_standard_option(G_OPT_R_INPUT);
 
     conf = G_define_option();
-    conf->key = "conf";
+    conf->key = "config";
     conf->description = _("Configuration file");
     conf->type = TYPE_STRING;
     conf->required = YES;

Modified: grass/trunk/raster/r.li/r.li.mpa/mpa.c
===================================================================
--- grass/trunk/raster/r.li/r.li.mpa/mpa.c	2011-07-05 10:28:23 UTC (rev 46990)
+++ grass/trunk/raster/r.li/r.li.mpa/mpa.c	2011-07-05 10:33:16 UTC (rev 46991)
@@ -46,7 +46,7 @@
     raster = G_define_standard_option(G_OPT_R_INPUT);
 
     conf = G_define_option();
-    conf->key = "conf";
+    conf->key = "config";
     conf->description = _("Configuration file");
     conf->type = TYPE_STRING;
     conf->required = YES;

Modified: grass/trunk/raster/r.li/r.li.mps/mps.c
===================================================================
--- grass/trunk/raster/r.li/r.li.mps/mps.c	2011-07-05 10:28:23 UTC (rev 46990)
+++ grass/trunk/raster/r.li/r.li.mps/mps.c	2011-07-05 10:33:16 UTC (rev 46991)
@@ -47,7 +47,7 @@
     raster = G_define_standard_option(G_OPT_R_INPUT);
 
     conf = G_define_option();
-    conf->key = "conf";
+    conf->key = "config";
     conf->description = _("Configuration file");
     conf->type = TYPE_STRING;
     conf->required = YES;

Modified: grass/trunk/raster/r.li/r.li.padcv/padcv.c
===================================================================
--- grass/trunk/raster/r.li/r.li.padcv/padcv.c	2011-07-05 10:28:23 UTC (rev 46990)
+++ grass/trunk/raster/r.li/r.li.padcv/padcv.c	2011-07-05 10:33:16 UTC (rev 46991)
@@ -44,7 +44,7 @@
     raster = G_define_standard_option(G_OPT_R_INPUT);
 
     conf = G_define_option();
-    conf->key = "conf";
+    conf->key = "config";
     conf->description = _("Configuration file");
     conf->gisprompt = "old_file,file,input";
     conf->type = TYPE_STRING;

Modified: grass/trunk/raster/r.li/r.li.padrange/padrange.c
===================================================================
--- grass/trunk/raster/r.li/r.li.padrange/padrange.c	2011-07-05 10:28:23 UTC (rev 46990)
+++ grass/trunk/raster/r.li/r.li.padrange/padrange.c	2011-07-05 10:33:16 UTC (rev 46991)
@@ -46,7 +46,7 @@
     raster = G_define_standard_option(G_OPT_R_INPUT);
 
     conf = G_define_option();
-    conf->key = "conf";
+    conf->key = "config";
     conf->description = _("Configuration file");
     conf->gisprompt = "old_file,file,input";
     conf->type = TYPE_STRING;

Modified: grass/trunk/raster/r.li/r.li.padsd/padsd.c
===================================================================
--- grass/trunk/raster/r.li/r.li.padsd/padsd.c	2011-07-05 10:28:23 UTC (rev 46990)
+++ grass/trunk/raster/r.li/r.li.padsd/padsd.c	2011-07-05 10:33:16 UTC (rev 46991)
@@ -44,7 +44,7 @@
     raster = G_define_standard_option(G_OPT_R_INPUT);
 
     conf = G_define_option();
-    conf->key = "conf";
+    conf->key = "config";
     conf->description = _("Configuration file");
     conf->gisprompt = "old_file,file,input";
     conf->type = TYPE_STRING;

Modified: grass/trunk/raster/r.li/r.li.patchdensity/main.c
===================================================================
--- grass/trunk/raster/r.li/r.li.patchdensity/main.c	2011-07-05 10:28:23 UTC (rev 46990)
+++ grass/trunk/raster/r.li/r.li.patchdensity/main.c	2011-07-05 10:33:16 UTC (rev 46991)
@@ -41,7 +41,7 @@
     raster = G_define_standard_option(G_OPT_R_INPUT);
 
     conf = G_define_option();
-    conf->key = "conf";
+    conf->key = "config";
     conf->description = _("Configuration file");
     conf->gisprompt = "old_file,file,input";
     conf->type = TYPE_STRING;

Modified: grass/trunk/raster/r.li/r.li.patchnum/main.c
===================================================================
--- grass/trunk/raster/r.li/r.li.patchnum/main.c	2011-07-05 10:28:23 UTC (rev 46990)
+++ grass/trunk/raster/r.li/r.li.patchnum/main.c	2011-07-05 10:33:16 UTC (rev 46991)
@@ -42,7 +42,7 @@
     raster = G_define_standard_option(G_OPT_R_INPUT);
 
     conf = G_define_option();
-    conf->key = "conf";
+    conf->key = "config";
     conf->description = _("Configuration file");
     conf->gisprompt = "old_file,file,input";
     conf->type = TYPE_STRING;

Modified: grass/trunk/raster/r.li/r.li.pielou/pielou.c
===================================================================
--- grass/trunk/raster/r.li/r.li.pielou/pielou.c	2011-07-05 10:28:23 UTC (rev 46990)
+++ grass/trunk/raster/r.li/r.li.pielou/pielou.c	2011-07-05 10:33:16 UTC (rev 46991)
@@ -64,7 +64,7 @@
     raster = G_define_standard_option(G_OPT_R_INPUT);
 
     conf = G_define_option();
-    conf->key = "conf";
+    conf->key = "config";
     conf->description = _("Configuration file");
     conf->gisprompt = "old_file,file,input";
     conf->type = TYPE_STRING;

Modified: grass/trunk/raster/r.li/r.li.renyi/renyi.c
===================================================================
--- grass/trunk/raster/r.li/r.li.renyi/renyi.c	2011-07-05 10:28:23 UTC (rev 46990)
+++ grass/trunk/raster/r.li/r.li.renyi/renyi.c	2011-07-05 10:33:16 UTC (rev 46991)
@@ -51,7 +51,7 @@
     raster = G_define_standard_option(G_OPT_R_INPUT);
 
     conf = G_define_option();
-    conf->key = "conf";
+    conf->key = "config";
     conf->description = _("Configuration file");
     conf->gisprompt = "old_file,file,input";
     conf->type = TYPE_STRING;

Modified: grass/trunk/raster/r.li/r.li.richness/richness.c
===================================================================
--- grass/trunk/raster/r.li/r.li.richness/richness.c	2011-07-05 10:28:23 UTC (rev 46990)
+++ grass/trunk/raster/r.li/r.li.richness/richness.c	2011-07-05 10:33:16 UTC (rev 46991)
@@ -47,7 +47,7 @@
     raster = G_define_standard_option(G_OPT_R_INPUT);
 
     conf = G_define_option();
-    conf->key = "conf";
+    conf->key = "config";
     conf->description = _("Configuration file");
     conf->type = TYPE_STRING;
     conf->gisprompt = "old_file,file,input";

Modified: grass/trunk/raster/r.li/r.li.setup/masked_area_selection
===================================================================
--- grass/trunk/raster/r.li/r.li.setup/masked_area_selection	2011-07-05 10:28:23 UTC (rev 46990)
+++ grass/trunk/raster/r.li/r.li.setup/masked_area_selection	2011-07-05 10:33:16 UTC (rev 46991)
@@ -1,4 +1,4 @@
-#! /bin/sh -x
+#!/bin/sh
 #%Module 
 #%description: Select a circular or polygonal area
 #%End
@@ -21,7 +21,7 @@
 #% required: no
 #%end
 #%option
-#% key: conf
+#% key: config
 #% type: string
 #% description: name of configuration file where insert areas
 #% required: yes

Modified: grass/trunk/raster/r.li/r.li.setup/sample_area_vector.sh
===================================================================
--- grass/trunk/raster/r.li/r.li.setup/sample_area_vector.sh	2011-07-05 10:28:23 UTC (rev 46990)
+++ grass/trunk/raster/r.li/r.li.setup/sample_area_vector.sh	2011-07-05 10:33:16 UTC (rev 46991)
@@ -19,7 +19,7 @@
 #% required: yes
 #%end
 #%option
-#% key: conf
+#% key: config
 #% type: string
 #% description: name of configuration file where insert areas
 #% required: yes

Modified: grass/trunk/raster/r.li/r.li.setup/square_mouse_selection.sh
===================================================================
--- grass/trunk/raster/r.li/r.li.setup/square_mouse_selection.sh	2011-07-05 10:28:23 UTC (rev 46990)
+++ grass/trunk/raster/r.li/r.li.setup/square_mouse_selection.sh	2011-07-05 10:33:16 UTC (rev 46991)
@@ -27,7 +27,7 @@
 #% required: no
 #%end
 #%option
-#% key: conf
+#% key: config
 #% type: string
 #% description: name of configuration file where insert areas
 #% required: yes

Modified: grass/trunk/raster/r.li/r.li.shannon/shannon.c
===================================================================
--- grass/trunk/raster/r.li/r.li.shannon/shannon.c	2011-07-05 10:28:23 UTC (rev 46990)
+++ grass/trunk/raster/r.li/r.li.shannon/shannon.c	2011-07-05 10:33:16 UTC (rev 46991)
@@ -46,7 +46,7 @@
     raster = G_define_standard_option(G_OPT_R_INPUT);
 
     conf = G_define_option();
-    conf->key = "conf";
+    conf->key = "config";
     conf->description = _("Configuration file");
     conf->gisprompt = "old_file,file,input";
     conf->type = TYPE_STRING;

Modified: grass/trunk/raster/r.li/r.li.shape/main.c
===================================================================
--- grass/trunk/raster/r.li/r.li.shape/main.c	2011-07-05 10:28:23 UTC (rev 46990)
+++ grass/trunk/raster/r.li/r.li.shape/main.c	2011-07-05 10:33:16 UTC (rev 46991)
@@ -41,7 +41,7 @@
     raster = G_define_standard_option(G_OPT_R_INPUT);
 
     conf = G_define_option();
-    conf->key = "conf";
+    conf->key = "config";
     conf->description = _("Configuration file");
     conf->gisprompt = "old_file,file,input";
     conf->type = TYPE_STRING;

Modified: grass/trunk/raster/r.li/r.li.simpson/simpson.c
===================================================================
--- grass/trunk/raster/r.li/r.li.simpson/simpson.c	2011-07-05 10:28:23 UTC (rev 46990)
+++ grass/trunk/raster/r.li/r.li.simpson/simpson.c	2011-07-05 10:33:16 UTC (rev 46991)
@@ -47,7 +47,7 @@
     raster = G_define_standard_option(G_OPT_R_INPUT);
 
     conf = G_define_option();
-    conf->key = "conf";
+    conf->key = "config";
     conf->description = _("Configuration file");
     conf->type = TYPE_STRING;
     conf->gisprompt = "old_file,file,input";



More information about the grass-commit mailing list