[GRASS-SVN] r64027 - in grass/branches/releasebranch_7_0: . raster3d/r3.in.ascii raster3d/r3.in.bin raster3d/r3.in.v5d raster3d/r3.info raster3d/r3.mask raster3d/r3.mkdspf raster3d/r3.neighbors raster3d/r3.null raster3d/r3.out.ascii raster3d/r3.out.bin raster3d/r3.out.netcdf raster3d/r3.out.v5d raster3d/r3.out.vtk raster3d/r3.stats raster3d/r3.support raster3d/r3.timestamp
svn_grass at osgeo.org
svn_grass at osgeo.org
Fri Jan 9 01:02:59 PST 2015
Author: neteler
Date: 2015-01-09 01:02:59 -0800 (Fri, 09 Jan 2015)
New Revision: 64027
Added:
grass/branches/releasebranch_7_0/raster3d/r3.timestamp/main.c
Removed:
grass/branches/releasebranch_7_0/raster3d/r3.timestamp/r3.timestamp.main.c
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/raster3d/r3.in.ascii/main.c
grass/branches/releasebranch_7_0/raster3d/r3.in.bin/main.c
grass/branches/releasebranch_7_0/raster3d/r3.in.v5d/main.c
grass/branches/releasebranch_7_0/raster3d/r3.info/main.c
grass/branches/releasebranch_7_0/raster3d/r3.mask/main.c
grass/branches/releasebranch_7_0/raster3d/r3.mkdspf/main.c
grass/branches/releasebranch_7_0/raster3d/r3.neighbors/main.c
grass/branches/releasebranch_7_0/raster3d/r3.null/main.c
grass/branches/releasebranch_7_0/raster3d/r3.out.ascii/main.c
grass/branches/releasebranch_7_0/raster3d/r3.out.bin/main.c
grass/branches/releasebranch_7_0/raster3d/r3.out.netcdf/main.c
grass/branches/releasebranch_7_0/raster3d/r3.out.v5d/main.c
grass/branches/releasebranch_7_0/raster3d/r3.out.vtk/main.c
grass/branches/releasebranch_7_0/raster3d/r3.stats/main.c
grass/branches/releasebranch_7_0/raster3d/r3.support/main.c
Log:
r3.*: keyword standardization; minor compiler warnings fixed; use standard file name for main.c of r3.timestamp
Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
- /grass/trunk:60497,60563-60566,60817,60976,61046,61096,61141,61994,62085,62105,62179-62180,62182,62190,62403,62422,62424,62429,62437,62466,62469,62484,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750-62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62828,62831,62838,62845,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,
63060,63062-63064,63066,63068,63070-63071,63074,63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63275-63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63361-63363,63367,63369,63379,63389,63391,63393,63402,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63604,63608-63609,63616,63618,63624,63626,63628,63630,63634,63639,63642,63644,63650,63652,63656,63679,63685,63689,63691,63693,63695,63698,63700-63702
,63704,63706-63707,63709,63711,63713,63715,63717-63718,63721-63727,63731,63733,63736,63740-63742,63744-63749,63751-63752,63756,63758,63760-63761,63767,63777,63780,63783,63787,63793,63796-63798,63801,63803,63807-63808,63812,63814,63816,63821,63823-63824,63827-63828,63830-63831,63834-63835,63837-63839,63841,63843-63844,63846-63847,63849,63851,63853,63855-63856,63858-63859,63862,63865,63869,63871,63882,63884,63889-63890,63892-63895,63897-63898,63900,63902-63903,63905,63907,63909-63911,63913-63914,63927,63930-63931,63940-63941,63945,63954-63955,63960,63965,63967,63976-63983,63995
+ /grass/trunk:60497,60563-60566,60817,60976,61046,61096,61141,61994,62085,62105,62179-62180,62182,62190,62403,62422,62424,62429,62437,62466,62469,62484,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750-62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62828,62831,62838,62845,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,
63060,63062-63064,63066,63068,63070-63071,63074,63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63275-63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63361-63363,63367,63369,63379,63389,63391,63393,63402,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63604,63608-63609,63616,63618,63624,63626,63628,63630,63634,63639,63642,63644,63650,63652,63656,63679,63685,63689,63691,63693,63695,63698,63700-63702
,63704,63706-63707,63709,63711,63713,63715,63717-63718,63721-63727,63731,63733,63736,63740-63742,63744-63749,63751-63752,63756,63758,63760-63761,63767,63777,63780,63783,63787,63793,63796-63798,63801,63803,63807-63808,63812,63814,63816,63821,63823-63824,63827-63828,63830-63831,63834-63835,63837-63839,63841,63843-63844,63846-63847,63849,63851,63853,63855-63856,63858-63859,63862,63865,63869,63871,63882,63884,63889-63890,63892-63895,63897-63898,63900,63902-63903,63905,63907,63909-63911,63913-63914,63927,63930-63931,63940-63941,63945,63954-63955,63960,63965,63967,63976-63983,63995,64026
Modified: grass/branches/releasebranch_7_0/raster3d/r3.in.ascii/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster3d/r3.in.ascii/main.c 2015-01-09 08:59:16 UTC (rev 64026)
+++ grass/branches/releasebranch_7_0/raster3d/r3.in.ascii/main.c 2015-01-09 09:02:59 UTC (rev 64027)
@@ -204,6 +204,7 @@
/*---------------------------------------------------------------------------*/
+#undef MAX
#define MAX(a,b) (a > b ? a : b)
void
@@ -310,8 +311,8 @@
G_gisinit(argv[0]);
module = G_define_module();
G_add_keyword(_("raster3d"));
+ G_add_keyword(_("import"));
G_add_keyword(_("voxel"));
- G_add_keyword(_("import"));
G_add_keyword(_("conversion"));
G_add_keyword("ASCII");
module->description =
Modified: grass/branches/releasebranch_7_0/raster3d/r3.in.bin/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster3d/r3.in.bin/main.c 2015-01-09 08:59:16 UTC (rev 64026)
+++ grass/branches/releasebranch_7_0/raster3d/r3.in.bin/main.c 2015-01-09 09:02:59 UTC (rev 64027)
@@ -251,6 +251,7 @@
module = G_define_module();
G_add_keyword(_("raster3d"));
G_add_keyword(_("import"));
+ G_add_keyword(_("voxel"));
module->description =
_("Imports a binary raster file into a GRASS 3D raster map.");
Modified: grass/branches/releasebranch_7_0/raster3d/r3.in.v5d/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster3d/r3.in.v5d/main.c 2015-01-09 08:59:16 UTC (rev 64026)
+++ grass/branches/releasebranch_7_0/raster3d/r3.in.v5d/main.c 2015-01-09 09:02:59 UTC (rev 64027)
@@ -34,6 +34,7 @@
#include <grass/raster3d.h>
#include <grass/glocale.h>
+#undef MAX
#define MAX(a,b) (a > b ? a : b)
/*---------------------------------------------------------------------------*/
@@ -175,6 +176,7 @@
G_gisinit(argv[0]);
module = G_define_module();
G_add_keyword(_("raster3d"));
+ G_add_keyword(_("import"));
G_add_keyword(_("voxel"));
module->description =
_("Import 3-dimensional Vis5D files.");
Modified: grass/branches/releasebranch_7_0/raster3d/r3.info/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster3d/r3.info/main.c 2015-01-09 08:59:16 UTC (rev 64026)
+++ grass/branches/releasebranch_7_0/raster3d/r3.info/main.c 2015-01-09 09:02:59 UTC (rev 64027)
@@ -74,8 +74,8 @@
module = G_define_module();
G_add_keyword(_("raster3d"));
G_add_keyword(_("metadata"));
+ G_add_keyword(_("voxel"));
G_add_keyword(_("extent"));
- G_add_keyword(_("voxel"));
module->description =
_("Outputs basic information about a user-specified 3D raster map layer.");
Modified: grass/branches/releasebranch_7_0/raster3d/r3.mask/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster3d/r3.mask/main.c 2015-01-09 08:59:16 UTC (rev 64026)
+++ grass/branches/releasebranch_7_0/raster3d/r3.mask/main.c 2015-01-09 09:02:59 UTC (rev 64027)
@@ -41,6 +41,7 @@
/*-------------------------------------------------------------------------*/
+#undef MAX
#define MAX(a,b) (a > b ? a : b)
static void makeMask(char *name, d_Mask * maskRules)
Modified: grass/branches/releasebranch_7_0/raster3d/r3.mkdspf/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster3d/r3.mkdspf/main.c 2015-01-09 08:59:16 UTC (rev 64026)
+++ grass/branches/releasebranch_7_0/raster3d/r3.mkdspf/main.c 2015-01-09 09:02:59 UTC (rev 64027)
@@ -77,6 +77,7 @@
module = G_define_module();
G_add_keyword(_("raster3d"));
+ G_add_keyword(_("display"));
G_add_keyword(_("voxel"));
module->description =
_("Creates a display file from an existing 3D raster map according to specified threshold levels.");
Modified: grass/branches/releasebranch_7_0/raster3d/r3.neighbors/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster3d/r3.neighbors/main.c 2015-01-09 08:59:16 UTC (rev 64026)
+++ grass/branches/releasebranch_7_0/raster3d/r3.neighbors/main.c 2015-01-09 09:02:59 UTC (rev 64027)
@@ -207,6 +207,7 @@
module = G_define_module();
G_add_keyword(_("raster3d"));
G_add_keyword(_("algebra"));
+ G_add_keyword(_("voxel"));
G_add_keyword(_("statistics"));
G_add_keyword(_("aggregation"));
G_add_keyword(_("neighbor"));
Modified: grass/branches/releasebranch_7_0/raster3d/r3.null/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster3d/r3.null/main.c 2015-01-09 08:59:16 UTC (rev 64026)
+++ grass/branches/releasebranch_7_0/raster3d/r3.null/main.c 2015-01-09 09:02:59 UTC (rev 64027)
@@ -24,6 +24,7 @@
#include <grass/glocale.h>
+#undef MAX
#define MAX(a,b) (a > b ? a : b)
@@ -183,6 +184,7 @@
G_gisinit(argv[0]);
module = G_define_module();
G_add_keyword(_("raster3d"));
+ G_add_keyword(_("null data"));
G_add_keyword(_("voxel"));
module->description =
_("Explicitly create the 3D NULL-value bitmap file.");
Modified: grass/branches/releasebranch_7_0/raster3d/r3.out.ascii/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster3d/r3.out.ascii/main.c 2015-01-09 08:59:16 UTC (rev 64026)
+++ grass/branches/releasebranch_7_0/raster3d/r3.out.ascii/main.c 2015-01-09 09:02:59 UTC (rev 64027)
@@ -23,6 +23,7 @@
#include <grass/raster3d.h>
#include <grass/glocale.h>
+#undef MAX
#define MAX(a,b) (a > b ? a : b)
/* structs */
@@ -299,8 +300,8 @@
G_gisinit(argv[0]);
module = G_define_module();
G_add_keyword(_("raster3d"));
+ G_add_keyword(_("export"));
G_add_keyword(_("voxel"));
- G_add_keyword(_("export"));
G_add_keyword(_("conversion"));
G_add_keyword("ASCII");
module->description =
Modified: grass/branches/releasebranch_7_0/raster3d/r3.out.bin/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster3d/r3.out.bin/main.c 2015-01-09 08:59:16 UTC (rev 64026)
+++ grass/branches/releasebranch_7_0/raster3d/r3.out.bin/main.c 2015-01-09 09:02:59 UTC (rev 64027)
@@ -204,6 +204,7 @@
module = G_define_module();
G_add_keyword(_("raster3d"));
G_add_keyword(_("export"));
+ G_add_keyword(_("voxel"));
module->description = _("Exports a GRASS 3D raster map to a binary array.");
/* Define the different options */
Modified: grass/branches/releasebranch_7_0/raster3d/r3.out.netcdf/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster3d/r3.out.netcdf/main.c 2015-01-09 08:59:16 UTC (rev 64026)
+++ grass/branches/releasebranch_7_0/raster3d/r3.out.netcdf/main.c 2015-01-09 09:02:59 UTC (rev 64027)
@@ -586,6 +586,7 @@
G_add_keyword(_("raster3d"));
G_add_keyword(_("export"));
G_add_keyword(_("netCDF"));
+ G_add_keyword(_("voxel"));
module->description = _("Export a 3D raster map as netCDF file.");
/* Get parameters from user */
Modified: grass/branches/releasebranch_7_0/raster3d/r3.out.v5d/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster3d/r3.out.v5d/main.c 2015-01-09 08:59:16 UTC (rev 64026)
+++ grass/branches/releasebranch_7_0/raster3d/r3.out.v5d/main.c 2015-01-09 09:02:59 UTC (rev 64027)
@@ -23,6 +23,7 @@
#include <grass/raster3d.h>
#include <grass/glocale.h>
+#undef MAX
#define MAX(a,b) (a > b ? a : b)
/* structs */
@@ -281,8 +282,8 @@
G_gisinit(argv[0]);
module = G_define_module();
G_add_keyword(_("raster3d"));
+ G_add_keyword(_("export"));
G_add_keyword(_("voxel"));
- G_add_keyword(_("export"));
module->description =
_("Exports GRASS 3D raster map to 3-dimensional Vis5D file.");
Modified: grass/branches/releasebranch_7_0/raster3d/r3.out.vtk/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster3d/r3.out.vtk/main.c 2015-01-09 08:59:16 UTC (rev 64026)
+++ grass/branches/releasebranch_7_0/raster3d/r3.out.vtk/main.c 2015-01-09 09:02:59 UTC (rev 64027)
@@ -374,8 +374,8 @@
module = G_define_module();
G_add_keyword(_("raster3d"));
+ G_add_keyword(_("export"));
G_add_keyword(_("voxel"));
- G_add_keyword(_("export"));
G_add_keyword("VTK");
module->description =
_("Converts 3D raster maps into the VTK-ASCII format.");
Modified: grass/branches/releasebranch_7_0/raster3d/r3.stats/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster3d/r3.stats/main.c 2015-01-09 08:59:16 UTC (rev 64026)
+++ grass/branches/releasebranch_7_0/raster3d/r3.stats/main.c 2015-01-09 09:02:59 UTC (rev 64027)
@@ -47,6 +47,7 @@
module = G_define_module();
G_add_keyword(_("raster3d"));
G_add_keyword(_("statistics"));
+ G_add_keyword(_("voxel"));
module->description = _("Generates volume statistics for 3D raster maps.");
/* Define the different options */
Modified: grass/branches/releasebranch_7_0/raster3d/r3.support/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster3d/r3.support/main.c 2015-01-09 08:59:16 UTC (rev 64026)
+++ grass/branches/releasebranch_7_0/raster3d/r3.support/main.c 2015-01-09 09:02:59 UTC (rev 64027)
@@ -48,8 +48,9 @@
module = G_define_module();
G_add_keyword(_("raster3d"));
G_add_keyword(_("metadata"));
+ G_add_keyword(_("voxel"));
module->description = _("Allows creation and/or modification of "
- "raster3d map layer support files.");
+ "3D raster map layer support files.");
raster = G_define_standard_option(G_OPT_R3_MAP);
Copied: grass/branches/releasebranch_7_0/raster3d/r3.timestamp/main.c (from rev 64026, grass/trunk/raster3d/r3.timestamp/main.c)
===================================================================
--- grass/branches/releasebranch_7_0/raster3d/r3.timestamp/main.c (rev 0)
+++ grass/branches/releasebranch_7_0/raster3d/r3.timestamp/main.c 2015-01-09 09:02:59 UTC (rev 64027)
@@ -0,0 +1,93 @@
+
+/****************************************************************************
+ *
+ * MODULE: r3.timestamp
+ * AUTHOR(S): Michael Pelizzari <michael.pelizzari lmco.com>
+ * (original contributor)
+ * Glynn Clements <glynn gclements.plus.com> Markus Neteler <neteler itc.it>
+ * PURPOSE: Stamps raster3d files with date and time.
+ * COPYRIGHT: (C) 2001-2006 by the GRASS Development Team
+ *
+ * This program is free software under the GNU General Public
+ * License (>=v2). Read the file COPYING that comes with GRASS
+ * for details.
+ *
+ *****************************************************************************/
+
+/* based on r.timestamp by Michael Shapiro and v.timestamp by Markus Neteler:
+ *
+ * Stamps raster3d files with date and time. This main.c is linked to functions
+ * currently residing in lib/gis/timestamp.c
+ *
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <grass/gis.h>
+#include <grass/raster3d.h>
+#include <grass/glocale.h>
+
+int main(int argc, char *argv[])
+{
+ struct Option *map, *date;
+ struct TimeStamp ts;
+ char *name;
+ const char *mapset;
+ int modify;
+ struct GModule *module;
+
+ G_gisinit(argv[0]);
+
+ module = G_define_module();
+ G_add_keyword(_("raster3d"));
+ G_add_keyword(_("timestamp"));
+ G_add_keyword(_("voxel"));
+ module->description =
+ _("Print/add/remove a timestamp for a 3D raster map");
+
+ map = G_define_standard_option(G_OPT_R3_MAP);
+
+ date = G_define_option();
+ date->key = "date";
+ date->key_desc = "timestamp";
+ date->required = NO;
+ date->type = TYPE_STRING;
+ date->description = _("Datetime, datetime1/datetime2, or none");
+
+ if (G_parser(argc, argv))
+ exit(EXIT_FAILURE);
+
+ name = map->answer;
+
+ modify = date->answer != NULL;
+
+ if (modify)
+ mapset = G_find_raster3d(name, G_mapset());
+ else
+ mapset = G_find_raster3d(name, "");
+
+ if (mapset == NULL) {
+ G_fatal_error(_("3D raster map <%s> not found"), name);
+ exit(EXIT_FAILURE);
+ }
+
+ if (!modify) {
+ if (G_read_raster3d_timestamp(name, mapset, &ts) == 1) {
+ G_write_timestamp(stdout, &ts);
+ exit(EXIT_SUCCESS);
+ }
+ else
+ exit(EXIT_FAILURE);
+ }
+ if (strcmp(date->answer, "none") == 0) {
+ G_remove_raster3d_timestamp(name);
+ exit(EXIT_SUCCESS);
+ }
+
+ if(G_scan_timestamp(&ts, date->answer) != 1)
+ G_fatal_error(_("Timestamp format is invalid"));
+
+ G_write_raster3d_timestamp(name, &ts);
+ exit(EXIT_SUCCESS);
+}
Deleted: grass/branches/releasebranch_7_0/raster3d/r3.timestamp/r3.timestamp.main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster3d/r3.timestamp/r3.timestamp.main.c 2015-01-09 08:59:16 UTC (rev 64026)
+++ grass/branches/releasebranch_7_0/raster3d/r3.timestamp/r3.timestamp.main.c 2015-01-09 09:02:59 UTC (rev 64027)
@@ -1,92 +0,0 @@
-
-/****************************************************************************
- *
- * MODULE: r3.timestamp
- * AUTHOR(S): Michael Pelizzari <michael.pelizzari lmco.com>
- * (original contributor)
- * Glynn Clements <glynn gclements.plus.com> Markus Neteler <neteler itc.it>
- * PURPOSE: Stamps raster3d files with date and time.
- * COPYRIGHT: (C) 2001-2006 by the GRASS Development Team
- *
- * This program is free software under the GNU General Public
- * License (>=v2). Read the file COPYING that comes with GRASS
- * for details.
- *
- *****************************************************************************/
-
-/* based on r.timestamp by Michael Shapiro and v.timestamp by Markus Neteler:
- *
- * Stamps raster3d files with date and time. This main.c is linked to functions
- * currently residing in lib/gis/timestamp.c
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <grass/gis.h>
-#include <grass/raster3d.h>
-#include <grass/glocale.h>
-
-int main(int argc, char *argv[])
-{
- struct Option *map, *date;
- struct TimeStamp ts;
- char *name;
- const char *mapset;
- int modify;
- struct GModule *module;
-
- G_gisinit(argv[0]);
-
- module = G_define_module();
- G_add_keyword(_("raster3d"));
- G_add_keyword(_("voxel"));
- module->description =
- _("Print/add/remove a timestamp for a 3D raster map");
-
- map = G_define_standard_option(G_OPT_R3_MAP);
-
- date = G_define_option();
- date->key = "date";
- date->key_desc = "timestamp";
- date->required = NO;
- date->type = TYPE_STRING;
- date->description = _("Datetime, datetime1/datetime2, or none");
-
- if (G_parser(argc, argv))
- exit(EXIT_FAILURE);
-
- name = map->answer;
-
- modify = date->answer != NULL;
-
- if (modify)
- mapset = G_find_raster3d(name, G_mapset());
- else
- mapset = G_find_raster3d(name, "");
-
- if (mapset == NULL) {
- G_fatal_error(_("3D raster map <%s> not found"), name);
- exit(EXIT_FAILURE);
- }
-
- if (!modify) {
- if (G_read_raster3d_timestamp(name, mapset, &ts) == 1) {
- G_write_timestamp(stdout, &ts);
- exit(EXIT_SUCCESS);
- }
- else
- exit(EXIT_FAILURE);
- }
- if (strcmp(date->answer, "none") == 0) {
- G_remove_raster3d_timestamp(name);
- exit(EXIT_SUCCESS);
- }
-
- if(G_scan_timestamp(&ts, date->answer) != 1)
- G_fatal_error(_("Timestamp format is invalid"));
-
- G_write_raster3d_timestamp(name, &ts);
- exit(EXIT_SUCCESS);
-}
More information about the grass-commit
mailing list