[GRASS-SVN] r60608 - in grass/trunk/temporal: . t.list t.rast.accdetect t.rast.accumulate t.rast.aggregate t.rast.aggregate.ds t.rast.colors t.rast.export t.rast.extract t.rast.gapfill t.rast.import t.rast.list t.rast.mapcalc t.rast.mapcalc2 t.rast.neighbors t.rast.univar t.rast3d.list t.rast3d.mapcalc t.rast3d.mapcalc2 t.rast3d.univar t.register t.sample t.select t.shift t.support t.vect.db.select t.vect.export t.vect.extract t.vect.import t.vect.list t.vect.mapcalc t.vect.univar
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri May 30 06:38:42 PDT 2014
Author: neteler
Date: 2014-05-30 06:38:42 -0700 (Fri, 30 May 2014)
New Revision: 60608
Modified:
grass/trunk/temporal/run_all_tests.sh
grass/trunk/temporal/t.list/t.list.py
grass/trunk/temporal/t.rast.accdetect/t.rast.accdetect.py
grass/trunk/temporal/t.rast.accumulate/t.rast.accumulate.py
grass/trunk/temporal/t.rast.aggregate.ds/t.rast.aggregate.ds.py
grass/trunk/temporal/t.rast.aggregate/t.rast.aggregate.py
grass/trunk/temporal/t.rast.colors/t.rast.colors.py
grass/trunk/temporal/t.rast.export/t.rast.export.py
grass/trunk/temporal/t.rast.extract/t.rast.extract.py
grass/trunk/temporal/t.rast.gapfill/t.rast.gapfill.py
grass/trunk/temporal/t.rast.import/t.rast.import.py
grass/trunk/temporal/t.rast.list/t.rast.list.py
grass/trunk/temporal/t.rast.mapcalc/t.rast.mapcalc.py
grass/trunk/temporal/t.rast.mapcalc2/t.rast.mapcalc2.py
grass/trunk/temporal/t.rast.neighbors/t.rast.neighbors.py
grass/trunk/temporal/t.rast.univar/t.rast.univar.py
grass/trunk/temporal/t.rast3d.list/t.rast3d.list.py
grass/trunk/temporal/t.rast3d.mapcalc/t.rast3d.mapcalc.py
grass/trunk/temporal/t.rast3d.mapcalc2/t.rast3d.mapcalc2.py
grass/trunk/temporal/t.rast3d.univar/t.rast3d.univar.py
grass/trunk/temporal/t.register/t.register.py
grass/trunk/temporal/t.sample/t.sample.py
grass/trunk/temporal/t.select/t.select.py
grass/trunk/temporal/t.shift/t.shift.py
grass/trunk/temporal/t.support/t.support.py
grass/trunk/temporal/t.vect.db.select/t.vect.db.select.py
grass/trunk/temporal/t.vect.export/t.vect.export.py
grass/trunk/temporal/t.vect.extract/t.vect.extract.py
grass/trunk/temporal/t.vect.import/t.vect.import.py
grass/trunk/temporal/t.vect.list/t.vect.list.py
grass/trunk/temporal/t.vect.mapcalc/t.vect.mapcalc.py
grass/trunk/temporal/t.vect.univar/t.vect.univar.py
Log:
t.*: consistency changes for parameters and flags
Modified: grass/trunk/temporal/run_all_tests.sh
===================================================================
--- grass/trunk/temporal/run_all_tests.sh 2014-05-30 11:55:10 UTC (rev 60607)
+++ grass/trunk/temporal/run_all_tests.sh 2014-05-30 13:38:42 UTC (rev 60608)
@@ -10,6 +10,8 @@
LOG_FILE="/tmp/run.log"
echo "Logfile\n\n" > $LOG_FILE
+export GRASS_MESSAGE_FORMAT=plain
+
# For each directory
for mydir in `ls -d t*` ; do
if [ -d "${mydir}" ] ; then
Modified: grass/trunk/temporal/t.list/t.list.py
===================================================================
--- grass/trunk/temporal/t.list/t.list.py 2014-05-30 11:55:10 UTC (rev 60607)
+++ grass/trunk/temporal/t.list/t.list.py 2014-05-30 13:38:42 UTC (rev 60608)
@@ -6,7 +6,7 @@
# AUTHOR(S): Soeren Gebbert
#
# PURPOSE: List space time datasets and maps registered in the temporal database
-# COPYRIGHT: (C) 2011 by the GRASS Development Team
+# COPYRIGHT: (C) 2011-2014, Soeren Gebbert and the GRASS Development Team
#
# This program is free software under the GNU General Public
# License (version 2). Read the file COPYING that comes with GRASS
@@ -45,7 +45,7 @@
#% guisection: Formatting
#% required: no
#% multiple: yes
-#% options: id, name, creator, mapset, number_of_maps, creation_time, start_time, end_time, interval, north, south, west, east, granularity
+#% options: id,name,creator,mapset,number_of_maps,creation_time,start_time,end_time,interval,north,south,west,east,granularity
#% answer: id
#%end
@@ -57,7 +57,7 @@
#% guisection: Selection
#% required: no
#% multiple: yes
-#% options: id, name, creator, mapset, number_of_maps, creation_time, start_time, end_time, north, south, west, east, granularity, all
+#% options: id,name,creator,mapset,number_of_maps,creation_time,start_time,end_time,north,south,west,east,granularity,all
#% answer: id
#%end
@@ -65,16 +65,13 @@
#% guisection: Selection
#%end
-#%option
-#% key: separator
-#% type: string
-#% description: Separator character between the columns, default is tabular "\t"
+#%option G_OPT_F_SEP
+#% description: Field separator character between the output columns
#% guisection: Formatting
-#% required: no
#%end
#%flag
-#% key: c
+#% key: h
#% description: Print the column names as first row
#% guisection: Formatting
#%end
@@ -85,6 +82,7 @@
############################################################################
+
def main():
# Get the options
@@ -94,7 +92,7 @@
order = options["order"]
where = options["where"]
separator = options["separator"]
- colhead = flags['c']
+ colhead = flags['h']
# Make sure the temporal database exists
tgis.init()
@@ -129,9 +127,6 @@
sys.stderr.write(_("Space time %s datasets with %s available in mapset <%s>:\n")%\
(sp.get_new_map_instance(None).get_type(), time, key))
- if separator is None or separator == "":
- separator = "\t"
-
# Print the column names if requested
if colhead == True and first == True:
output = ""
Modified: grass/trunk/temporal/t.rast.accdetect/t.rast.accdetect.py
===================================================================
--- grass/trunk/temporal/t.rast.accdetect/t.rast.accdetect.py 2014-05-30 11:55:10 UTC (rev 60607)
+++ grass/trunk/temporal/t.rast.accdetect/t.rast.accdetect.py 2014-05-30 13:38:42 UTC (rev 60608)
@@ -82,7 +82,7 @@
#%option
#% key: basename
#% type: string
-#% label: Base name of the new generated output maps"
+#% label: Basename of the new generated output maps
#% description: A numerical suffix separated by an underscore will be attached to create a unique identifier
#% required: yes
#% multiple: no
Modified: grass/trunk/temporal/t.rast.accumulate/t.rast.accumulate.py
===================================================================
--- grass/trunk/temporal/t.rast.accumulate/t.rast.accumulate.py 2014-05-30 11:55:10 UTC (rev 60607)
+++ grass/trunk/temporal/t.rast.accumulate/t.rast.accumulate.py 2014-05-30 13:38:42 UTC (rev 60608)
@@ -83,7 +83,7 @@
#%option
#% key: basename
#% type: string
-#% label: Base name of the new generated output maps"
+#% label: Basename of the new generated output maps
#% description: A numerical suffix separated by an underscore will be attached to create a unique identifier
#% required: yes
#% multiple: no
Modified: grass/trunk/temporal/t.rast.aggregate/t.rast.aggregate.py
===================================================================
--- grass/trunk/temporal/t.rast.aggregate/t.rast.aggregate.py 2014-05-30 11:55:10 UTC (rev 60607)
+++ grass/trunk/temporal/t.rast.aggregate/t.rast.aggregate.py 2014-05-30 13:38:42 UTC (rev 60608)
@@ -29,7 +29,7 @@
#%option
#% key: basename
#% type: string
-#% label: Base name of the new generated output maps"
+#% label: Basename of the new generated output maps
#% description: A numerical suffix separated by an underscore will be attached to create a unique identifier
#% required: yes
#% multiple: no
Modified: grass/trunk/temporal/t.rast.aggregate.ds/t.rast.aggregate.ds.py
===================================================================
--- grass/trunk/temporal/t.rast.aggregate.ds/t.rast.aggregate.ds.py 2014-05-30 11:55:10 UTC (rev 60607)
+++ grass/trunk/temporal/t.rast.aggregate.ds/t.rast.aggregate.ds.py 2014-05-30 13:38:42 UTC (rev 60608)
@@ -38,7 +38,7 @@
#%option
#% key: basename
#% type: string
-#% label: Base name of the new generated output maps"
+#% label: Basename of the new generated output maps
#% description: A numerical suffix separated by an underscore will be attached to create a unique identifier
#% required: yes
#% multiple: no
Modified: grass/trunk/temporal/t.rast.colors/t.rast.colors.py
===================================================================
--- grass/trunk/temporal/t.rast.colors/t.rast.colors.py 2014-05-30 11:55:10 UTC (rev 60607)
+++ grass/trunk/temporal/t.rast.colors/t.rast.colors.py 2014-05-30 13:38:42 UTC (rev 60608)
@@ -61,7 +61,7 @@
#%flag
#% key: w
-#% description: Only write new color table if one doesn't already exist
+#% description: Only write new color table if it does not already exist
#%end
#%flag
Modified: grass/trunk/temporal/t.rast.export/t.rast.export.py
===================================================================
--- grass/trunk/temporal/t.rast.export/t.rast.export.py 2014-05-30 11:55:10 UTC (rev 60607)
+++ grass/trunk/temporal/t.rast.export/t.rast.export.py 2014-05-30 13:38:42 UTC (rev 60608)
@@ -47,7 +47,8 @@
#%option
#% key: format
#% type: string
-#% description: The export format of a single raster map. Supported are GTiff, AAIGrid via r.out.gdal and the GRASS package format of r.pack.
+#% label: The export format of a single raster map
+#% description: Supported are GTiff, AAIGrid via r.out.gdal and the GRASS package format of r.pack
#% required: no
#% multiple: no
#% options: GTiff,AAIGrid,pack
Modified: grass/trunk/temporal/t.rast.extract/t.rast.extract.py
===================================================================
--- grass/trunk/temporal/t.rast.extract/t.rast.extract.py 2014-05-30 11:55:10 UTC (rev 60607)
+++ grass/trunk/temporal/t.rast.extract/t.rast.extract.py 2014-05-30 13:38:42 UTC (rev 60608)
@@ -40,7 +40,7 @@
#%option
#% key: basename
#% type: string
-#% label: Base name of the new generated output maps"
+#% label: Basename of the new generated output maps
#% description: A numerical suffix separated by an underscore will be attached to create a unique identifier
#% required: no
#% multiple: no
Modified: grass/trunk/temporal/t.rast.gapfill/t.rast.gapfill.py
===================================================================
--- grass/trunk/temporal/t.rast.gapfill/t.rast.gapfill.py 2014-05-30 11:55:10 UTC (rev 60607)
+++ grass/trunk/temporal/t.rast.gapfill/t.rast.gapfill.py 2014-05-30 13:38:42 UTC (rev 60608)
@@ -29,7 +29,7 @@
#%option
#% key: basename
#% type: string
-#% label: Base name of the new generated output maps"
+#% label: Basename of the new generated output maps
#% description: A numerical suffix separated by an underscore will be attached to create a unique identifier
#% required: yes
#% multiple: no
Modified: grass/trunk/temporal/t.rast.import/t.rast.import.py
===================================================================
--- grass/trunk/temporal/t.rast.import/t.rast.import.py 2014-05-30 11:55:10 UTC (rev 60607)
+++ grass/trunk/temporal/t.rast.import/t.rast.import.py 2014-05-30 13:38:42 UTC (rev 60608)
@@ -29,7 +29,7 @@
#%option
#% key: basename
#% type: string
-#% label: Base name of the new generated output maps"
+#% label: Basename of the new generated output maps
#% description: A numerical suffix separated by an underscore will be attached to create a unique identifier
#% required: no
#% multiple: no
Modified: grass/trunk/temporal/t.rast.list/t.rast.list.py
===================================================================
--- grass/trunk/temporal/t.rast.list/t.rast.list.py 2014-05-30 11:55:10 UTC (rev 60607)
+++ grass/trunk/temporal/t.rast.list/t.rast.list.py 2014-05-30 13:38:42 UTC (rev 60608)
@@ -6,7 +6,7 @@
# AUTHOR(S): Soeren Gebbert
#
# PURPOSE: List registered maps of a space time raster dataset
-# COPYRIGHT: (C) 2011 by the GRASS Development Team
+# COPYRIGHT: (C) 2011-2014, Soeren Gebbert and the GRASS Development Team
#
# This program is free software under the GNU General Public
# License (version 2). Read the file COPYING that comes with GRASS
@@ -28,7 +28,8 @@
#%option
#% key: order
#% type: string
-#% description: Order the space time dataset by category
+#% description: Sort the space time dataset by category
+#% guisection: Formatting
#% required: no
#% multiple: yes
#% options: id,name,creator,mapset,temporal_type,creation_time,start_time,end_time,north,south,west,east,nsres,ewres,cols,rows,number_of_cells,min,max
@@ -38,7 +39,8 @@
#%option
#% key: columns
#% type: string
-#% description: Select columns to be printed to stdout
+#% description: Columns to be printed to stdout
+#% guisection: Selection
#% required: no
#% multiple: yes
#% options: id,name,creator,mapset,temporal_type,creation_time,start_time,end_time,north,south,west,east,nsres,ewres,cols,rows,number_of_cells,min,max
@@ -46,6 +48,7 @@
#%end
#%option G_OPT_T_WHERE
+#% guisection: Selection
#%end
#%option
@@ -66,16 +69,15 @@
#% multiple: no
#%end
-#%option
-#% key: separator
-#% type: string
-#% description: Separator character between the columns, default is tabular "\t"
-#% required: no
+#%option G_OPT_F_SEP
+#% description: Field separator character between the output columns
+#% guisection: Formatting
#%end
#%flag
#% key: h
-#% description: Print column names
+#% description: Print the column names as first row
+#% guisection: Formatting
#%end
import grass.script as grass
Modified: grass/trunk/temporal/t.rast.mapcalc/t.rast.mapcalc.py
===================================================================
--- grass/trunk/temporal/t.rast.mapcalc/t.rast.mapcalc.py 2014-05-30 11:55:10 UTC (rev 60607)
+++ grass/trunk/temporal/t.rast.mapcalc/t.rast.mapcalc.py 2014-05-30 13:38:42 UTC (rev 60608)
@@ -42,7 +42,7 @@
#%option
#% key: basename
#% type: string
-#% label: Base name of the new generated output maps"
+#% label: Basename of the new generated output maps
#% description: A numerical suffix separated by an underscore will be attached to create a unique identifier
#% required: yes
#% multiple: no
Modified: grass/trunk/temporal/t.rast.mapcalc2/t.rast.mapcalc2.py
===================================================================
--- grass/trunk/temporal/t.rast.mapcalc2/t.rast.mapcalc2.py 2014-05-30 11:55:10 UTC (rev 60607)
+++ grass/trunk/temporal/t.rast.mapcalc2/t.rast.mapcalc2.py 2014-05-30 13:38:42 UTC (rev 60608)
@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
############################################################################
#
-# MODULE: t.rast.mapcal2c
+# MODULE: t.rast.mapcalc2
# AUTHOR(S): Thomas Leppelt, Soeren Gebbert
#
# PURPOSE: Provide temporal raster algebra to perform spatial an temporal operations
@@ -10,32 +10,31 @@
# datasets.
# COPYRIGHT: (C) 2014 by the GRASS Development Team
#
-# This program is free software under the GNU General Public
-# License (version 2). Read the file COPYING that comes with GRASS
-# for details.
+# This program is free software under the GNU General Public
+# License (version 2). Read the file COPYING that comes with GRASS
+# for details.
#
#############################################################################
#%module
-#% description: Apply temporal and spatial oeprations on space time raster datasets using temporal raster algebra.
+#% description: Apply temporal and spatial operations on space time raster datasets using temporal raster algebra.
#% keywords: temporal
-#% keywords: mapalgebra
+#% keywords: algebra
#%end
#%option
#% key: expression
#% type: string
-#% description: The mapcalc expression for temporal and spatial analysis of space time raster datasets.
-#% key_desc: expression
+#% description: r.mapcalc expression for temporal and spatial analysis of space time raster datasets
#% required : yes
#%end
#%option
#% key: basename
#% type: string
-#% description: The basename of raster maps that are stored within the result space time raster dataset.
-#% key_desc: basename
-#% required : yes
+#% label: Basename of the new generated output maps
+#% description: A numerical suffix separated by an underscore will be attached to create a unique identifier
+#% required: yes
#%end
#%option
@@ -49,7 +48,7 @@
#%flag
#% key: s
-#% description: Activate spatial topology.
+#% description: Activate spatial topology
#%end
#%flag
Modified: grass/trunk/temporal/t.rast.neighbors/t.rast.neighbors.py
===================================================================
--- grass/trunk/temporal/t.rast.neighbors/t.rast.neighbors.py 2014-05-30 11:55:10 UTC (rev 60607)
+++ grass/trunk/temporal/t.rast.neighbors/t.rast.neighbors.py 2014-05-30 13:38:42 UTC (rev 60608)
@@ -52,7 +52,7 @@
#%option
#% key: basename
#% type: string
-#% label: Base name of the new generated output maps"
+#% label: Basename of the new generated output maps
#% description: A numerical suffix separated by an underscore will be attached to create a unique identifier
#% required: yes
#% multiple: no
Modified: grass/trunk/temporal/t.rast.univar/t.rast.univar.py
===================================================================
--- grass/trunk/temporal/t.rast.univar/t.rast.univar.py 2014-05-30 11:55:10 UTC (rev 60607)
+++ grass/trunk/temporal/t.rast.univar/t.rast.univar.py 2014-05-30 13:38:42 UTC (rev 60608)
@@ -6,7 +6,7 @@
# AUTHOR(S): Soeren Gebbert
#
# PURPOSE: Calculates univariate statistics from the non-null cells for each registered raster map of a space time raster dataset
-# COPYRIGHT: (C) 2011 by the GRASS Development Team
+# COPYRIGHT: (C) 2011-2014, Soeren Gebbert and the GRASS Development Team
#
# This program is free software under the GNU General Public
# License (version 2). Read the file COPYING that comes with GRASS
@@ -25,10 +25,12 @@
#%end
#%option G_OPT_T_WHERE
+#% guisection: Selection
#%end
#%option G_OPT_F_SEP
#% description: Field separator character between the output columns
+#% guisection: Formatting
#%end
#%flag
@@ -38,7 +40,8 @@
#%flag
#% key: h
-#% description: Print column names
+#% description: Print the column names as first row
+#% guisection: Formatting
#%end
import grass.script as grass
@@ -53,14 +56,14 @@
input = options["input"]
where = options["where"]
extended = flags["e"]
- header = flags["h"]
- fs = options["separator"]
+ colhead = flags["h"]
+ separator = options["separator"]
# Make sure the temporal database exists
tgis.init()
tgis.print_gridded_dataset_univar_statistics(
- "strds", input, where, extended, header, fs)
+ "strds", input, where, extended, colhead, separator)
if __name__ == "__main__":
options, flags = grass.parser()
Modified: grass/trunk/temporal/t.rast3d.list/t.rast3d.list.py
===================================================================
--- grass/trunk/temporal/t.rast3d.list/t.rast3d.list.py 2014-05-30 11:55:10 UTC (rev 60607)
+++ grass/trunk/temporal/t.rast3d.list/t.rast3d.list.py 2014-05-30 13:38:42 UTC (rev 60608)
@@ -6,7 +6,7 @@
# AUTHOR(S): Soeren Gebbert
#
# PURPOSE: List registered maps of a space time raster3d dataset
-# COPYRIGHT: (C) 2011 by the GRASS Development Team
+# COPYRIGHT: (C) 2011-2014, Soeren Gebbert and the GRASS Development Team
#
# This program is free software under the GNU General Public
# License (version 2). Read the file COPYING that comes with GRASS
@@ -39,6 +39,7 @@
#% key: columns
#% type: string
#% description: Columns to be printed to stdout
+#% guisection: Selection
#% required: no
#% multiple: yes
#% options: id,name,creator,mapset,temporal_type,creation_time,start_time,end_time,north,south,west,east,nsres,tbres,ewres,cols,rows,depths,number_of_cells,min,max
@@ -46,6 +47,7 @@
#%end
#%option G_OPT_T_WHERE
+#% guisection: Selection
#%end
#%option
@@ -58,16 +60,15 @@
#% answer: cols
#%end
-#%option
-#% key: separator
-#% type: string
-#% description: Separator character between the output columns, default is tabular "\t"
-#% required: no
+#%option G_OPT_F_SEP
+#% description: Field separator character between the output columns
+#% guisection: Formatting
#%end
#%flag
#% key: h
-#% description: Print column names
+#% description: Print the column names as first row
+#% guisection: Formatting
#%end
import grass.script as grass
Modified: grass/trunk/temporal/t.rast3d.mapcalc/t.rast3d.mapcalc.py
===================================================================
--- grass/trunk/temporal/t.rast3d.mapcalc/t.rast3d.mapcalc.py 2014-05-30 11:55:10 UTC (rev 60607)
+++ grass/trunk/temporal/t.rast3d.mapcalc/t.rast3d.mapcalc.py 2014-05-30 13:38:42 UTC (rev 60608)
@@ -42,7 +42,7 @@
#%option
#% key: basename
#% type: string
-#% label: Base name of the new generated output maps"
+#% label: Basename of the new generated output maps
#% description: A numerical suffix separated by an underscore will be attached to create a unique identifier
#% required: yes
#% multiple: no
Modified: grass/trunk/temporal/t.rast3d.mapcalc2/t.rast3d.mapcalc2.py
===================================================================
--- grass/trunk/temporal/t.rast3d.mapcalc2/t.rast3d.mapcalc2.py 2014-05-30 11:55:10 UTC (rev 60607)
+++ grass/trunk/temporal/t.rast3d.mapcalc2/t.rast3d.mapcalc2.py 2014-05-30 13:38:42 UTC (rev 60608)
@@ -10,32 +10,31 @@
# datasets.
# COPYRIGHT: (C) 2014 by the GRASS Development Team
#
-# This program is free software under the GNU General Public
-# License (version 2). Read the file COPYING that comes with GRASS
-# for details.
+# This program is free software under the GNU General Public
+# License (version 2). Read the file COPYING that comes with GRASS
+# for details.
#
#############################################################################
#%module
-#% description: Apply temporal and spatial oeprations on space time 3D raster datasets using temporal raster algebra.
+#% description: Apply temporal and spatial operations on space time 3D raster datasets using temporal raster algebra.
#% keywords: temporal
-#% keywords: mapalgebra
+#% keywords: algebra
#%end
#%option
#% key: expression
#% type: string
-#% description: The mapcalc expression for temporal and spatial analysis of space time 3D raster datasets.
-#% key_desc: expression
+#% description: r3.mapcalc expression for temporal and spatial analysis of space time 3D raster datasets
#% required : yes
#%end
#%option
#% key: basename
#% type: string
-#% description: The basename of raster maps that are stored within the result space time 3D raster dataset.
-#% key_desc: basename
-#% required : yes
+#% label: Basename of the new generated output maps
+#% description: A numerical suffix separated by an underscore will be attached to create a unique identifier
+#% required: yes
#%end
#%option
@@ -49,7 +48,7 @@
#%flag
#% key: s
-#% description: Activate spatial topology.
+#% description: Activate spatial topology
#%end
#%flag
Modified: grass/trunk/temporal/t.rast3d.univar/t.rast3d.univar.py
===================================================================
--- grass/trunk/temporal/t.rast3d.univar/t.rast3d.univar.py 2014-05-30 11:55:10 UTC (rev 60607)
+++ grass/trunk/temporal/t.rast3d.univar/t.rast3d.univar.py 2014-05-30 13:38:42 UTC (rev 60608)
@@ -6,7 +6,7 @@
# AUTHOR(S): Soeren Gebbert
#
# PURPOSE: Calculates univariate statistics from the non-null cells for each registered raster3d map of a space time raster3d dataset
-# COPYRIGHT: (C) 2011 by the GRASS Development Team
+# COPYRIGHT: (C) 2011-2014, Soeren Gebbert and the GRASS Development Team
#
# This program is free software under the GNU General Public
# License (version 2). Read the file COPYING that comes with GRASS
@@ -25,10 +25,12 @@
#%end
#%option G_OPT_T_WHERE
+#% guisection: Selection
#%end
#%option G_OPT_F_SEP
#% description: Field separator character between the output columns
+#% guisection: Formatting
#%end
#%flag
@@ -38,7 +40,8 @@
#%flag
#% key: h
-#% description: Print column names
+#% description: Print the column names as first row
+#% guisection: Formatting
#%end
import grass.script as grass
@@ -54,13 +57,13 @@
where = options["where"]
extended = flags["e"]
header = flags["h"]
- fs = options["separator"]
+ separator = options["separator"]
# Make sure the temporal database exists
tgis.init()
tgis.print_gridded_dataset_univar_statistics(
- "str3ds", input, where, extended, header, fs)
+ "str3ds", input, where, extended, header, separator)
if __name__ == "__main__":
options, flags = grass.parser()
Modified: grass/trunk/temporal/t.register/t.register.py
===================================================================
--- grass/trunk/temporal/t.register/t.register.py 2014-05-30 11:55:10 UTC (rev 60607)
+++ grass/trunk/temporal/t.register/t.register.py 2014-05-30 13:38:42 UTC (rev 60608)
@@ -6,7 +6,7 @@
# AUTHOR(S): Soeren Gebbert
#
# PURPOSE: Register raster, vector and raster3d maps in a space time datasets
-# COPYRIGHT: (C) 2011 by the GRASS Development Team
+# COPYRIGHT: (C) 2011-2014, Soeren Gebbert and the GRASS Development Team
#
# This program is free software under the GNU General Public
# License (version 2). Read the file COPYING that comes with GRASS
@@ -40,14 +40,16 @@
#%option G_OPT_F_INPUT
#% key: file
#% required: no
-#% description: Input file with map names, one per line. Additionally the start time and the end time can be specified per line
+#% label: Input file with map names, one per line
+#% description: Additionally the start time and the end time can be specified per line
#% guisection: Input
#%end
#%option
#% key: start
#% type: string
-#% description: Valid start date and time of the first map. Format absolute time: "yyyy-mm-dd HH:MM:SS +HHMM", relative time is of type integer).
+#% label: Valid start date and time of the first map
+#% description: Format absolute time: "yyyy-mm-dd HH:MM:SS +HHMM", relative time is of type integer).
#% required: no
#% multiple: no
#% guisection: Time & Date
@@ -56,7 +58,8 @@
#%option
#% key: end
#% type: string
-#% description: Valid end date and time of all map. Format absolute time: "yyyy-mm-dd HH:MM:SS +HHMM", relative time is of type integer).
+#% label: Valid end date and time of all map
+#% description: Format absolute time: "yyyy-mm-dd HH:MM:SS +HHMM", relative time is of type integer).
#% required: no
#% multiple: no
#% guisection: Time & Date
@@ -65,6 +68,7 @@
#%option
#% key: unit
#% type: string
+#% label: Time stamp unit
#% description: Unit must be set in case of relative time stamps
#% required: no
#% multiple: no
@@ -75,6 +79,7 @@
#%option
#% key: increment
#% type: string
+#% label: Time increment
#% description: Time increment between maps for valid time interval creation (format absolute: NNN seconds, minutes, hours, days, weeks, months, years; format relative is integer: 5)
#% required: no
#% multiple: no
@@ -105,7 +110,7 @@
maps = options["maps"]
type = options["type"]
file = options["file"]
- fs = options["separator"]
+ separator = options["separator"]
start = options["start"]
end = options["end"]
unit = options["unit"]
@@ -117,7 +122,7 @@
# Register maps
tgis.register_maps_in_space_time_dataset(
type=type, name=name, maps=maps, file=file, start=start, end=end,
- unit=unit, increment=increment, dbif=None, interval=interval, fs=fs)
+ unit=unit, increment=increment, dbif=None, interval=interval, fs=separator)
###############################################################################
Modified: grass/trunk/temporal/t.sample/t.sample.py
===================================================================
--- grass/trunk/temporal/t.sample/t.sample.py 2014-05-30 11:55:10 UTC (rev 60607)
+++ grass/trunk/temporal/t.sample/t.sample.py 2014-05-30 13:38:42 UTC (rev 60608)
@@ -6,7 +6,7 @@
# AUTHOR(S): Soeren Gebbert
#
# PURPOSE: Sample the input space time dataset(s) with a sample space time dataset and print the result to stdout
-# COPYRIGHT: (C) 2011 by the GRASS Development Team
+# COPYRIGHT: (C) 2011-2014, Soeren Gebbert and the GRASS Development Team
#
# This program is free software under the GNU General Public
# License (version 2). Read the file COPYING that comes with GRASS
@@ -44,16 +44,14 @@
#% answer: during,overlap,contain,equal
#%end
-#%option
-#% key: separator
-#% type: string
-#% description: Separator character between the output columns, default is tabular " | ". Do not use "," as this char is reserved to list several map ids in a sample granule
-#% required: no
+#%option G_OPT_F_SEP
+#% description: Field separator between output columns, default is tabular " | "
+#% label: Do not use "," as this char is reserved to list several map ids in a sample granule
#%end
#%flag
-#% key: c
-#% description: Print column names
+#% key: h
+#% description: Print the column names as first row
#%end
#%flag
@@ -61,7 +59,6 @@
#% description: Check spatial overlap to perform spatio-temporal sampling
#%end
-
import grass.script as grass
import grass.temporal as tgis
@@ -77,7 +74,7 @@
intype = options["intype"]
separator = options["separator"]
method = options["method"]
- header = flags["c"]
+ header = flags["h"]
spatial = flags["s"]
# Make sure the temporal database exists
Modified: grass/trunk/temporal/t.select/t.select.py
===================================================================
--- grass/trunk/temporal/t.select/t.select.py 2014-05-30 11:55:10 UTC (rev 60607)
+++ grass/trunk/temporal/t.select/t.select.py 2014-05-30 13:38:42 UTC (rev 60608)
@@ -36,7 +36,7 @@
#%flag
#% key: s
-#% description: Activate spatial topology.
+#% description: Activate spatial topology
#%end
Modified: grass/trunk/temporal/t.shift/t.shift.py
===================================================================
--- grass/trunk/temporal/t.shift/t.shift.py 2014-05-30 11:55:10 UTC (rev 60607)
+++ grass/trunk/temporal/t.shift/t.shift.py 2014-05-30 13:38:42 UTC (rev 60608)
@@ -38,7 +38,8 @@
#%option
#% key: granularity
#% type: string
-#% description: Shift granularity, format absolute time "x years, x months, x weeks, x days, x hours, x minutes, x seconds" or an integer value for relative time
+#% label: Shift granularity
+#% description: Format absolute time: "x years, x months, x weeks, x days, x hours, x minutes, x seconds", relative time is of type integer
#% required: yes
#% multiple: no
#%end
Modified: grass/trunk/temporal/t.support/t.support.py
===================================================================
--- grass/trunk/temporal/t.support/t.support.py 2014-05-30 11:55:10 UTC (rev 60607)
+++ grass/trunk/temporal/t.support/t.support.py 2014-05-30 13:38:42 UTC (rev 60608)
@@ -56,7 +56,8 @@
#%flag
#% key: m
-#% description: Update the metadata information and spatial extent of registered maps from the grass spatial database. Check for removed maps and delete them from the temporal database and all effected space time datasets.
+#% label: Update the metadata information and spatial extent of registered maps from the GRASS spatial database
+#% description: Check for removed maps and delete them from the temporal database and all effected space time datasets
#%end
#%flag
Modified: grass/trunk/temporal/t.vect.db.select/t.vect.db.select.py
===================================================================
--- grass/trunk/temporal/t.vect.db.select/t.vect.db.select.py 2014-05-30 11:55:10 UTC (rev 60607)
+++ grass/trunk/temporal/t.vect.db.select/t.vect.db.select.py 2014-05-30 13:38:42 UTC (rev 60608)
@@ -6,7 +6,7 @@
# AUTHOR(S): Soeren Gebbert
#
# PURPOSE: Prints attributes of vector maps registered in a space time vector dataset.
-# COPYRIGHT: (C) 2011 by the GRASS Development Team
+# COPYRIGHT: (C) 2011-2014, Soeren Gebbert and the GRASS Development Team
#
# This program is free software under the GNU General Public
# License (version 2). Read the file COPYING that comes with GRASS
@@ -30,7 +30,7 @@
#%end
#%option G_OPT_F_SEP
-#% description: Separator character between the output columns
+#% description: Field separator character between the output columns
#%end
#%option G_OPT_V_FIELD
@@ -57,7 +57,7 @@
columns = options["columns"]
tempwhere = options["t_where"]
layer = options["layer"]
- fs = options["separator"]
+ separator = options["separator"]
if where == "" or where == " " or where == "\n":
where = None
@@ -84,7 +84,7 @@
select = grass.read_command("v.db.select", map=vector_name,
layer=layer, columns=columns,
- separator="%s" % (fs), where=where)
+ separator="%s" % (separator), where=where)
if not select:
grass.fatal(_("Unable to run v.db.select for vector map <%s> "
@@ -97,17 +97,17 @@
# print the column names in case they change
if count == 0:
col_names_new = "start_time%send_time%s%s" % (
- fs, fs, entry)
+ separator, separator, entry)
if col_names != col_names_new:
col_names = col_names_new
print col_names
else:
if row["end_time"]:
- print "%s%s%s%s%s" % (row["start_time"], fs,
- row["end_time"], fs, entry)
+ print "%s%s%s%s%s" % (row["start_time"], separator,
+ row["end_time"], separator, entry)
else:
print "%s%s%s%s" % (row["start_time"],
- fs, fs, entry)
+ separator, separator, entry)
count += 1
if __name__ == "__main__":
Modified: grass/trunk/temporal/t.vect.export/t.vect.export.py
===================================================================
--- grass/trunk/temporal/t.vect.export/t.vect.export.py 2014-05-30 11:55:10 UTC (rev 60607)
+++ grass/trunk/temporal/t.vect.export/t.vect.export.py 2014-05-30 13:38:42 UTC (rev 60608)
@@ -47,7 +47,8 @@
#%option
#% key: format
#% type: string
-#% description: The export format of a single raster map. Supported are GML via v.out.ogr and the GRASS package format of v.pack.
+#% label: The export format of a single raster map
+#% description: Supported are GML via v.out.ogr and the GRASS package format of v.pack
#% required: no
#% multiple: no
#% options: GML,pack
Modified: grass/trunk/temporal/t.vect.extract/t.vect.extract.py
===================================================================
--- grass/trunk/temporal/t.vect.extract/t.vect.extract.py 2014-05-30 11:55:10 UTC (rev 60607)
+++ grass/trunk/temporal/t.vect.extract/t.vect.extract.py 2014-05-30 13:38:42 UTC (rev 60608)
@@ -42,7 +42,7 @@
#%option
#% key: basename
#% type: string
-#% label: Base name of the new generated output maps"
+#% label: Basename of the new generated output maps
#% description: A numerical suffix separated by an underscore will be attached to create a unique identifier
#% required: no
#% multiple: no
Modified: grass/trunk/temporal/t.vect.import/t.vect.import.py
===================================================================
--- grass/trunk/temporal/t.vect.import/t.vect.import.py 2014-05-30 11:55:10 UTC (rev 60607)
+++ grass/trunk/temporal/t.vect.import/t.vect.import.py 2014-05-30 13:38:42 UTC (rev 60608)
@@ -50,7 +50,7 @@
#%option
#% key: location
#% type: string
-#% description: Create a new location and import the data into it. Please do not run this module in parallel or interrupt it when a new location should be created.
+#% description: Create a new location and import the data into it. Do not run this module in parallel or interrupt it when a new location should be created
#% required: no
#% multiple: no
#%end
Modified: grass/trunk/temporal/t.vect.list/t.vect.list.py
===================================================================
--- grass/trunk/temporal/t.vect.list/t.vect.list.py 2014-05-30 11:55:10 UTC (rev 60607)
+++ grass/trunk/temporal/t.vect.list/t.vect.list.py 2014-05-30 13:38:42 UTC (rev 60608)
@@ -6,7 +6,7 @@
# AUTHOR(S): Soeren Gebbert
#
# PURPOSE: List registered maps of a space time vector dataset
-# COPYRIGHT: (C) 2011 by the GRASS Development Team
+# COPYRIGHT: (C) 2011-2014, Soeren Gebbert and the GRASS Development Team
#
# This program is free software under the GNU General Public
# License (version 2). Read the file COPYING that comes with GRASS
@@ -18,6 +18,7 @@
#% description: Lists registered maps of a space time vector dataset.
#% keywords: temporal
#% keywords: map management
+#% keywords: vector
#% keywords: list
#%end
@@ -27,7 +28,8 @@
#%option
#% key: order
#% type: string
-#% description: Order the space time dataset by category
+#% description: Sort the space time dataset by category
+#% guisection: Formatting
#% required: no
#% multiple: yes
#% options: id,name,layer,creator,mapset,temporal_type,creation_time,start_time,end_time,north,south,west,east,points,lines,boundaries,centroids,faces,kernels,primitives,nodes,areas,islands,holes,volumes
@@ -37,7 +39,8 @@
#%option
#% key: columns
#% type: string
-#% description: Select columns to be printed to stdout
+#% description: Columns to be printed to stdout
+#% guisection: Selection
#% required: no
#% multiple: yes
#% options: id,name,layer,creator,mapset,temporal_type,creation_time,start_time,end_time,north,south,west,east,points,lines,boundaries,centroids,faces,kernels,primitives,nodes,areas,islands,holes,volumes
@@ -45,6 +48,7 @@
#%end
#%option G_OPT_T_WHERE
+#% guisection: Selection
#%end
#%option
@@ -57,16 +61,15 @@
#% answer: cols
#%end
-#%option
-#% key: separator
-#% type: string
-#% description: Separator character between the columns, default is tabular "\t"
-#% required: no
+#%option G_OPT_F_SEP
+#% description: Field separator character between the output columns
+#% guisection: Formatting
#%end
#%flag
#% key: h
-#% description: Print column names
+#% description: Print the column names as first row
+#% guisection: Formatting
#%end
import grass.script as grass
Modified: grass/trunk/temporal/t.vect.mapcalc/t.vect.mapcalc.py
===================================================================
--- grass/trunk/temporal/t.vect.mapcalc/t.vect.mapcalc.py 2014-05-30 11:55:10 UTC (rev 60607)
+++ grass/trunk/temporal/t.vect.mapcalc/t.vect.mapcalc.py 2014-05-30 13:38:42 UTC (rev 60608)
@@ -25,7 +25,7 @@
#%option
#% key: expression
#% type: string
-#% description: The mapcalc expression for temporal and spatial analysis of space time vector datasets.
+#% description: Spatio-temporal mapcalc expression
#% key_desc: expression
#% required : yes
#%end
@@ -33,14 +33,15 @@
#%option
#% key: basename
#% type: string
-#% description: The basename of vector maps that are stored within the result space time vector dataset.
+#% label: Basename of the new generated output maps
+#% description: A numerical suffix separated by an underscore will be attached to create a unique identifier
#% key_desc: basename
#% required : yes
#%end
#%flag
#% key: s
-#% description: Activate spatial topology.
+#% description: Activate spatial topology
#%end
import grass.script
Modified: grass/trunk/temporal/t.vect.univar/t.vect.univar.py
===================================================================
--- grass/trunk/temporal/t.vect.univar/t.vect.univar.py 2014-05-30 11:55:10 UTC (rev 60607)
+++ grass/trunk/temporal/t.vect.univar/t.vect.univar.py 2014-05-30 13:38:42 UTC (rev 60608)
@@ -32,10 +32,12 @@
#%end
#%option G_OPT_T_WHERE
+#% guisection: Selection
#% key: twhere
#%end
#%option G_OPT_DB_WHERE
+#% guisection: Selection
#%end
#%option G_OPT_V_TYPE
@@ -44,12 +46,9 @@
#% answer: point
#%end
-#%option
-#% key: separator
-#% type: string
-#% description: Separator character between the output columns
-#% required: no
-#% answer: |
+#%option G_OPT_F_SEP
+#% description: Field separator character between the output columns
+#% guisection: Formatting
#%end
#%flag
@@ -59,7 +58,8 @@
#%flag
#% key: h
-#% description: Print column names
+#% description: Print the column names as first row
+#% guisection: Formatting
#%end
import grass.script as grass
More information about the grass-commit
mailing list