[GRASS-SVN] r37185 - in grass/branches/releasebranch_6_4: lib/gis visualization/nviz/scripts

[svn_grass at osgeo.org]

Author: hamish
Date: 2009-05-12 06:01:46 -0400 (Tue, 12 May 2009)
New Revision: 37185

Modified:
   grass/branches/releasebranch_6_4/lib/gis/gisinit.c
   grass/branches/releasebranch_6_4/lib/gis/spawn.c
   grass/branches/releasebranch_6_4/visualization/nviz/scripts/nviz
   grass/branches/releasebranch_6_4/visualization/nviz/scripts/nviz2.2_script
Log:
update wrapper script to latest descr changes (merge from devbr6)

Modified: grass/branches/releasebranch_6_4/lib/gis/gisinit.c
===================================================================
--- grass/branches/releasebranch_6_4/lib/gis/gisinit.c	2009-05-12 09:59:11 UTC (rev 37184)
+++ grass/branches/releasebranch_6_4/lib/gis/gisinit.c	2009-05-12 10:01:46 UTC (rev 37185)
@@ -51,7 +51,7 @@
     G_set_program_name(pgm);
 
     if (strcmp(version, GIS_H_VERSION) != 0)
-        G_fatal_error(_("Incompatible library version for module. "
+	G_fatal_error(_("Incompatible library version for module. "
 			"You need to rebuild GRASS or untangle multiple installations."));
 
     /* Make sure location and mapset are set */
@@ -87,7 +87,7 @@
 	return 0;
 
     if (strcmp(version, GIS_H_VERSION) != 0)
-        G_fatal_error(_("Incompatible library version for module. "
+	G_fatal_error(_("Incompatible library version for module. "
 			"You need to rebuild GRASS or untangle multiple installations."));
 
     gisinit();

Modified: grass/branches/releasebranch_6_4/lib/gis/spawn.c
===================================================================
--- grass/branches/releasebranch_6_4/lib/gis/spawn.c	2009-05-12 09:59:11 UTC (rev 37184)
+++ grass/branches/releasebranch_6_4/lib/gis/spawn.c	2009-05-12 10:01:46 UTC (rev 37185)
@@ -81,7 +81,7 @@
 	return -1;
     }
 
-    return _spawnv(_P_WAIT, (char *)command, args);
+    return _spawnvp(_P_WAIT, (char *)command, args);
 }
 
 #else

Modified: grass/branches/releasebranch_6_4/visualization/nviz/scripts/nviz
===================================================================
--- grass/branches/releasebranch_6_4/visualization/nviz/scripts/nviz	2009-05-12 09:59:11 UTC (rev 37184)
+++ grass/branches/releasebranch_6_4/visualization/nviz/scripts/nviz	2009-05-12 10:01:46 UTC (rev 37185)
@@ -11,74 +11,93 @@
 #               for details.
 #############################################################################
 
-#% Module
-#%  description: nviz - Visualization and animation tool for GRASS data
-#%  keywords: raster, vector, visualization
-#% End
-#%flag
-#%  key: q
-#%  description: Quickstart - Do not load any data
-#% End
-#%  key: k
-#%  description: Script kill option
-#% End
-#%  key: x
-#%  description: Start in Demo mode
-#% End
-#%  key: v
-#%  description: Output more comments (default=quiet)
-#% End
-#%option
+## template generated 'with nviz --script'
+#%Module
+#% description: nviz - Visualization and animation tool for GRASS data.
+#% keywords: raster, vector, visualization
+#%End
+#%Flag
+#% key: q
+#% description: Quickstart - Do not load any data
+#%End
+#%Flag
+#% key: k
+#% description: Exit after completing script launched from the command line
+#%End
+#%Flag
+#% key: x
+#% description: Start in Demo mode (skip the "please wait" message)
+#%End
+#%Flag
+#% key: v
+#% description: Verbose module output (default=quiet)
+#%End
+#%Option
 #% key: elevation
 #% type: string
+#% required: no
+#% multiple: yes
+#% key_desc: name
+#% description: Name of raster map(s) for Elevation
 #% gisprompt: old,cell,raster
-#% description: Raster file(s) for elevation
-#% required : no
+#% guisection: Raster
 #%End
-#%option
+#%Option
 #% key: color
 #% type: string
+#% required: no
+#% multiple: yes
+#% description: Name of raster map(s) for Color
 #% gisprompt: old,cell,raster
-#% description: Raster file(s) for color
-#% required : no
+#% guisection: Raster
 #%End
-#%option
+#%Option
 #% key: vector
 #% type: string
+#% required: no
+#% multiple: yes
+#% description: Name of vector lines/areas overlay map(s)
 #% gisprompt: old,vector,vector
-#% description: Vector lines/areas overlay file(s)
-#% required : no
+#% guisection: Vector
 #%End
-#%option
+#%Option
 #% key: points
 #% type: string
+#% required: no
+#% multiple: yes
+#% description: Name of vector points overlay file(s)
 #% gisprompt: old,vector,vector
-#% description: Vector points overlay file(s)
-#% required : no
+#% guisection: Vector
 #%End
-#%option
+#%Option
 #% key: volume
 #% type: string
+#% required: no
+#% multiple: yes
 #% description: Name of existing 3d raster map
-#% required : no
+#% gisprompt: old,grid3,3d-raster
+#% guisection: Raster
 #%End
-#%option
+#%Option
 #% key: path
 #% type: string
+#% required: no
+#% multiple: no
 #% description: Set alternative panel path
-#% required : no
 #%End
-#%option
+#%Option
 #% key: script
 #% type: string
+#% required: no
+#% multiple: no
 #% description: Execute script file at startup
-#% required : no
 #%End
-#%option
+#%Option
 #% key: state
 #% type: string
-#% description: Load previosly saved state file
-#% required : no
+#% required: no
+#% multiple: no
+#% description: Load previously saved state file
 #%End
 
 

Modified: grass/branches/releasebranch_6_4/visualization/nviz/scripts/nviz2.2_script
===================================================================
--- grass/branches/releasebranch_6_4/visualization/nviz/scripts/nviz2.2_script	2009-05-12 09:59:11 UTC (rev 37184)
+++ grass/branches/releasebranch_6_4/visualization/nviz/scripts/nviz2.2_script	2009-05-12 10:01:46 UTC (rev 37185)
@@ -1117,10 +1117,3 @@
 
 	after 5000 CheckScriptDone
 }
-
-
-
-
-
-
-