[GRASS-SVN] r37156 - grass/branches/releasebranch_6_4/visualization/nviz/src

[svn_grass at osgeo.org]

Author: hamish
Date: 2009-05-11 04:28:53 -0400 (Mon, 11 May 2009)
New Revision: 37156

Modified:
   grass/branches/releasebranch_6_4/visualization/nviz/src/nviz_init.c
Log:
more understandable flag descrs, g_verbose_msg() (merge from devbr6)

Modified: grass/branches/releasebranch_6_4/visualization/nviz/src/nviz_init.c
===================================================================
--- grass/branches/releasebranch_6_4/visualization/nviz/src/nviz_init.c	2009-05-11 08:27:33 UTC (rev 37155)
+++ grass/branches/releasebranch_6_4/visualization/nviz/src/nviz_init.c	2009-05-11 08:28:53 UTC (rev 37156)
@@ -101,15 +101,17 @@
 
     script_kill = G_define_flag();
     script_kill->key = 'k';
-    script_kill->description = _("Script kill option");
+    script_kill->description =
+	_("Exit after completing script launched from the command line");
 
     demo = G_define_flag();
     demo->key = 'x';
-    demo->description = _("Start in Demo mode");
+    demo->description =
+	_("Start in Demo mode (skip the \"please wait\" message)");
 
     verbose = G_define_flag();
     verbose->key = 'v';
-    verbose->description = _("Output more comments (default=quiet)");
+    verbose->description = _("Verbose module output");
 
     panel_path = G_define_option();
     panel_path->key = "path";
@@ -148,7 +150,14 @@
 	exit(EXIT_FAILURE);
     /* [?!]: Exit status is zero to avoid TCL complaints */
 
+    /* please remove before GRASS 7 released */
+    if (verbose->answer) {
+        putenv("GRASS_VERBOSE=3");
+        G_warning(_("The '-v' flag is superseded and will be removed "
+                    "in future. Please use '--verbose' instead."));
+    }
 
+
     {
 	float defs[MAX_ATTS];
 
@@ -168,44 +177,42 @@
 
     }
 
-    if (verbose->answer) {
-	fprintf(stderr, "\n");
-	fprintf(stderr, "\n");
-	fprintf(stderr, "Version: %s\n", GRASS_VERSION_STRING);
-	fprintf(stderr, "\n");
-	fprintf(stderr,
-		"Authors: Bill Brown, Terry Baker, Mark Astley, David Gerdes\n");
-	fprintf(stderr, "\tmodifications: Jaro Hofierka, Bob Covill\n");
-	fprintf(stderr, "\n");
-	fprintf(stderr, "\n");
-	fprintf(stderr,
-		"Please cite one or more of the following references in publications\n");
-	fprintf(stderr, "where the results of this program were used:\n");
-	fprintf(stderr,
-		"Brown, W.M., Astley, M., Baker, T., Mitasova, H. (1995).\n");
-	fprintf(stderr,
-		"GRASS as an Integrated GIS and Visualization System for\n");
-	fprintf(stderr,
-		"Spatio-Temporal Modeling, Proceedings of Auto Carto 12, Charlotte, N.C.\n");
-	fprintf(stderr, "\n");
-	fprintf(stderr,
-		"Mitasova, H., W.M. Brown, J. Hofierka, 1994, Multidimensional\n");
-	fprintf(stderr,
-		"dynamic cartography. Kartograficke listy, 2, p. 37-50.\n");
-	fprintf(stderr, "\n");
-	fprintf(stderr,
-		"Mitas L., Brown W. M., Mitasova H., 1997, Role of dynamic\n");
-	fprintf(stderr,
-		"cartography in simulations of landscape processes based on multi-variate\n");
-	fprintf(stderr,
-		"fields. Computers and Geosciences, Vol. 23, No. 4, pp. 437-446\n");
-	fprintf(stderr, "\n");
-	fprintf(stderr,
-		"http://www2.gis.uiuc.edu:2280/modviz/viz/nviz.html\n");
-	fprintf(stderr, "\n");
-	fprintf(stderr, "The papers are available at\n");
-	fprintf(stderr, "http://www2.gis.uiuc.edu:2280/modviz/\n");
-    }				/* done verbose */
+    G_verbose_message(" ");
+    G_verbose_message(" ");
+    G_verbose_message("Version: %s", GRASS_VERSION_STRING);
+    G_verbose_message(" ");
+    G_verbose_message(
+		"Authors: Bill Brown, Terry Baker, Mark Astley, David Gerdes");
+    G_verbose_message("\tmodifications: Jaro Hofierka, Bob Covill");
+    G_verbose_message(" ");
+    G_verbose_message(" ");
+    G_verbose_message(
+		"Please cite one or more of the following references in publications");
+    G_verbose_message("where the results of this program were used:");
+    G_verbose_message(
+		"Brown, W.M., Astley, M., Baker, T., Mitasova, H. (1995).");
+    G_verbose_message(
+		"GRASS as an Integrated GIS and Visualization System for");
+    G_verbose_message(
+		"Spatio-Temporal Modeling, Proceedings of Auto Carto 12, Charlotte, N.C.");
+    G_verbose_message(" ");
+    G_verbose_message(
+		"Mitasova, H., W.M. Brown, J. Hofierka, 1994, Multidimensional");
+    G_verbose_message(
+		"dynamic cartography. Kartograficke listy, 2, p. 37-50.");
+    G_verbose_message(" ");
+    G_verbose_message(
+		"Mitas L., Brown W. M., Mitasova H., 1997, Role of dynamic");
+    G_verbose_message(
+		"cartography in simulations of landscape processes based on multi-variate");
+    G_verbose_message(
+		"fields. Computers and Geosciences, Vol. 23, No. 4, pp. 437-446");
+    G_verbose_message(" ");
+    G_verbose_message(
+		"http://www2.gis.uiuc.edu:2280/modviz/viz/nviz.html");
+    G_verbose_message(" ");
+    G_verbose_message("The papers are available at");
+    G_verbose_message("http://www2.gis.uiuc.edu:2280/modviz/");
 
 
     /* Look for quickstart flag */
@@ -395,7 +402,7 @@
 	strstr(argv0, "script_play") != NULL ||
 	strstr(argv0, "script_get_line") != NULL ||
 	strstr(argv0, "script_file_tools") != NULL) {
-	fprintf(stderr, "Entering script mode ...\n");
+	G_message(_("Entering script mode ..."));
 	tmp2 = (char *)G_malloc((strlen(cmd) + 2) * (sizeof(char)));
 	sprintf(tmp2, "%s", cmd);
 	script_mode = 1;