[GRASS-SVN] r29462 - in grass/branches/releasebranch_6_3: .
db/drivers/postgres lib lib/init macosx macosx/app
macosx/pkg/resources ps/ps.map raster/r.average
raster/r.buffer raster/r.gwflow raster/r.in.gdal
raster/r.le/r.le.setup raster/r.los raster/r.report
raster/r.resamp.rst raster/r.statistics raster/r.stats
scripts/d.monsize scripts/r.in.wms scripts/r.regression.line
scripts/r.shaded.relief scripts/v.rast.stats scripts/v.report
swig/perl swig/perl/R_slope_aspect/r_slope_aspect
vector/lidar/lidarlib vector/v.in.ascii vector/v.in.ogr
vector/v.net.steiner vector/v.surf.rst vector/v.vol.rst
visualization/nviz visualization/xganim
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Dec 17 08:53:56 EST 2007
Author: neteler
Date: 2007-12-17 08:53:55 -0500 (Mon, 17 Dec 2007)
New Revision: 29462
Modified:
grass/branches/releasebranch_6_3/AUTHORS
grass/branches/releasebranch_6_3/COPYING
grass/branches/releasebranch_6_3/INSTALL
grass/branches/releasebranch_6_3/REQUIREMENTS.html
grass/branches/releasebranch_6_3/SUBMITTING
grass/branches/releasebranch_6_3/SUBMITTING_DOCS
grass/branches/releasebranch_6_3/SUBMITTING_SCRIPTS
grass/branches/releasebranch_6_3/SUBMITTING_TCLTK
grass/branches/releasebranch_6_3/contributors.csv
grass/branches/releasebranch_6_3/contributors_extra.csv
grass/branches/releasebranch_6_3/db/drivers/postgres/README
grass/branches/releasebranch_6_3/lib/grasslib.dox
grass/branches/releasebranch_6_3/lib/init/gis_set.tcl
grass/branches/releasebranch_6_3/lib/init/grass_intro.txt
grass/branches/releasebranch_6_3/lib/init/init.sh
grass/branches/releasebranch_6_3/macosx/Makefile
grass/branches/releasebranch_6_3/macosx/app/Info.plist.in
grass/branches/releasebranch_6_3/macosx/pkg/resources/Info.plist.in
grass/branches/releasebranch_6_3/ps/ps.map/description.html
grass/branches/releasebranch_6_3/raster/r.average/description.html
grass/branches/releasebranch_6_3/raster/r.buffer/description.html
grass/branches/releasebranch_6_3/raster/r.gwflow/description.html
grass/branches/releasebranch_6_3/raster/r.in.gdal/description.html
grass/branches/releasebranch_6_3/raster/r.le/r.le.setup/sample.c
grass/branches/releasebranch_6_3/raster/r.los/description.html
grass/branches/releasebranch_6_3/raster/r.report/description.html
grass/branches/releasebranch_6_3/raster/r.resamp.rst/description.html
grass/branches/releasebranch_6_3/raster/r.statistics/description.html
grass/branches/releasebranch_6_3/raster/r.stats/description.html
grass/branches/releasebranch_6_3/scripts/d.monsize/d.monsize
grass/branches/releasebranch_6_3/scripts/r.in.wms/description.html
grass/branches/releasebranch_6_3/scripts/r.in.wms/r.in.wms
grass/branches/releasebranch_6_3/scripts/r.regression.line/description.html
grass/branches/releasebranch_6_3/scripts/r.regression.line/r.regression.line
grass/branches/releasebranch_6_3/scripts/r.shaded.relief/r.shaded.relief
grass/branches/releasebranch_6_3/scripts/v.rast.stats/v.rast.stats
grass/branches/releasebranch_6_3/scripts/v.report/v.report
grass/branches/releasebranch_6_3/swig/perl/Makefile.PL.in
grass/branches/releasebranch_6_3/swig/perl/R_slope_aspect/r_slope_aspect/r_slope_aspect.c
grass/branches/releasebranch_6_3/translators.csv
grass/branches/releasebranch_6_3/vector/lidar/lidarlib/InterpSpline.c
grass/branches/releasebranch_6_3/vector/lidar/lidarlib/raster.c
grass/branches/releasebranch_6_3/vector/v.in.ascii/in.c
grass/branches/releasebranch_6_3/vector/v.in.ogr/description.html
grass/branches/releasebranch_6_3/vector/v.in.ogr/main.c
grass/branches/releasebranch_6_3/vector/v.net.steiner/description.html
grass/branches/releasebranch_6_3/vector/v.surf.rst/README
grass/branches/releasebranch_6_3/vector/v.vol.rst/README
grass/branches/releasebranch_6_3/vector/v.vol.rst/user1.c
grass/branches/releasebranch_6_3/visualization/nviz/Makefile
grass/branches/releasebranch_6_3/visualization/xganim/description.html
Log:
backported fixes from HEAD
Modified: grass/branches/releasebranch_6_3/AUTHORS
===================================================================
--- grass/branches/releasebranch_6_3/AUTHORS 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/AUTHORS 2007-12-17 13:53:55 UTC (rev 29462)
@@ -21,7 +21,7 @@
Active parts of the program have authors dating back to GRASS's
inception in 1982. Please check the GRASS 1.x - 5.0 credits list at:
- http://grass.itc.it/devel/grasscredits.html
+ http://www.grass-gis.org/devel/grasscredits.html
GRASS 6.0 was made up of entirely new code for much of the vector and
@@ -62,7 +62,7 @@
Source code Quality assessment system
- SOCCER Labs at Ecole Polytechnique de Montreal, Canada
http://web.soccerlab.polymtl.ca/grass-evolution/grass-browsers/grass-index-en.html
- http://grass.itc.it/mailman/listinfo/grass-qa
+ http://www.grass-gis.org/mailman/listinfo/grass-qa
Bugtracker maintainer:
Maciej "Maciek" Sieczka <werchowyna at epf.pl>
@@ -205,7 +205,7 @@
-------------------------
Please check additionally the GRASS 1.x-5.0 credits list at:
- http://grass.itc.it/devel/grasscredits.html
+ http://www.grass-gis.org/devel/grasscredits.html
While it is impossible for us to give credit to everyone (past
and present) who has contributed to GRASS, the following is the
@@ -293,7 +293,7 @@
Former GRASS 4 development (1984 to 1995):
U.S. Army Construction Engineering Research Laboratories (CERL)
Jim Westervelt, Michael Shapiro, Chris Rewerts, Robert Lozar, ...
- See: http://grass.itc.it/devel/grasscredits.html
+ See: http://www.grass-gis.org/devel/grasscredits.html
Former Institutions
- University of Illinois at Urbana-Champaign, USA
@@ -319,10 +319,10 @@
SSI/MPBA
Via Sommarive, 18
38050 Trento (Povo)
- email: neteler itc.it
+ email: neteler fbk.eu
-Internet: http://grass.itc.it/ (main site)
+Internet: http://www.grass-gis.org/ (main site)
http://grass.ibiblio.org/ (mirror)
- http://grass.itc.it/mirrors.php (list of mirrors)
+ http://www.grass-gis.org/mirrors.php (list of mirrors)
with a worldwide distribution network.
Modified: grass/branches/releasebranch_6_3/COPYING
===================================================================
--- grass/branches/releasebranch_6_3/COPYING 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/COPYING 2007-12-17 13:53:55 UTC (rev 29462)
@@ -37,7 +37,7 @@
Via Sommarive, 18
38050 Trento (Povo)
Italy
- neteler at itc.it
+ neteler fbk.eu
-Internet: http://grass.itc.it
+Internet: http://www.grass-gis.org/
http://grass.ibiblio.org
Modified: grass/branches/releasebranch_6_3/INSTALL
===================================================================
--- grass/branches/releasebranch_6_3/INSTALL 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/INSTALL 2007-12-17 13:53:55 UTC (rev 29462)
@@ -281,23 +281,23 @@
Note that this code is still actively being developed and errors inevitably
turn up. If you find a bug, please report it to the GRASS bug tracking system
-so we can fix it. see http://grass.itc.it/bugtracking/bugreport.html
+so we can fix it. see http://www.grass-gis.org/bugtracking/bugreport.html
If you are interested in helping to develop GRASS, please join the GRASS
-developers mailing list. see http://grass.itc.it/devel/index.php
+developers mailing list. see http://www.grass-gis.org/devel/index.php
(M) GRASS PROGRAMMER'S MANUAL
The Programmer's manual is generated with doxygen from the source code.
Please see the README file and the files at:
-http://grass.itc.it/devel/index.php#prog
+http://www.grass-gis.org/devel/index.php#prog
(N) CONTRIBUTING CODE AND PATCHES
-Please see ./SUBMITTING and ./SUBMITTING_SCRIPTS in this
-directory.
+Please see ./SUBMITTING, ./SUBMITTING_DOCS, ./SUBMITTING_TCLTK and
+./SUBMITTING_SCRIPTS in this directory.
(O) DRAFT TUTORIAL
Modified: grass/branches/releasebranch_6_3/REQUIREMENTS.html
===================================================================
--- grass/branches/releasebranch_6_3/REQUIREMENTS.html 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/REQUIREMENTS.html 2007-12-17 13:53:55 UTC (rev 29462)
@@ -101,7 +101,8 @@
<li><B>LAPACK / BLAS</B> (libraries for numerical computing) for GMATH library (GRASS numerical lib)<br>
[<a href="http://www.netlib.org/lapack/">http://www.netlib.org/lapack</a>] (usually available on Linux distros)
<br>
-Note: the support is intended for future module implementations, no need to use it at time!
+<I>Note: LAPACK/BLAS support is intended for future module implementations, no need to
+use it at time!</I>
<li><B>libpng</B> (for r.out.png and the PNG driver), usually already installed.<br>
@@ -148,11 +149,16 @@
<li><B>FreeType2</B> (for TrueType font support and d.text.freetype)<br>
<a href="http://www.freetype.org">http://www.freetype.org</a>
-<li><B>Python</B> <br>
+<li><B>Python</B> (for new wxPython GUI and SWIG interface)<br>
<a href="http://www.python.org">http://www.python.org</a>
+<li><B>FFMPEG</B> (for direct rendering of animations from NVIZ),
+ including libavcodec, libavformat, libswscale <BR>
+<a href="http://ffmpeg.mplayerhq.hu/">http://ffmpeg.mplayerhq.hu</a><BR>
+
</ul>
+
<h3>Note:</h3>
SUN Solaris users may go here to download precompiled libraries etc.:
@@ -171,7 +177,7 @@
<hr WIDTH="100%">
<br><i>© GRASS Development Team 2001-2006</i>
<p>Please report bugs here:
-<br><a href="http://grass.itc.it/bugtracking/bugreport.html">http://grass.itc.it/bugtracking/bugreport.html</a>
+<br><a href="http://www.grass-gis.org/bugtracking/bugreport.html">http://www.grass-gis.org/bugtracking/bugreport.html</a>
<p>
<i>$Id$</i>
Modified: grass/branches/releasebranch_6_3/SUBMITTING
===================================================================
--- grass/branches/releasebranch_6_3/SUBMITTING 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/SUBMITTING 2007-12-17 13:53:55 UTC (rev 29462)
@@ -4,8 +4,8 @@
Dear (new) GRASS Developer,
-When submitting C code to GRASS CVS repository, please take
-care of following rules:
+When submitting C code to GRASS SVN repository, please take care of
+following rules:
[ see SUBMITTING_SCRIPTS for shell script hints ]
[ see SUBMITTING_TCLTK for tcl and tk hints ]
@@ -13,7 +13,7 @@
1. Get and read the GRASS 6 Programmer's Manual here:
- http://grass.itc.it/devel/index.php#prog
+ http://download.osgeo.org/grass/grass6_progman/
or generate it from this source code (the programmer's manual is
integrated in the source code in doxygen style):
@@ -66,7 +66,7 @@
4. - deleted.
We don't want the $ ID $ in source code any more as it causes problems
- for the CVS branches.
+ for the SVN branches.
5. To ensure that the software system continues to work, please include
@@ -74,10 +74,10 @@
#include <grass/config.h>
in your files and make use of the various system dependencies
- contained therein. As one example of this, see
- lib/gmath/fft.c . Please refrain from declaring
- system functions within the software; include the proper header files
- (conditionally dependent on config.h macros if necessary) instead.
+ contained therein. As one example of this, see lib/gmath/fft.c.
+ Please refrain from declaring system functions within the
+ software; include the proper header files (conditionally dependent
+ on config.h macros if necessary) instead.
6. Order of include headers
@@ -86,7 +86,7 @@
1. Core system headers (stdio.h, ctype.h, ...)
2. Headers for non-core system components (X11, libraries).
- 3. Headers for core systems of the package being compiled (grass/gis.h, grass/glocale.h ...)
+ 3. Headers for core systems of the package being compiled (grass/gis.h, grass/glocale.h, ...)
4. Headers for the specific library/program being compiled (geodesic.h, ...)
Each class of header has an obligation to be compatible with those
@@ -126,7 +126,7 @@
exit (EXIT_FAILURE);
...
- exit (EXIT_SUCCESS)
+ exit (EXIT_SUCCESS);
}
@@ -141,7 +141,7 @@
Always use the gettext macros with _("") for user messages,
example:
- G_fatal_error ( _("Vector file [%s] not available"), name);
+ G_fatal_error (_("Vector map <%s> not found"), name);
Pipe/file data output:
@@ -154,8 +154,8 @@
fflush(stdout) always required when using fprintf(stdout, ...).
-10. Use the GRASS library function G_asprintf() instead of the
- standard C functions asprintf(), vsnprintf() and snprintf(). These
+10. Use the GRASS library function G_asprintf() instead of the
+ standard C functions asprintf(), vsnprintf() and snprintf(). These
functions are not portable or have other issues. Example:
char *msg;
@@ -169,9 +169,9 @@
11. Use the following GRASS library functions instead of the standard C
functions. The reason for this is that the following functions ensure
- good programming practice (eg always checking if memory was allocated)
+ good programming practice (e.g. always checking if memory was allocated)
and/or improves portability. PLEASE refer to the programmers manual
- for the proper use (eg determining if any casts are needed for arguments
+ for the proper use (e.g. determining if any casts are needed for arguments
or return values) of these library functions. They may perform a task
slightly different from their corresponding C library function, and thus,
their use may not be the same.
@@ -227,7 +227,7 @@
will make "diff" comparisons with older versions impossible. If indent is
needed, do not check in any changes other than the indentation in the same
commit! Do add the indent switches and any indent warning messages to the
- CVS log. Any change or fix mixed in with an indent is very hard to track
+ SVN log. Any change or fix mixed in with an indent is very hard to track
making it hard for others to follow the change or fix any new bugs.
@@ -274,12 +274,12 @@
vector/v.digit/Makefile
If you are unsure, please ask on the GRASS Developers list.
-
+
20. Have a look at ./INSTALL
21. Have a function included in your module which writes to the history
- file of the map (e.g. command line, parameters etc.). See eg
+ file of the map (e.g. command line, parameters etc.). See e.g.
raster/r.patch/main.c
(the same applies to vector and g3d modules!)
@@ -304,15 +304,15 @@
lib/init/variables.html
-26. Be sure to develop on top of the LATEST GRASS code (which is in CVS).
- You can re-check before submission with 'cvs diff':
+26. Be sure to develop on top of the LATEST GRASS code (which is in SVN repository).
+ You can re-check before submission with 'svn diff':
Be sure to create unified ("diff -u") format. "Plain" diffs (the default
format) are risky, because they will apply without warning to code which
has been substantially changed; they are also harder to read than unified.
Such diffs should be made from the top-level directory, e.g.
- "cvs diff -u display/d.vect/main.c"; that way, the diff will
+ "svn diff display/d.vect/main.c"; that way, the diff will
include the pathname rather than just "main.c".
27. Try to use module names which describe shortly the intended purpose of the module.
@@ -343,27 +343,27 @@
You can easily write specific tests for your modules.
- If your module is part of grass and you created some standard test cases,
- please contact the developers to add your tests to the default test suite.
- This will automatize complex test scenarios and assure to find bugs much
- faster, if changes were made to your modules or to the grass library.
+ If your module is part of GRASS and you created some standard test
+ cases, please contact the developers to add your tests to the
+ default test suite. This will automatize complex test scenarios
+ and assure to find bugs much faster, if changes were made to your
+ modules or to the grass library.
Consider to subscribe to the GRASS Quality Assessment System to
get immediate notification about the code quality:
- http://grass.itc.it/mailman/listinfo/grass-qa
+ http://www.grass-gis.org/mailman/listinfo/grass-qa
29. Tell the other developers about the new code using the following e-mail:
- grass-dev at grass.itc.it
+ grass-dev at lists.osgeo.org
To subscribe to this mailing list, see
- http://grass.itc.it/devel/index.php
+ http://lists.osgeo.org/mailman/listinfo/grass-dev
30. In case of questions feel free to contact the developers at the above
mailing list.
- http://grass.itc.it/devel/index.php#submission
+ http://www.grass-gis.org/devel/index.php#submission
...
[please add further hints if required]
-
Modified: grass/branches/releasebranch_6_3/SUBMITTING_DOCS
===================================================================
--- grass/branches/releasebranch_6_3/SUBMITTING_DOCS 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/SUBMITTING_DOCS 2007-12-17 13:53:55 UTC (rev 29462)
@@ -4,12 +4,12 @@
Dear (new) GRASS Developer,
-When submitting documentation to GRASS CVS repository, please take
+When submitting documentation to GRASS SVN repository, please take
care of following rules:
+[ see SUBMITTING for C hints ]
[ see SUBMITTING_SCRIPTS for shell script hints ]
[ see SUBMITTING_TCLTK for tcl and tk hints ]
-[ see SUBMITTING for C hints ]
1. Editing of HTML pages
To avoid insertion of too complicated HTML tags (see also below),
@@ -17,26 +17,27 @@
HTML editor for editing.
2. Module manual page:
- Place the documentation in HTML format into 'description.html'.
- The easiest way to do this is to study an existing HTML page
- (to get the page style, e.g. vector/v.to.db/description.html).
- With a few exceptions header and footer are NOT allowed.
- You can add figures (PNG format), the figure name prefix should be the
- module name. See raster/r.terraflow/description.html for an example.
+ Place the documentation in HTML format into 'description.html'.
+ The easiest way to do this is to study an existing HTML page
+ (to get the page style, e.g. vector/v.to.db/description.html).
+ With a few exceptions header and footer are NOT allowed.
+ You can add figures (PNG format), the figure name prefix should be the
+ module name. See raster/r.terraflow/description.html for an example.
- Note that the parameter information is auto-generated upon
- compilation. This is done by running module in a virtual session
- after compilation (see the output of 'make'). To subsequently
- verify the final HTML page, check the resulting HTML pages which
- will be stored with the name of the module.
+ Note that the parameter information is auto-generated upon
+ compilation. This is done by running module in a virtual session
+ after compilation (see the output of 'make'). To subsequently
+ verify the final HTML page, check the resulting HTML pages which
+ will be stored with the name of the module.
- Examples (please add some) should be coded like this:
+ Examples (please add some) should be coded like this:
- <div class="code"><pre>
- v.to.db map=soils type=area option=area col=area_size unit=h
- </pre></div>
+ <div class="code"><pre>
+ v.to.db map=soils type=area option=area col=area_size unit=h
+ </pre></div>
- The online WWW man pages is updated every Saturday by CVS.
+ The online WWW man pages is updated every Saturday (from SVN
+ repository).
3. Usage of limited HTML tags
Since the MAN conversion of g.html2man is limited, please use
@@ -45,6 +46,8 @@
<H2> <H3> <H4> <HEAD> <HEADER> <HR> <I> <IMG> <LI> <OL> <P>
<PRE> <SUP> <TABLE> <TD> <TH> <TITLE> <TR> <UL>
+See also:
+ http://grass.gdf-hannover.de/wiki/Updating_GRASS_Documentation
+
...
[please add further hints if required]
-
Modified: grass/branches/releasebranch_6_3/SUBMITTING_SCRIPTS
===================================================================
--- grass/branches/releasebranch_6_3/SUBMITTING_SCRIPTS 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/SUBMITTING_SCRIPTS 2007-12-17 13:53:55 UTC (rev 29462)
@@ -4,7 +4,7 @@
Dear (new) GRASS Developer,
-When submitting SHELL SCRIPTS to GRASS CVS repositiory,
+When submitting SHELL scripts to GRASS SVN repositiory,
please take care of following rules:
[ see SUBMITTING for C code hints ]
@@ -13,7 +13,7 @@
0. Instructions for the GRASS script parser can be found in the g.parser
module's help page.
- http://grass.ibiblio.org/grass63/manuals/html63_user/g.parser.html
+ http://grass.osgeo.org/grass63/manuals/html63_user/g.parser.html
1. Use the directory structure to place your script appropriately into
the source tree
@@ -58,7 +58,7 @@
3. - deleted.
We don't want the $ ID $ in scripts any more as it
- causes problems for the CVS branches.
+ causes problems for the SVN branches.
4. As a general principle, shell variables should almost always be quoted.
Use only secure temp files, see g.tempfile and scripts/* for examples.
@@ -151,14 +151,14 @@
# test for input raster map
g.findfile element=cell file="$INPUT" > /dev/null
if [ $? -eq 0 ] ; then
- g.message -e "Raster map '$GIS_OPT_MAP' not found in mapset search path"
+ g.message -e "Raster map <$GIS_OPT_MAP> not found in mapset search path"
exit 1
fi
# test for input vector map
eval `g.findfile element=vector file=$GIS_OPT_MAP`
if [ ! "$file" ] ; then
- g.message -e "Vector map '$GIS_OPT_MAP' not found in mapset search path"
+ g.message -e "Vector map <$GIS_OPT_MAP> not found in mapset search path"
exit 1
fi
@@ -169,7 +169,7 @@
debugging purposes.
#normal message:
- g.message "Done."
+ g.message "Done"
# warning:
g.message -w "No input values found, using default values"
@@ -184,7 +184,7 @@
12. For consistency, use README rather than README.txt for any README files.
-13. Be sure to develop on top of the LATEST GRASS code (which is in CVS).
+13. Be sure to develop on top of the LATEST GRASS code (which is in SVN).
You can re-check before submission with 'cvs diff':
Be sure to create unified ("diff -u") format. "Plain"
@@ -193,18 +193,18 @@
harder to read than unified.
Such diffs should be made from the top-level directory, e.g.
- "cvs diff -u display/d.vect/main.c"; that way, the diff will
+ "cvs diff display/d.vect/main.c"; that way, the diff will
include the pathname rather than just "main.c".
14. Tell the other developers about the new code using the following e-mail:
- grass-dev at grass.itc.it
+ grass-dev at lists.osgeo.org
To subscribe to this mailing list, see
- http://grass.itc.it/devel/index.php
+ http://lists.osgeo.org/mailman/listinfo/grass-dev
15. In case of questions feel free to contact the developers at the above
mailing list.
- http://grass.itc.it/devel/index.php#submission
+ http://www.grass-gis.org/devel/index.php#submission
16. For portability, scripts must work on any POSIX compliant shell, and
Modified: grass/branches/releasebranch_6_3/SUBMITTING_TCLTK
===================================================================
--- grass/branches/releasebranch_6_3/SUBMITTING_TCLTK 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/SUBMITTING_TCLTK 2007-12-17 13:53:55 UTC (rev 29462)
@@ -1,3 +1,5 @@
+$Id$
+
NOTE: Please improve this list!
Dear (new) GRASS Developer,
@@ -2,3 +4,3 @@
-When submitting TCL and TK SCRIPTS and C code to GRASS CVS repository,
+When submitting TCL and TK SCRIPTS to GRASS SVN repository,
please take care of following rules:
@@ -145,8 +147,9 @@
be annoying in normal use. Alternatively, redirect stdout/stderr to a
file, to catch any error messages.
-13. Be sure to develop on top of the LATEST GRASS code (which is in CVS).
- You can re-check before submission with 'cvs diff':
+13. Be sure to develop on top of the LATEST GRASS code (which is in
+ SVN repository). You can re-check before submission with 'svn
+ diff':
Be sure to create unified ("diff -u") format. "Plain"
diffs (the default format) are risky, because they will apply without
@@ -154,18 +157,18 @@
harder to read than unified.
Such diffs should be made from the top-level directory, e.g.
- "cvs diff -u display/d.vect/main.c"; that way, the diff will
+ "cvs diff display/d.vect/main.c"; that way, the diff will
include the pathname rather than just "main.c".
14. Tell the other developers about the new code using the following e-mail:
- grass-dev at grass.itc.it
+ grass-dev at lists.osgeo.org
To subscribe to this mailing list, see
- http://grass.itc.it/devel/index.php
+ http://lists.osgeo.org/mailman/listinfo/grass-dev
15. In case of questions feel free to contact the developers at the above
mailing list.
- http://grass.itc.it/devel/index.php#submission
+ http://www.grass-gis.org/devel/index.php#submission
16. Try to evaluate things only once. Tcl compiles the program to bytecode which
can be interpreted fairly quickly. If there are strings that must still be
Modified: grass/branches/releasebranch_6_3/contributors.csv
===================================================================
--- grass/branches/releasebranch_6_3/contributors.csv 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/contributors.csv 2007-12-17 13:53:55 UTC (rev 29462)
@@ -1,40 +1,43 @@
-alex,Alex Shevlakov <sixote yahoo.com>
-andreas,Andreas Lange <andreas.lange rhein-main.de>
-benjamin,Benjamin Ducke <benjamin.ducke ufg.uni-kiel.de>
-bernhard,Bernhard Reiter <bernhard intevation.de>
-bob,Bob Covill <bcovill tekmap.ns.ca>
-brad,Brad Douglas <rez touchofmadness.com>
-carlos,Carlos Davila <cdavilam jemila.jazztel.es>
-cedric,Cedric Shock <cedricgrass shockfamily.net>
-cho,Huidae Cho <grass4u gmail.com>
-danielc,Daniel Calvelo Aros <dca.gis gmail.com>
-david,David D. Gray <ddgray armadce.demon.co.uk>
-eric,Eric G. Miller <egm2 jps.net>
-florian,Florian Goessmann <florian wallweg39.de>
-frankw,Frank Warmerdam <warmerdam pobox.om>
-glynn,Glynn Clements <glynn gclements.plus.com>
-hamish,Hamish Bowman <hamish_nospam yahoo.com>
-helena,Helena Mitasova <hmitaso unity.ncsu.edu>
-jachym,Jachym Cepicky <jachym les-ejk.cz>
-jan,Jan-Oliver Wagner <jan intevation.de>
-john,John Huddleston <jhudd.lamar colostate.edu>
-justin,Justin Hickey <jhickey hpcc.nectec.or.th>
-markus,Markus Neteler <neteler itc.it>
-martin,Martin Wegmann <wegmann biozentrum.uni-wuerzburg.de>
-martinl,Martin Landa <landa.martin gmail.com>
-massimo,Massimo Cuomo <m.cuomo acsys.it>
-michael,Michael Barton <michael.barton asu.edu>
-mike,Mike Thomas <miketh brisbane.paradigmgeo.com>
-moritz,Moritz Lennert <mlennert club.worldonline.be>
-paul,Paul Kelly <paul-grass stjohnspoint.co.uk>
-paulo,Paulo Marcondes <pmarc.debian gmail.com>
-pallech,Serena Pallecchi <pallecch cli.di.unipi.it>
-radim,Radim Blazek <radim.blazek gmail.com>
-roberto,Roberto Micarelli <miro iol.it>
-robertoa,Roberto Antolin <roberto geomatica como.polimi.it>
-roger,Roger S. Miller <rgrmill rt66.com>
-scott,Scott Mitchell <smitch mac.com>
-soeren,Soeren Gebbert <soeren.gebbert gmx.de>
-stephan,Stephan Holl <holl gdf-hannover.de>
-william,William Kyngesburye <kyngchaos kyngchaos.com>
-wolf,Wolf Bergenheim <wolf+grass bergenheim.net>
+cvs_id,name,email,osgeo_id,rfc2_agreed
+-,Eric Patton,<epatton nrcan.gc.ca>,epatton,yes
+alex,Alex Shevlakov,<sixote yahoo.com>,,-
+andreas,Andreas Lange,<andreas.c.lange gmx.de>,,-
+benjamin,Benjamin Ducke,<benjamin.ducke ufg.uni-kiel.de>,benducke,yes
+bernhard,Bernhard Reiter,<bernhard intevation.de>,,-
+bob,Bob Covill,<bcovill tekmap.ns.ca>,,-
+brad,Brad Douglas,<rez touchofmadness.com>,bdouglas,yes
+carlos,Carlos Davila,<cdavilam jemila.jazztel.es>,cdavilam,yes
+cedric,Cedric Shock,<cedricgrass shockfamily.net>,,-
+cho,Huidae Cho,<grass4u gmail.com>,hcho,yes
+danielc,Daniel Calvelo Aros,<dca.gis gmail.com>,dcalvelo,yes
+david,David D. Gray,<ddgray armadce.demon.co.uk>,,-
+eric,Eric G. Miller,<egm2 jps.net>,,-
+florian,Florian Goessmann,<florian wallweg39.de>,,-
+frankw,Frank Warmerdam,<warmerdam pobox.com>,warmerdam,-
+glynn,Glynn Clements,<glynn gclements.plus.com>,glynn,yes
+hamish,Hamish Bowman,<hamish_b yahoo.com>,hamish,yes
+helena,Helena Mitasova,<hmitaso unity.ncsu.edu>,helena,yes
+jachym,Jachym Cepicky,<jachym.cepicky gmail.com>,jachym,yes
+jan,Jan-Oliver Wagner,<jan intevation.de>,,-
+john,John Huddleston,<jhudd.lamar colostate.edu>,,-
+justin,Justin Hickey,<jhickey hpcc.nectec.or.th>,,-
+markus,Markus Neteler,<neteler fbk.eu>,neteler,yes
+martin,Martin Wegmann,<wegmann biozentrum.uni-wuerzburg.de>,wegmann,-
+martinl,Martin Landa,<landa.martin gmail.com>,martinl,yes
+massimo,Massimo Cuomo,<m.cuomo acsys.it>,,-
+michael,Michael Barton,<michael.barton asu.edu>,cmbarton,yes
+mike,Mike Thomas,<miketh brisbane.paradigmgeo.com>,,-
+moritz,Moritz Lennert,<mlennert club.worldonline.be>,mlennert,yes
+msieczka,Maciek Sieczka,<tutey o2.pl>,msieczka,yes
+paul,Paul Kelly,<paul-grass stjohnspoint.co.uk>,pkelly,yes
+paulo,Paulo Marcondes,<pmarc.debian gmail.com>,pmarcondes,-
+pallech,Serena Pallecchi,<pallecch cli.di.unipi.it>,,-
+radim,Radim Blazek,<radim.blazek gmail.com>,rblazek,-
+roberto,Roberto Micarelli,<miro iol.it>,,-
+robertoa,Roberto Antolin,<roberto geomatica.como.polimi.it>,rantolin,yes
+roger,Roger S. Miller,<rgrmill rt66.com>,,-
+scott,Scott Mitchell,<smitch mac.com>,smitch,yes
+soeren,Soeren Gebbert,<soerengebbert googlemail.com>,,-
+stephan,Stephan Holl,<stephan.holl intevation.de>,sholl,yes
+william,William Kyngesburye,<kyngchaos kyngchaos.com>,kyngchaos,yes
+wolf,Wolf Bergenheim,<wolf+grass bergenheim.net>,wolf,yes
Modified: grass/branches/releasebranch_6_3/contributors_extra.csv
===================================================================
--- grass/branches/releasebranch_6_3/contributors_extra.csv 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/contributors_extra.csv 2007-12-17 13:53:55 UTC (rev 29462)
@@ -1,39 +1,40 @@
-Andrea Aime <aaime comune modena it>
-Lars Ahlzen <lars ahlzen com>
-Carl Anderson <candrsn mindspring com>
-Roger Bivand <Roger Bivand nhh no>
-Malcolm Blue <mblue nb sympatico ca>
-Jacques Bouchard <bouchard onera fr>
-Maria Brovelli <maria brovelli polimi it>
-William Brown <brown gis uiuc edu>
-Bruce Byars <Bruce_Byars baylor edu>
-Angus Carr <apcarr flash lakeheadu ca>
-Otto Dassau <dassau gdf-hannover de>
-Charles Ehlschlaeger <cre111 wiu edu>
-Pierre de Mouveaux <pierre polaris-technologies com>
-Roberto Flor <flor itc it>
-Antonio Galea <ant9000 netwise it>
-Ralf Gerlich <ralf gerlich at bsse biz>
-Jaro Hofierka <hofierka geomodel sk>
-Stephan Holl <stephan holl-land de>
-Bill Hughes <bhughes grasshoppernet com>
-Ari Jolma <ari jolma tkk fi>
-Jeshua Lacock <jeshua OpenOSX com>
-Andreas Lange <Andreas Lange Rhein-Main de>
-Roger Miller <rgrmill rt66 com>
-Brook Milligan <brook trillium NMSU Edu>
-Lubos Mitas <lmitas ncsa uiuc edu>
-Eric Mitchell <emitchell altaira com>
-Scott Mitchell <smitch mac com>
-Lorenzo Moretti <lorenzo moretti bologna enea it>
-Maris Nartiss <maris nartiss gmail com>
-Tomas Paudits <tpaudits mailbox sk>
-Francesco Pirotti <francesco pirotti unipd it>
-Phisan Santitamnont <fsvpss eng chula ac th>
-Christoph Simon <ciccio kiosknet com br>
-Job Spijker <spijker geo uu nl>
-Laura Toma <ltoma bowdoin edu>
-Alfonso Vitti <alfonso vitti ing unitn it>
-Philip Warner <pjw rhyme com au>
-Trevor Wiens <twiens interbaun com>
-Michel Wurtz <mw teledetection fr>
+name,email,rfc2_agreed
+Andrea Aime,<aaime openplans.org>,-
+Lars Ahlzen,<lars ahlzen.com>,-
+Carl Anderson,<candrsn mindspring.com>,-
+Dylan Beaudette,<dylan.beaudette gmail.com>,yes
+Roger Bivand,<Roger Bivand nhh.no>,-
+Malcolm Blue,<mblue nb sympatico.ca>,-
+Jacques Bouchard,<bouchard onera.fr>,-
+Maria Brovelli,<maria.brovelli polimi.it>,-
+William Brown,<brown gis.uiuc.edu>,-
+Bruce Byars,<Bruce_Byars baylor.edu>,-
+Angus Carr,<apcarr flash lakeheadu.ca>,-
+Otto Dassau,<otto.dassau gmx de>,-
+Charles Ehlschlaeger,<cre111 wiu.edu>,-
+Pierre de Mouveaux,<pierre polaris-technologies.com>,-
+Roberto Flor,<flor fbk.eu>,-
+Antonio Galea,<ant9000 netwise.it>,-
+Ralf Gerlich,<ralf gerlich at bsse.biz>,-
+Jaro Hofierka,<hofierka geomodel.sk>,-
+Stephan Holl,<stephan holl-land.de>,-
+Bill Hughes,<bhughes grasshoppernet.com>,-
+Ari Jolma,<ari jolma tkk fi>,-
+Jeshua Lacock,<jeshua OpenOSX.com>,-
+Roger Miller,<rgrmill rt66.com>,-
+Brook Milligan,<brook trillium nmsu.edu>,-
+Lubos Mitas,<lmitas ncsa uiuc.edu>,-
+Eric Mitchell,<emitchell altaira.com>,-
+Scott Mitchell,<smitch mac.com>,-
+Lorenzo Moretti,<lorenzo moretti bologna.enea.it>,-
+Maris Nartiss,<maris nartiss gmail.com>,-
+Tomas Paudits,<tpaudits mailbox.sk>,-
+Francesco Pirotti,<francesco.pirotti unipd.it>,-
+Phisan Santitamnont,<fsvpss eng.chula.ac.th>,-
+Christoph Simon,<ciccio kiosknet.com.br>,-
+Job Spijker,<spijker geo.uu.nl>,-
+Laura Toma,<ltoma bowdoin.edu>,-
+Alfonso Vitti,<alfonso vitti ing.unitn.it>,-
+Philip Warner,<pjw rhyme com.au>,-
+Trevor Wiens,<twiens interbaun.com>,-
+Michel Wurtz,<mw teledetection.fr>,-
Modified: grass/branches/releasebranch_6_3/db/drivers/postgres/README
===================================================================
--- grass/branches/releasebranch_6_3/db/drivers/postgres/README 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/db/drivers/postgres/README 2007-12-17 13:53:55 UTC (rev 29462)
@@ -14,7 +14,11 @@
Because of this, type codes must be read from server when database is opened.
-Supported types:
+Check also for PostgreSQL data types for defining them in GRASS:
+ /usr/include/pgsql/server/catalog/pg_type.h
+
+
+Supported types in ./globals.h:
(http://www.postgresql.org/docs/8.2/interactive/datatype.html)
DB_C_TYPE_INT:
bit, int2, smallint, int4, int, integer, int8, bigint, serial, oid
Modified: grass/branches/releasebranch_6_3/lib/grasslib.dox
===================================================================
--- grass/branches/releasebranch_6_3/lib/grasslib.dox 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/lib/grasslib.dox 2007-12-17 13:53:55 UTC (rev 29462)
@@ -18,7 +18,7 @@
presented. Standard GRASS 4.x conventions are still used in much of the
code. This work is part of ongoing research being performed by the
GRASS Development Team coordinated at
-<a href="http://mpa.itc.it/">FBK-irst</A>(formerly ITC-irst), Trento, Italy,
+<a href="http://mpa.fbk.eu/">FBK-irst</A>(formerly ITC-irst), Trento, Italy,
an international team of programmers,
GRASS module authors are cited within their module's source code and the
contributed manual pages.
@@ -31,7 +31,7 @@
software and this manual is kindly supported by Intevation GmbH,
Osnabrück, Germany, who provide the GRASS CVS repository.
-Main web site: <a href="http://grass.itc.it">http://grass.itc.it</a>
+Main web site: <a href="http://grass.osgeo.org">http://grass.osgeo.org</a>
<P>
<I>Missing entries below are either not yet uploaded to CVS (need to be migrated
@@ -141,7 +141,7 @@
storage in database (DBMS).</li>
</ul>
-<img src="http://grass.itc.it/images/loc_struct.png" alt="Diagram of GRASS file structure">
+<img src="http://grass.osgeo.org/images/loc_struct.png" alt="Diagram of GRASS file structure">
*/
Modified: grass/branches/releasebranch_6_3/lib/init/gis_set.tcl
===================================================================
--- grass/branches/releasebranch_6_3/lib/init/gis_set.tcl 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/lib/init/gis_set.tcl 2007-12-17 13:53:55 UTC (rev 29462)
@@ -141,7 +141,7 @@
foreach filename [lsort [glob -nocomplain *]] {
if {[string compare $filename "PERMANENT"] == 0} {
# All good locations have valid PERMANENT mapset.
- if {[file exists "$dir/PERMANENT/WIND"] != 0} {
+ if {[file exists "$dir/PERMANENT/DEFAULT_WIND"] != 0} {
set found 1
.frame0.frameNMS.second.entry configure -state normal
}
Modified: grass/branches/releasebranch_6_3/lib/init/grass_intro.txt
===================================================================
--- grass/branches/releasebranch_6_3/lib/init/grass_intro.txt 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/lib/init/grass_intro.txt 2007-12-17 13:53:55 UTC (rev 29462)
@@ -9,5 +9,5 @@
- Current catalog of available computer maps
3) Check the GRASS webpages for feedback mailinglists and more:
- http://grass.itc.it/
- http://grass.ibiblio.edu/
+ http://www.grass-gis.org
+ http://grass.osgeo.org
Modified: grass/branches/releasebranch_6_3/lib/init/init.sh
===================================================================
--- grass/branches/releasebranch_6_3/lib/init/init.sh 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/lib/init/init.sh 2007-12-17 13:53:55 UTC (rev 29462)
@@ -801,7 +801,7 @@
cat "$ETC/welcome"
fi
-echo "GRASS homepage: http://grass.itc.it/"
+echo "GRASS homepage: http://grass.osgeo.org/"
echo "This version running thru: $shellname ($SHELL)"
echo "Help is available with the command: g.manual -i"
echo "See the licence terms with: g.version -c"
Modified: grass/branches/releasebranch_6_3/macosx/Makefile
===================================================================
--- grass/branches/releasebranch_6_3/macosx/Makefile 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/macosx/Makefile 2007-12-17 13:53:55 UTC (rev 29462)
@@ -14,6 +14,17 @@
LN = /bin/ln -sf
LN_DIR = /bin/ln -sfh
+# packagemaker location, options and behaviour changed in xcode 3
+ifeq ($(findstring darwin9,$(ARCH)),darwin9)
+XCODE_VER = xcode3
+PACKAGEMAKER = /Developer/usr/bin/packagemaker
+PKG_INST_DIR = ${prefix}
+else
+XCODE_VER = xcode2
+PACKAGEMAKER = /Developer/Tools/packagemaker
+PKG_INST_DIR = ${prefix}/${MACOSX_APP_NAME}
+endif
+
SUBDIRS =
ifeq ($(MACOSX_APP),1)
SUBDIRS = app modbuild
@@ -98,12 +109,16 @@
-sed -e "s#@INST_DIR@#${INST_DIR}#g" -e "s#@MACOSX_SUPPDIR@#${MACOSX_SUPPDIR}#g" -e "s#@GRASS_VER@#${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}#g" pkg/resources/postflight.in > dist/resources/postflight
-chmod a+rx dist/resources/postflight
-sed -e "s#@GRASS_VER@#${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}#g" pkg/resources/Description.plist.in > dist/Description.plist
- -sed -e "s#@GRASS_VERSION_MAJOR@#${GRASS_VERSION_MAJOR}#g" -e "s#@GRASS_VERSION_MINOR@#${GRASS_VERSION_MINOR}#g" -e "s#@GRASS_VERSION_RELEASE@#${GRASS_VERSION_RELEASE}#g" -e "s#@VER_MINOR_REL@#${VER_MINOR_REL}#g" -e "s#@VER_DATE@#${VER_DATE}#g" -e "s#@PKG_INST_DIR@#${prefix}/${MACOSX_APP_NAME}#g" pkg/resources/Info.plist.in > dist/Info.plist
+ -sed -e "s#@GRASS_VERSION_MAJOR@#${GRASS_VERSION_MAJOR}#g" -e "s#@GRASS_VERSION_MINOR@#${GRASS_VERSION_MINOR}#g" -e "s#@GRASS_VERSION_RELEASE@#${GRASS_VERSION_RELEASE}#g" -e "s#@VER_MINOR_REL@#${VER_MINOR_REL}#g" -e "s#@VER_DATE@#${VER_DATE}#g" -e "s#@PKG_INST_DIR@#${PKG_INST_DIR}#g" pkg/resources/Info.plist.in > dist/Info.plist
-${INSTALL_DATA} pkg/resources/License.rtf dist/resources
-${INSTALL_DATA} pkg/resources/ReadMe.rtf dist/resources
-cd ${GISBASE} ; tar cBf - modbuild | (cd ${GRASS_HOME}/macosx/dist/resources ; tar xBf - ) 2>/dev/null
@# build the package
- /Developer/Tools/packagemaker -build -ds -p "GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.pkg" -f dist/${MACOSX_APP_NAME} -r dist/resources -i dist/Info.plist -d dist/Description.plist
+ifeq ($(XCODE_VER),xcode3)
+ ${PACKAGEMAKER} --target 10.4 --root-volume-only --id org.osgeo.grass --root dist/${MACOSX_APP_NAME} --info dist/Info.plist --out "GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.pkg" --resources dist/resources
+else
+ ${PACKAGEMAKER} -build -ds -p "GRASS-${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}.pkg" -f dist/${MACOSX_APP_NAME} -r dist/resources -i dist/Info.plist -d dist/Description.plist
+endif
@# remove intermediate files
@# -rm -rf dist 2>/dev/null
Modified: grass/branches/releasebranch_6_3/macosx/app/Info.plist.in
===================================================================
--- grass/branches/releasebranch_6_3/macosx/app/Info.plist.in 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/macosx/app/Info.plist.in 2007-12-17 13:53:55 UTC (rev 29462)
@@ -11,7 +11,7 @@
<key>CFBundleIconFile</key>
<string>app.icns</string>
<key>CFBundleIdentifier</key>
- <string>it.itc.grass6</string>
+ <string>org.osgeo.grass6</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
Modified: grass/branches/releasebranch_6_3/macosx/pkg/resources/Info.plist.in
===================================================================
--- grass/branches/releasebranch_6_3/macosx/pkg/resources/Info.plist.in 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/macosx/pkg/resources/Info.plist.in 2007-12-17 13:53:55 UTC (rev 29462)
@@ -5,7 +5,7 @@
<key>CFBundleGetInfoString</key>
<string>GRASS- at GRASS_VERSION_MAJOR@. at GRASS_VERSION_MINOR@. at GRASS_VERSION_RELEASE@</string>
<key>CFBundleIdentifier</key>
- <string>it.itc.grass</string>
+ <string>org.osgeo.grass</string>
<key>CFBundleShortVersionString</key>
<string>@GRASS_VERSION_MAJOR at .@VER_MINOR_REL at .@VER_DATE@</string>
<key>IFMajorVersion</key>
Modified: grass/branches/releasebranch_6_3/ps/ps.map/description.html
===================================================================
--- grass/branches/releasebranch_6_3/ps/ps.map/description.html 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/ps/ps.map/description.html 2007-12-17 13:53:55 UTC (rev 29462)
@@ -201,6 +201,11 @@
in which case it is measured in inches.
The default is a black border box of width 1 point.
<P>
+The border can be turned off completely with the
+"<tt>border n</tt>" instruction. In this case
+the <B>end</B> command should not be given as the
+main command will be treated as a single line instruction.
+<P>
This example would create a grey border 0.1" wide.
<PRE>
@@ -259,6 +264,10 @@
r.support to manually add labels. If there are too many categories to
do this, you could write a script to add dummy labels to the cats file<br>
(<gisdbase>/<location>/<mapset>/cats/<mapname>).
+<P>
+If the colortable is turned off with a "<tt>colortable n</tt>"
+instruction the <B>end</B> command should not be given as the
+main command will be treated as a single line instruction.
<P>
Modified: grass/branches/releasebranch_6_3/raster/r.average/description.html
===================================================================
--- grass/branches/releasebranch_6_3/raster/r.average/description.html 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/raster/r.average/description.html 2007-12-17 13:53:55 UTC (rev 29462)
@@ -29,10 +29,49 @@
value in the <EM>base</EM> map, the values assigned these cells in the
<EM>cover</EM> map will be averaged.
-The <B>cover</B> map is n existing raster map layer containing the values
+The <EM>cover</EM> map is an existing raster map layer containing the values
(in the form of cell category values or cell category labels) to be averaged
within each category of the <EM>base</EM> map.
+<H2>NOTES</H2>
+
+The <B>-c</B> option requires that the category label for
+each category in the <EM>cover</EM> map be a valid number,
+integer, or decimal. To be exact, if the first item in the
+label is numeric, then that value is used. Otherwise, zero
+is used. The following table covers all possible cases:
+
+<P>
+<PRE>
+ category value
+ label used by -c
+ ______________________
+ .12 .12
+ .80 KF .8
+ no data 0
+</PRE>
+<P>
+
+(This flag is very similar to the @ operator in
+<EM><A HREF="r.mapcalc.html">r.mapcalc</A></EM>,
+and the user is encouraged to read the manual entry for
+<EM><A HREF="r.mapcalc.html">r.mapcalc</A></EM>
+to see how it works there.)
+
+<P>
+
+The user should use the results of <EM>r.average</EM> with
+care. Since this utility assigns a value to each cell
+which is based on global information (i.e., information at
+spatial locations other than just the location of the cell
+itself), the resultant map layer is only valid if the
+geographic region and mask settings are the same as they
+were at the time that the result map was created.
+
+<P>
+
+Results are affected by the current region settings and mask.
+
<H2>EXAMPLE</H2>
Assume that
@@ -81,45 +120,8 @@
7 .2345
</PRE>
-<H2>NOTES</H2>
-The <B>-c</B> option requires that the category label for
-each category in the <EM>cover</EM> map be a valid number,
-integer, or decimal. To be exact, if the first item in the
-label is numeric, then that value is used. Otherwise, zero
-is used. The following table covers all possible cases:
-<P>
-<PRE>
- category value
- label used by -c
- ______________________
- .12 .12
- .80 KF .8
- no data 0
-</PRE>
-
-<P>
-(This flag is very similar to the @ operator in
-<EM><A HREF="r.mapcalc.html">r.mapcalc</A></EM>,
-and the user is encouraged to read the manual entry for
-<EM><A HREF="r.mapcalc.html">r.mapcalc</A></EM>
-to see how it works there.)
-
-<P>
-
-The user should use the results of <EM>r.average</EM> with
-care. Since this utility assigns a value to each cell
-which is based on global information (i.e., information at
-spatial locations other than just the location of the cell
-itself), the resultant map layer is only valid if the
-geographic region and mask settings are the same as they
-were at the time that the result map was created.
-
-<P>
-
-Results are affected by the current region settings and mask.
-
<H2>SEE ALSO</H2>
<EM><A HREF="g.region.html">g.region</A></EM>,
Modified: grass/branches/releasebranch_6_3/raster/r.buffer/description.html
===================================================================
--- grass/branches/releasebranch_6_3/raster/r.buffer/description.html 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/raster/r.buffer/description.html 2007-12-17 13:53:55 UTC (rev 29462)
@@ -37,14 +37,14 @@
("Continuous" is used in the sense that each category
zone's lower value is the previous zone's upper value. The
first buffer zone always has distance <tt>0</tt> as its lower
-bound.) Distances can be entered in one of five units:
-<EM>meters, kilometers, feet, miles</EM>, and <EM>nautmiles</EM>
+bound.) Buffer distances can be specified using one of five units with the <EM>
+units</EM> parameter: <EM>meters, kilometers, feet, miles</EM>, and <EM>nautmiles</EM>
(nautical miles).
<P>
<!-- ??? is this the real method used or some ancient option ??? -->
Distances from cells containing the user-specified category values
-are calculated using the "fromcell" method. This method goes to each
+are calculated using the "fromcell" method. This method locates each
cell that contains a category value from which distances are to be
calculated, and draws the requested distance rings around
them. This method works very fast when there are few cells
@@ -65,8 +65,12 @@
category values, the user should run (for example)
<EM><A HREF="r.reclass.html">r.reclass</A></EM> prior to
<EM>r.buffer</EM>, to reclass all categories from which distance zones
-are not desired to be calculated into category NULL.
+are not desired to be calculated into category NULL.
+<P>
+The <B>-z</B> flag can be used to ignore raster values of zero instead of NULL
+values in the input raster map.
+<P>
<H2>EXAMPLE</H2>
Modified: grass/branches/releasebranch_6_3/raster/r.gwflow/description.html
===================================================================
--- grass/branches/releasebranch_6_3/raster/r.gwflow/description.html 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/raster/r.gwflow/description.html 2007-12-17 13:53:55 UTC (rev 29462)
@@ -2,14 +2,24 @@
This numerical program calculates transient, confined and
unconfined groundwater flow in two dimensions based on
raster maps and the current region resolution.
-All initial- and boundary-conditions must be provided as
+All initial and boundary conditions must be provided as
raster maps.
-<br>
-<br>
-r.gwflow calculates the piezometric head and optionally the
+
+<p>
+<center>
+<img src=r_gwflow_concept.png border=0><BR>
+<table border=0 width=700>
+<tr><td><center>
+<i>Workflow of r.gwflow</i>
+</center></td></tr>
+</table>
+</center>
+<p>
+
+<em>r.gwflow</em> calculates the piezometric head and optionally the
filter velocity field, based on the hydraulic conductivity and the piezometric head.
The vector components can be visualized with paraview if they are exported
-with r.out.vtk.
+with <em>r.out.vtk</em>.
<br>
<br>
The groundwater flow will always be calculated transient.
@@ -56,7 +66,7 @@
The conjugate gradients (cg) method and the biconjugate gradients-stabilized (bicgstab) method.
Aditionally a direct Gauss solver and LU solver are available. Those direct solvers
only work with normal quadratic matrices, so be careful using them with large maps
-(maps of size 10.000 cells will need more than one gigabyte of ram).
+(maps of size 10.000 cells will need more than one gigabyte of RAM).
Always prefer a sparse matrix solver.
<H2>EXAMPLE</H2>
@@ -97,8 +107,6 @@
#now load the data into paraview
paraview --data=/tmp/gwdata_conf2d.vtk &
paraview --data=/tmp/gwdata_unconf2d.vtk &
-
-
</pre></div>
<H2>SEE ALSO</H2>
Modified: grass/branches/releasebranch_6_3/raster/r.in.gdal/description.html
===================================================================
--- grass/branches/releasebranch_6_3/raster/r.in.gdal/description.html 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/raster/r.in.gdal/description.html 2007-12-17 13:53:55 UTC (rev 29462)
@@ -25,595 +25,59 @@
<a href="http://www.gdal.org/formats_list.html">http://www.gdal.org/formats_list.html</a><P>
Selected formats of more than 40 supported formats:
+<PRE>
-<table border="1">
- <tbody>
- <tr>
- <th>Long Format Name</th>
- <th>Code</th>
- <th>Creation</th>
- <th>Georeferencing</th>
- <th>Maximum file size</th>
- </tr>
- <tr>
- <td> Arc/Info ASCII Grid
- </td>
- <td> AAIGrid
- </td>
- <td> Yes
- </td>
- <td> Yes
- </td>
- <td> No limits
- </td>
- </tr>
- <tr>
- <td> Arc/Info Binary Grid (.adf)
- </td>
- <td> AIG
- </td>
- <td> No
- </td>
- <td> Yes
- </td>
- <td> --
- </td>
- </tr>
- <tr>
- <td> AIRSAR Polarimetric
- </td>
- <td> AIRSAR
- </td>
- <td> No
- </td>
- <td> No
- </td>
- <td> --
- </td>
- </tr>
- <tr>
- <td> Microsoft Windows Device Independent Bitmap (.bmp)
- </td>
- <td> BMP
- </td>
- <td> Yes
- </td>
- <td> Yes
- </td>
- <td> 4GiB
- </td>
- </tr>
- <tr>
- <td> BSB Nautical Chart Format (.kap)
- </td>
- <td> BSB
- </td>
- <td> No
- </td>
- <td> Yes
- </td>
- <td> --
- </td>
- </tr>
- <tr>
- <td> VTP Binary Terrain Format (.bt)
- </td>
- <td> BT
- </td>
- <td> Yes
- </td>
- <td> Yes
- </td>
- <td> --
- </td>
- </tr>
- <tr>
- <td> CEOS (Spot for instance)
- </td>
- <td> CEOS
- </td>
- <td> No
- </td>
- <td> No
- </td>
- <td> --
- </td>
- </tr>
- <tr>
- <td> First Generation USGS DOQ (.doq)
- </td>
- <td> DOQ1
- </td>
- <td> No
- </td>
- <td> Yes
- </td>
- <td> --
- </td>
- </tr>
- <tr>
- <td> New Labelled USGS DOQ (.doq)
- </td>
- <td> DOQ2
- </td>
- <td> No
- </td>
- <td> Yes
- </td>
- <td> --
- </td>
- </tr>
- <tr>
- <td> Military Elevation Data (.dt0, .dt1)
- </td>
- <td> DTED
- </td>
- <td> No
- </td>
- <td> Yes
- </td>
- <td> --
- </td>
- </tr>
- <tr>
- <td> ERMapper Compressed Wavelets (.ecw)
- </td>
- <td> ECW
- </td>
- <td> Yes
- </td>
- <td> Yes
- </td>
- <td><br>
- </td>
- </tr>
- <tr>
- <td> ESRI .hdr Labelled
- </td>
- <td> EHdr
- </td>
- <td> No
- </td>
- <td> Yes
- </td>
- <td> --
- </td>
- </tr>
- <tr>
- <td> ENVI .hdr Labelled Raster
- </td>
- <td> ENVI
- </td>
- <td> Yes
- </td>
- <td> Yes
- </td>
- <td> No limits
- </td>
- </tr>
- <tr>
- <td> Envisat Image Product (.n1)
- </td>
- <td> Envisat
- </td>
- <td> No
- </td>
- <td> No
- </td>
- <td> --
- </td>
- </tr>
- <tr>
- <td> EOSAT FAST Format
- </td>
- <td> FAST
- </td>
- <td> No
- </td>
- <td> Yes
- </td>
- <td> --
- </td>
- </tr>
- <tr>
- <td> FITS (.fits)
- </td>
- <td> FITS
- </td>
- <td> Yes
- </td>
- <td> No
- </td>
- <td><br>
- </td>
- </tr>
- <tr>
- <td> Graphics Interchange Format (.gif)
- </td>
- <td> GIF
- </td>
- <td> Yes
- </td>
- <td> No
- </td>
- <td> 2GB
- </td>
- </tr>
- <tr>
- <td> Arc/Info Binary Grid (.adf)
- </td>
- <td> GIO
- </td>
- <td> Yes
- </td>
- <td> Yes
- </td>
- <td><br>
- </td>
- </tr>
- <tr>
- <td> GRASS Rasters
- </td>
- <td> GRASS
- </td>
- <td> No
- </td>
- <td> Yes
- </td>
- <td> --
- </td>
- </tr>
- <tr>
- <td> TIFF / GeoTIFF (.tif)
- </td>
- <td> GTiff
- </td>
- <td> Yes
- </td>
- <td> Yes
- </td>
- <td> 4GiB
- </td>
- </tr>
- <tr>
- <td> Hierarchical Data Format Release 4 (HDF4)
- </td>
- <td> HDF4
- </td>
- <td> Yes
- </td>
- <td> Yes
- </td>
- <td> 2GiB
- </td>
- </tr>
- <tr>
- <td> Erdas Imagine (.img)
- </td>
- <td> HFA
- </td>
- <td> Yes
- </td>
- <td> Yes
- </td>
- <td> No limits
- </td>
- </tr>
- <tr>
- <td> Atlantis MFF2e
- </td>
- <td> HKV
- </td>
- <td> Yes
- </td>
- <td> Yes
- </td>
- <td> No limits
- </td>
- </tr>
- <tr>
- <td> Image Display and Analysis (WinDisp)
- </td>
- <td> IDA
- </td>
- <td> Yes
- </td>
- <td> Yes
- </td>
- <td> 2GB
- </td>
- </tr>
- <tr>
- <td> ILWIS Raster Map (.mpr,.mpl)
- </td>
- <td> ILWIS
- </td>
- <td> Yes
- </td>
- <td> Yes
- </td>
- <td> --
- </td>
- </tr>
- <tr>
- <td> Japanese DEM (.mem)
- </td>
- <td> JDEM
- </td>
- <td> No
- </td>
- <td> Yes
- </td>
- <td> --
- </td>
- </tr>
- <tr>
- <td> JPEG JFIF (.jpg)
- </td>
- <td> JPEG
- </td>
- <td> Yes
- </td>
- <td> Yes
- </td>
- <td> 4GiB (max dimentions 65500x65500)
- </td>
- </tr>
- <tr>
- <td> JPEG2000 (.jp2, .j2k)
- </td>
- <td> JPEG2000
- </td>
- <td> Yes
- </td>
- <td> Yes
- </td>
- <td> 2GiB
- </td>
- </tr>
- <tr>
- <td> JPEG2000 (.jp2, .j2k)
- </td>
- <td> JP2KAK
- </td>
- <td> Yes
- </td>
- <td> Yes
- </td>
- <td> No limits
- </td>
- </tr>
- <tr>
- <td> NOAA Polar Orbiter Level 1b Data Set (AVHRR)
- </td>
- <td> L1B
- </td>
- <td> No
- </td>
- <td> Yes
- </td>
- <td> --
- </td>
- </tr>
- <tr>
- <td> Erdas 7.x .LAN and .GIS
- </td>
- <td> LAN
- </td>
- <td> No
- </td>
- <td> Yes
- </td>
- <td> 2GB
- </td>
- </tr>
- <tr>
- <td> In Memory Raster
- </td>
- <td> MEM
- </td>
- <td> Yes
- </td>
- <td> Yes
- </td>
- <td> 2GiB
- </td>
- </tr>
- <tr>
- <td> Atlantis MFF
- </td>
- <td> MFF
- </td>
- <td> Yes
- </td>
- <td> Yes
- </td>
- <td> No limits
- </td>
- </tr>
- <tr>
- <td> Multi-resolution Seamless Image Database
- </td>
- <td> MrSID
- </td>
- <td> No
- </td>
- <td> Yes
- </td>
- <td> --
- </td>
- </tr>
- <tr>
- <td> NDF
- </td>
- <td> NLAPS Data Format
- </td>
- <td> No
- </td>
- <td> Yes
- </td>
- <td> No limits
- </td>
- </tr>
- <tr>
- <td> NITF
- </td>
- <td> NITF
- </td>
- <td> Yes
- </td>
- <td> Yes
- </td>
- <td><br>
- </td>
- </tr>
- <tr>
- <td> NetCDF
- </td>
- <td> netCDF
- </td>
- <td> Yes
- </td>
- <td> Yes
- </td>
- <td> 2GB
- </td>
- </tr>
- <tr>
- <td> OGDI Bridge
- </td>
- <td> OGDI
- </td>
- <td> No
- </td>
- <td> Yes
- </td>
- <td> --
- </td>
- </tr>
- <tr>
- <td> PCI .aux Labelled
- </td>
- <td> PAux
- </td>
- <td> Yes
- </td>
- <td> No
- </td>
- <td> No limits
- </td>
- </tr>
- <tr>
- <td> PCI Geomatics Database File
- </td>
- <td> PCIDSK
- </td>
- <td> Yes
- </td>
- <td> Yes
- </td>
- <td> No limits
- </td>
- </tr>
- <tr>
- <td> Portable Network Graphics (.png)
- </td>
- <td> PNG
- </td>
- <td> Yes
- </td>
- <td> No
- </td>
- <td><br>
- </td>
- </tr>
- <tr>
- <td> PCRaster (.map)
- </td>
- <td> PCRaster
- </td>
- <td> Yes
- </td>
- <td> No
- </td>
- <td><br>
- </td>
- </tr>
- <tr>
- <td> Netpbm (.ppm,.pgm)
- </td>
- <td> PNM
- </td>
- <td> Yes
- </td>
- <td> No
- </td>
- <td> No limits
- </td>
- </tr>
- <tr>
- <td> RadarSat2 XML (product.xml)
- </td>
- <td> RS2
- </td>
- <td> No
- </td>
- <td> Yes
- </td>
- <td> 4GB
- </td>
- </tr>
- <tr>
- <td> USGS SDTS DEM (*CATD.DDF)
- </td>
- <td> SDTS
- </td>
- <td> No
- </td>
- <td> Yes
- </td>
- <td> --
- </td>
- </tr>
- <tr>
- <td> SAR CEOS
- </td>
- <td> SAR_CEOS
- </td>
- <td> No
- </td>
- <td> Yes
- </td>
- <td> --
- </td>
- </tr>
- <tr>
- <td> USGS ASCII DEM (.dem)
- </td>
- <td> USGSDEM
- </td>
- <td> No
- </td>
- <td> Yes
- </td>
- <td> --
- </td>
- </tr>
- <tr>
- <td> X11 Pixmap (.xpm)
- </td>
- <td> XPM
- </td>
- <td> Yes
- </td>
- <td> No
- </td>
- <td><br>
- </td>
- </tr>
- </tbody>
-</table>
+Long Format Name Code Creation Georeferencing Maximum File Size
+Arc/Info ASCII Grid AAIGrid Yes Yes No limits
+Arc/Info Binary Grid AIG No Yes --
+AIRSAR Polarimetric AIRSAR No No --
+Microsoft Windows Device Independent Bitmap (.bmp) BMP Yes Yes 4GiB
+BSB Nautical Chart Format (.kap) BSB No Yes --
+VTP Binary Terrain Format (.bt) BT Yes Yes --
+CEOS (Spot for instance) CEOS No No --
+First Generation USGS DOQ (.doq) DOQ1 No Yes --
+New Labelled USGS DOQ (.doq) DOQ2 No Yes --
+Data (.dt0, .dt1) DTED No Yes --
+ERMapper Compressed Wavelets (.ecw) ECW Yes Yes
+ESRI .hdr Labelled EHdr No Yes --
+ENVI .hdr Labelled Raster ENVI Yes Yes No limits
+Envisat Image Product (.n1) Envisat No No --
+EOSAT FAST Format FAST No Yes --
+FITS (.fits) FITS Yes No
+Graphics Interchange Format (.gif) GIF Yes No 2GB
+Arc/Info Binary Grid (.adf) GIO Yes Yes
+GRASS Rasters GRASS No Yes --
+TIFF / GeoTIFF (.tif) GTiff Yes Yes 4GiB
+Hierarchical Data Format Release 4 (HDF4) HDF4 Yes Yes 2GiB
+Erdas Imagine (.img) HFA Yes Yes No limits
+Atlantis MFF2e HKV Yes Yes No limits
+Image Display and Analysis (WinDisp) IDA Yes Yes 2GB
+ILWIS Raster Map (.mpr,.mpl) ILWIS Yes Yes --
+Japanese DEM (.mem) JDEM No Yes --
+JPEG JFIF (.jpg) JPEG Yes Yes 4GiB (max dimentions 65500x65500)
+JPEG2000 (.jp2, .j2k) JPEG2000 Yes Yes 2GiB
+JPEG2000 (.jp2, .j2k) JP2KAK Yes Yes No limits
+NOAA Polar Orbiter Level 1b Data Set (AVHRR) L1B No Yes --
+Erdas 7.x .LAN and .GIS LAN No Yes 2GB
+In Memory Raster MEM Yes Yes 2GiB
+Atlantis MFF MFF Yes Yes No limits
+Multi-resolution Seamless Image Database MrSID No Yes --
+NDF NLAPS Data Format No Yes No limits
+NITF NITF Yes Yes
+NetCDF netCDF Yes Yes 2GB
+OGDI Bridge OGDI No Yes --
+PCI .aux Labelled PAux Yes No No limits
+PCI Geomatics Database File PCIDSK Yes Yes No limits
+Portable Network Graphics (.png) PNG Yes No
+PCRaster (.map) PCRaster Yes No
+Netpbm (.ppm,.pgm) PNM Yes No No limits
+RadarSat2 XML (product.xml) RS2 No Yes 4GB
+USGS SDTS DEM (*CATD.DDF) SDTS No Yes --
+SAR CEOS SAR_CEOS No Yes --
+USGS ASCII DEM (.dem) USGSDEM No Yes --
+X11 Pixmap (.xpm) XPM Yes No
+</PRE>
<H2>Location Creation</H2>
<B>r.in.gdal</B> attempts to preserve projection information when importing
Modified: grass/branches/releasebranch_6_3/raster/r.le/r.le.setup/sample.c
===================================================================
--- grass/branches/releasebranch_6_3/raster/r.le/r.le.setup/sample.c 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/raster/r.le/r.le.setup/sample.c 2007-12-17 13:53:55 UTC (rev 29462)
@@ -22,11 +22,12 @@
#include <stdlib.h>
#include <grass/gis.h>
-#include <grass/site.h>
-#include "setup.h"
+#include <grass/Vect.h>
#include <grass/config.h>
#include <grass/raster.h>
#include <grass/display.h>
+#include <grass/glocale.h>
+#include "setup.h"
static int calc_unit_loc (double radius, int top, int bot, int left, int right,
@@ -729,13 +730,16 @@
int *sites, double startx, int starty, int fmask,
double nx, double x, double y)
{
- char *sites_mapset, sites_file_name[GNAME_MAX], *desc, *cmd;
- FILE *sites_fp;
+ char *sites_mapset, sites_file_name[GNAME_MAX], *cmd;
+ struct Map_info Map;
struct Cell_head region;
- double east_coord, north_coord, D_u_to_a_col(), D_u_to_a_row();
+ double D_u_to_a_col(), D_u_to_a_row();
int i, j, k, cnt=0, w_w = right - left, w_l = bot - top, exp1, exp2,
dx = w_w, dy = w_l, l, t, left1 = left, top1 = top, n, tmp,
ulrow, ulcol, *row_buf, lap=0;
+ static struct line_pnts *Points;
+ struct line_cats *Cats;
+ int ltype;
/* VARIABLES:
UNITS FOR ALL DIMENSION VARIABLES IN THIS ROUTINE ARE IN PIXELS
@@ -914,26 +918,34 @@
/* for centered over sites */
else if (method==5){
- sites_mapset=G_ask_sites_old(" Enter name of site map", sites_file_name) ;
+ sites_mapset = G_ask_vector_old(" Enter name of vector points map", sites_file_name);
if (sites_mapset == NULL) {
G_system("d.frame -e");
exit(0);
}
- if ((sites_fp = G_fopen_sites_old(sites_file_name,sites_mapset)) == NULL) {
- fprintf(stderr, "\n Can't open sites file %s\n",sites_file_name);
+ Vect_open_old(&Map, sites_file_name, sites_mapset);
+/* fprintf(stderr, "\n Can't open vector points file %s\n", sites_file_name); */
- }
*sites = 0;
i = 0;
n = 0;
- while( G_get_site(sites_fp,&east_coord,&north_coord,&desc) > 0) {
- ulcol = ((int)(D_u_to_a_col(east_coord))) + 1 - u_w/2;
- ulrow = ((int)(D_u_to_a_row(north_coord))) + 1 - u_l/2;
+ Points = Vect_new_line_struct(); /* init line_pnts struct */
+ Cats = Vect_new_cats_struct();
+
+ while (1) {
+ ltype = Vect_read_next_line (&Map, Points, Cats);
+ if ( ltype == -1 ) G_fatal_error(_("Cannot read vector"));
+ if ( ltype == -2 ) break; /* EOF */
+ /* point features only. (GV_POINTS is pts AND centroids, GV_POINT is just pts) */
+ if (!(ltype & GV_POINT)) continue;
+
+ ulcol = ((int)(D_u_to_a_col(Points->x[0]))) + 1 - u_w/2;
+ ulrow = ((int)(D_u_to_a_row(Points->y[0]))) + 1 - u_l/2;
if (ulcol <= left || ulrow <= top || ulcol+u_w-1 > right || ulrow+u_l-1 > bot) {
fprintf(stderr, " No sampling unit over site %d at east=%8.1f north=%8.1f\n",
- n+1,east_coord,north_coord);
+ n+1, Points->x[0], Points->y[0]);
fprintf(stderr, " as it would extend outside the map\n");
}
@@ -954,6 +966,10 @@
G_system(cmd);
G_free (cmd);
+ Vect_close(&Map);
+ G_free(Points);
+ G_free(Cats);
+
}
return 1;
Modified: grass/branches/releasebranch_6_3/raster/r.los/description.html
===================================================================
--- grass/branches/releasebranch_6_3/raster/r.los/description.html 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/raster/r.los/description.html 2007-12-17 13:53:55 UTC (rev 29462)
@@ -72,7 +72,17 @@
echo "symbol extra/target 25 598869 4916642 red" | d.graph -m
</pre></div>
+<H2>TODO</H2>
+Rewrite using ideas from <em>r.cva</em> and a method which scales better
+to large regions.<BR>A suggested method is detailed in:<BR>
+Izraelevitz, David (USACE).<BR>
+'A Fast Algorithm for Approximate Viewshed Computation'<BR>
+<i>Photogrammetric Engineering & Remote Sensing</i>, July 2003
+<!-- http://article.gmane.org/gmane.comp.gis.grass.devel/1781
+ Post by Paul Kelly 2003-08-13 to grass-dev,
+ "Re: [bug #2061] (grass) r.los needs FP update" -->
+
<H2>SEE ALSO</H2>
<EM><A HREF="g.region.html">g.region</A></EM>
Modified: grass/branches/releasebranch_6_3/raster/r.report/description.html
===================================================================
--- grass/branches/releasebranch_6_3/raster/r.report/description.html 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/raster/r.report/description.html 2007-12-17 13:53:55 UTC (rev 29462)
@@ -87,7 +87,9 @@
<A HREF="r.coin.html">r.coin</A>,
<A HREF="r.describe.html">r.describe</A>,
<A HREF="r.info.html">r.info</A>,
-<A HREF="r.stats.html">r.stats</A></EM>
+<A HREF="r.stats.html">r.stats</A>,
+<A HREF="r.univar.html">r.univar</A>
+</EM>
<H2>AUTHOR</H2>
Michael Shapiro,
Modified: grass/branches/releasebranch_6_3/raster/r.resamp.rst/description.html
===================================================================
--- grass/branches/releasebranch_6_3/raster/r.resamp.rst/description.html 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/raster/r.resamp.rst/description.html 2007-12-17 13:53:55 UTC (rev 29462)
@@ -10,10 +10,11 @@
All resulting raster maps are created using the settings of the current
region (which may be different from that of the <i>input</i> raster map).
<p>
-Optionally, and simultaneously with interpolation, the topographic parameters
-slope, aspect, profile curvature (measured in the direction of steepest
+Optionally, and simultaneously with interpolation, topographic parameters
+are computed from an input raster map containing z-values of elevation/depth: slope,
+aspect, profile curvature (measured in the direction of steepest
slope), tangential curvature (measured in the direction of a tangent to
-contour line) and/or mean curvature are computed and saved as raster maps
+contour line) and/or mean curvature are computed from and saved as raster maps
as specified by the options <i>slope, aspect, pcurv, tcurv, mcurv</i> respectively.
<p>
If the <i>-d</i> flag is set the program outputs partial derivatives fx, fy,
Modified: grass/branches/releasebranch_6_3/raster/r.statistics/description.html
===================================================================
--- grass/branches/releasebranch_6_3/raster/r.statistics/description.html 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/raster/r.statistics/description.html 2007-12-17 13:53:55 UTC (rev 29462)
@@ -1,9 +1,14 @@
<H2>DESCRIPTION</H2>
-<EM>r.statistics</EM> is a tool, where different class, resp. object
-oriented statistical analysis methods are possible (called "zonal statistics"
-in some GIS). As data preparation, all areas of contiguous cell category values
-can be clumped with <EM>r.clump</EM>.
+<EM>r.statistics</EM> is a tool to analyse exploratory statistics of a "cover
+layer" according to how it intersects with objects in a "base layer". A
+variety of standard statistical measures are possible (called "zonal statistics"
+in some GIS).
+
+All cells in the base layer are considered one object for the analysis. For
+some applications, one will first want to prepare the input data so that
+all areas of contiguous cell category values in the base layer are uniquely
+identified, which can be done with <EM>r.clump</EM>.
<BR>
The available methods are the following (english - german):
@@ -22,8 +27,8 @@
<li>sum - Summe</li>
</ul>
-The calculations will be performed for areas with data of the
-covering-layers which belong in the base-layer o the same category.
+The calculations will be performed on each area of data of the
+cover layers which fall within each unique value, or category, of the base layer.
<P>
Setting the <EM>-c</EM> flag the category lables of the covering raster
layer will be used. This is nice to avoid the GRASS limitation to interger
@@ -31,17 +36,19 @@
stored.
<P>
-The output-layer is a reclassified version of the base-layer with identical
-category values. The results of the calculations are stored in the category
-labels of the output-layer.
+All calculations except "distribution" create an output layer. The output
+layer is a reclassified version of the base layer with identical
+category values, but modified category labels - the results of the calculations
+are stored in the category labels of the output layer.
<P>
-The described output is valid for all calculations with exception of
-distribution. Here the output is given to stdout. A file name eventually
-specified will be ignored. The result will be a table with three columns.
-In the 1. column are the category values of the base-layer (a), in the 2.
-column the associated value of the cover-Layers (b) and in the 3. column the
-percentage of b from a. Example:
+For distributions, the output is printed to the user interface (stdout).
+If an output file name was specified, it will be ignored. The result will
+be a text table with three columns.
+In the first column are the category values of the base layer (a), in the second
+column the associated value of the cover layers (b), and in the third column the
+percentage of area in that base layer category (a) that falls into that row's
+value in the cover layer(b). Example:
<div class="code"><pre>
1 124 23
@@ -56,6 +63,9 @@
.
</pre></div>
+So for the first line in the output above, we see that 23% of the cells of the
+base layer category 1 have a value of 124 in the cover layer.
+
To transfer the values stored as category labels into cell values,
<em>r.mapcalc</em> can be used ('@' operator).
@@ -77,7 +87,9 @@
<A HREF="r.mode.html">r.mode</A>,
<A HREF="r.median.html">r.median</A>,
<A HREF="r.mapcalc.html">r.mapcalc</A>,
-<A HREF="r.neighbors.html">r.neighbors</A>
+<A HREF="r.neighbors.html">r.neighbors</A>,
+<A HREF="r.univar.html">r.univar</A>
+<A HREF="r.cats">r.cats</A>
</EM>
<H2>AUTHOR</H2>
Modified: grass/branches/releasebranch_6_3/raster/r.stats/description.html
===================================================================
--- grass/branches/releasebranch_6_3/raster/r.stats/description.html 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/raster/r.stats/description.html 2007-12-17 13:53:55 UTC (rev 29462)
@@ -79,7 +79,8 @@
<A HREF="r.coin.html">r.coin</A>,
<A HREF="r.describe.html">r.describe</A>,
<A HREF="r.report.html">r.report</A>,
-<A HREF="r.statistics.html">r.statistics</A>
+<A HREF="r.statistics.html">r.statistics</A>,
+<A HREF="r.univar.html">r.univar</A>
</EM>
<H2>AUTHOR</H2>
Modified: grass/branches/releasebranch_6_3/scripts/d.monsize/d.monsize
===================================================================
--- grass/branches/releasebranch_6_3/scripts/d.monsize/d.monsize 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/scripts/d.monsize/d.monsize 2007-12-17 13:53:55 UTC (rev 29462)
@@ -6,21 +6,22 @@
# AUTHOR(S): Unknown;
# updated to GRASS 5.7 by Michael Barton (michael.barton at asu.edu)
# PURPOSE: selects/starts specified monitor at specified window size
-# COPYRIGHT: (C) 2004 by the GRASS Development Team
+# COPYRIGHT: (C) 2004-2007 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.
#
#############################################################################
-
-
# NOTE: This is based on the output pattern of d.mon -p
# Anantha Prasad <aprasad/ne_de at fs.fed.us>
#
# Version 1: Author?. Tue, 25 Jan 2000 10:31:37
+#### PLEASE REMOVE "SET" FROM OPTION NAMES FOR GRASS 7
+#### (if this module is even used there; if so merge with d.resize)
+
#%Module
#% description: Selects/starts specified monitor at specified size
#% keywords: display, setup
@@ -46,7 +47,6 @@
#%end
-
if test -z "$GISBASE"; then
echo "You must be in GRASS GIS to run this program." >&2
exit 1
@@ -56,6 +56,12 @@
exec g.parser "$0" "$@"
fi
+#### check if we have awk
+if [ ! -x "`which awk`" ] ; then
+ g.message -e "awk required, please install awk/gawk first"
+ exit 1
+fi
+
GRASS_WIDTH=$GIS_OPT_SETWIDTH
export GRASS_WIDTH
GRASS_HEIGHT=$GIS_OPT_SETHEIGHT
@@ -63,32 +69,31 @@
# Check the current status of the monitor
-st1=`d.mon -p| sed s/'No monitor currently selected for output'//`
-st2=`echo $st1 | cut -d ":" -f2`
+OPEN_MON=`d.mon -p | grep ':' | cut -d':' -f2 | awk '{print $1}'`
-# STrip leading blanks
-st3=`echo $st2|perl -pne 's/^\s+//g'`
-if [ -z "$st3" ]
-then
+if [ -z "$OPEN_MON" ] ; then
# No monitor running so start a new one....
- g.message "No monitor selected"
- g.message "Starting monitor $GIS_OPT_SETMONITOR of size ${GIS_OPT_SETWIDTH}X${GIS_OPT_SETHEIGHT} ..."
- d.mon start=$GIS_OPT_SETMONITOR
+ g.message -v "No monitor selected"
+ g.message "Starting monitor $GIS_OPT_SETMONITOR at ${GIS_OPT_SETWIDTH}X${GIS_OPT_SETHEIGHT} ..."
+ d.mon start=$GIS_OPT_SETMONITOR
else
- if [ "$GIS_OPT_SETMONITOR" = "$st3" ]
- then
+ if [ "$GIS_OPT_SETMONITOR" = "$OPEN_MON" ] ; then
# Monitor is already running...stop it and start new one
+ g.message -v "Monitor already running and selected"
+ g.message "Restarting monitor $GIS_OPT_SETMONITORAT at ${GIS_OPT_SETWIDTH}X${GIS_OPT_SETHEIGHT} ..."
+# d.save > tmp file then source the tmp file to restore after the new mon is opened?
+# (just use d.resize instead)
d.mon stop=$GIS_OPT_SETMONITOR
- g.message "Monitor already running and selected"
- g.message "Restarting monitor $GIS_OPT_SETMONITORAT size ${GIS_OPT_SETWIDTH}X${GIS_OPT_SETHEIGHT} ..."
+# why the sleep?
sleep 4
d.mon start=$GIS_OPT_SETMONITOR
else
- g.message "A different monitor is selected"
- g.message "Selecting and restarting monitor ${GIS_OPT_SETWIDTH}X${GIS_OPT_SETHEIGHT} ..."
+ g.message -v "A different monitor is selected"
+ g.message "Selecting and restarting monitor at ${GIS_OPT_SETWIDTH}X${GIS_OPT_SETHEIGHT} ..."
#d.mon select=$GIS_OPT_SETMONITOR
d.mon stop=$GIS_OPT_SETMONITOR
+# why the sleep?
sleep 4
d.mon start=$GIS_OPT_SETMONITOR
fi
Modified: grass/branches/releasebranch_6_3/scripts/r.in.wms/description.html
===================================================================
--- grass/branches/releasebranch_6_3/scripts/r.in.wms/description.html 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/scripts/r.in.wms/description.html 2007-12-17 13:53:55 UTC (rev 29462)
@@ -65,7 +65,8 @@
g.region res=90 -ap
g.region save=panhandle-90ft
-r.in.wms output=elevation_feet mapserver=http://wms.jpl.nasa.gov/wms.cgi layers=us_ned styles=feet_real -o region=panhandle-90ft
+r.in.wms output=elevation_feet mapserver=http://wms.jpl.nasa.gov/wms.cgi \
+ layers=us_ned styles=feet_real -o region=panhandle-90ft
</pre></div>
Downloads real number feet elevation from OnEarth to cover the current
Modified: grass/branches/releasebranch_6_3/scripts/r.in.wms/r.in.wms
===================================================================
--- grass/branches/releasebranch_6_3/scripts/r.in.wms/r.in.wms 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/scripts/r.in.wms/r.in.wms 2007-12-17 13:53:55 UTC (rev 29462)
@@ -122,7 +122,6 @@
#% type: string
#% description: Additional options for r.tileset
#% required : no
-#% guisection: Request
#%end
#%option
#% key: region
Modified: grass/branches/releasebranch_6_3/scripts/r.regression.line/description.html
===================================================================
--- grass/branches/releasebranch_6_3/scripts/r.regression.line/description.html 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/scripts/r.regression.line/description.html 2007-12-17 13:53:55 UTC (rev 29462)
@@ -4,8 +4,8 @@
according to the formula y = a + b*x, where x and y represent raster maps.
Optionally saves regression coefficients to an ASCII file.
The result includes the following coefficients:
-offset (a) and gain (b), residuals (R),
-number of elements (N), medians (medX, medY), standard deviations
+offset/intercept (a) and gain/slope (b), residuals (R),
+number of elements (N), means (medX, medY), standard deviations
(sdX, sdY), and the F test for testing the significance of the
regression model as a whole (F).
<br>
Modified: grass/branches/releasebranch_6_3/scripts/r.regression.line/r.regression.line
===================================================================
--- grass/branches/releasebranch_6_3/scripts/r.regression.line/r.regression.line 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/scripts/r.regression.line/r.regression.line 2007-12-17 13:53:55 UTC (rev 29462)
@@ -115,7 +115,7 @@
echo " b: gain"
echo " R: sumXY - sumX*sumY/tot"
echo " N: number of elements"
- echo " medX, medY: Medians"
+ echo " medX, medY: Means"
echo " sdX, sdY: Standard deviations"
echo "a b R N F medX sdX medY sdY"
RESULTADO=`cat "$TMP"b`
@@ -130,7 +130,7 @@
echo " b: gain" >> "$TMP"c
echo " R: sumXY - sumX*sumY/tot" >> "$TMP"c
echo " N: number of elements" >> "$TMP"c
- echo " medX, medY: Medians" >> "$TMP"c
+ echo " medX, medY: Means" >> "$TMP"c
echo " sdX, sdY: Standard deviations" >> "$TMP"c
echo "a b R N F medX sdX medY sdY" >> "$TMP"c
cat "$TMP"b >> "$TMP"c
Modified: grass/branches/releasebranch_6_3/scripts/r.shaded.relief/r.shaded.relief
===================================================================
--- grass/branches/releasebranch_6_3/scripts/r.shaded.relief/r.shaded.relief 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/scripts/r.shaded.relief/r.shaded.relief 2007-12-17 13:53:55 UTC (rev 29462)
@@ -158,13 +158,13 @@
#LatLong locations only:
if [ "$GIS_OPT_UNITS" = "meters" ] ; then
#scale=111120
- scale=`echo $scale | awk '{printf("%f", $1 * 111120 )}'`
+ scale=`echo $scale | awk '{printf("%f", $1 * 1852*60 )}'`
fi
#LatLong locations only:
if [ "$GIS_OPT_UNITS" = "feet" ] ; then
- #scale=370400
- scale=`echo $scale | awk '{printf("%f", $1 * 370400 )}'`
+ #scale=364567.2
+ scale=`echo $scale | awk '{printf("%f", $1 * 6076.12*60 )}'`
fi
#correct azimuth to East (GRASS convention):
Modified: grass/branches/releasebranch_6_3/scripts/v.rast.stats/v.rast.stats
===================================================================
--- grass/branches/releasebranch_6_3/scripts/v.rast.stats/v.rast.stats 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/scripts/v.rast.stats/v.rast.stats 2007-12-17 13:53:55 UTC (rev 29462)
@@ -36,6 +36,13 @@
#% required : yes
#%End
#%option
+#% key: layer
+#% type: integer
+#% description: Layer to which the table to be changed is connected
+#% answer: 1
+#% required : no
+#%end
+#%option
#% key: raster
#% type: string
#% key_desc: name
@@ -195,6 +202,12 @@
DB_SQLDRIVER=`v.db.connect -g "$VECTOR" | cut -d' ' -f5`
DB_DATABASE="`v.db.connect -g "$VECTOR" | cut -d' ' -f4`"
+#Find out which table is linked to the vector map on the given layer
+TABLE=`v.db.connect $VECTOR -g | grep -w $GIS_OPT_LAYER | awk '{print $2}'`
+if [ -z "$TABLE" ] ; then
+ g.message -e 'There is no table connected to this map! Run v.db.connect or v.db.addtable first.'
+ exit 1
+fi
BASECOLS="n min max range mean stddev variance cf_var sum"
@@ -291,7 +304,7 @@
colname="${COLPREFIX}_${var}"
fi
- echo "UPDATE $VECTOR SET ${colname}=${value} WHERE cat=$i;" >> "$SQLTMP"
+ echo "UPDATE $TABLE SET ${colname}=${value} WHERE cat=$i;" >> "$SQLTMP"
done
CURRNUM=`expr $CURRNUM + 1`
Modified: grass/branches/releasebranch_6_3/scripts/v.report/v.report
===================================================================
--- grass/branches/releasebranch_6_3/scripts/v.report/v.report 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/scripts/v.report/v.report 2007-12-17 13:53:55 UTC (rev 29462)
@@ -49,7 +49,7 @@
#%option
#% key: units
#% type: string
-#% description: mi(les),f(eet),me(ters),k(ilometers),a(cres),h(ectares)
+#% description: mi(les),f(eet),me(ters),k(ilometers),a(cres),h(ectares),p(ercent)
#% options: mi,miles,f,feet,me,meters,k,kilometers,a,acres,h,hectares,p,percent
#% required: no
#%end
@@ -130,7 +130,7 @@
fi
#check for optional units parameter:
-if [ ! -z $GIS_OPT_UNITS ] ; then
+if [ -n "$GIS_OPT_UNITS" ] ; then
UNITSPARAM="units=$GIS_OPT_UNITS"
# reset to meters since percent are unsupported in v.to.db
if [ "$GIS_OPT_UNITS" = "p" -o "$GIS_OPT_UNITS" = "percent" ] ; then
@@ -171,7 +171,7 @@
NUMCOLS=`echo "$COLNAMES$EXTRACOLNAMES" | tr -s '|' ' ' | wc -w | awk '{print $1}'`
# calculate percents if requested
-if [ ! -z $GIS_OPT_UNITS ] ; then
+if [ -n "$GIS_OPT_UNITS" ] ; then
if [ "$GIS_OPT_UNITS" = "p" -o "$GIS_OPT_UNITS" = "percent" ] ; then
# calculate total area value
Modified: grass/branches/releasebranch_6_3/swig/perl/Makefile.PL.in
===================================================================
--- grass/branches/releasebranch_6_3/swig/perl/Makefile.PL.in 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/swig/perl/Makefile.PL.in 2007-12-17 13:53:55 UTC (rev 29462)
@@ -16,7 +16,7 @@
WriteMakefile(
NAME => 'Grass',
- LIBS => "-L$grass_lib_dir -lgrass_datetime -lgrass_gis -lgrass_gmath -lgrass_linkm -lgrass_raster -lgrass_bitmap -lgrass_btree -lgrass_display -lgrass_D -lgrass_dbmibase -lgrass_dbmiclient -lgrass_dbstubs -lgrass_dbmidriver -lgrass_sqlp -lgrass_vask -lgrass_edit -lgrass_shape -lgrass_form -lgrass_I -lgrass_gproj -lgrass_rowio -lgrass_segment -lgrass_rtree -lgrass_dgl -lgrass_dig2 -lgrass_vect -lgrass_trans -lgrass_sites -lgrass_interpdata -lgrass_qtree -lgrass_interpfl -lgrass_g3d -lgrass_dspf -lgrass_symb -lgrass_cdhc -lgrass_ogsf -lgrass_Iortho $xlib",
+ LIBS => "-L$grass_lib_dir -lgrass_datetime -lgrass_gis -lgrass_gmath -lgrass_linkm -lgrass_raster -lgrass_bitmap -lgrass_btree -lgrass_display -lgrass_dbmibase -lgrass_dbmiclient -lgrass_dbstubs -lgrass_dbmidriver -lgrass_sqlp -lgrass_vask -lgrass_edit -lgrass_shape -lgrass_form -lgrass_I -lgrass_gproj -lgrass_rowio -lgrass_segment -lgrass_rtree -lgrass_dgl -lgrass_dig2 -lgrass_vect -lgrass_trans -lgrass_sites -lgrass_interpdata -lgrass_qtree -lgrass_interpfl -lgrass_g3d -lgrass_dspf -lgrass_symb -lgrass_cdhc -lgrass_ogsf -lgrass_Iortho $xlib",
OBJECT => 'grass_wrap.o R_slope_aspect/r_slope_aspect/opennew.o R_slope_aspect/r_slope_aspect/r_slope_aspect.o',
INC => "-I$grass_inc_dir"
);
Modified: grass/branches/releasebranch_6_3/swig/perl/R_slope_aspect/r_slope_aspect/r_slope_aspect.c
===================================================================
--- grass/branches/releasebranch_6_3/swig/perl/R_slope_aspect/r_slope_aspect/r_slope_aspect.c 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/swig/perl/R_slope_aspect/r_slope_aspect/r_slope_aspect.c 2007-12-17 13:53:55 UTC (rev 29462)
@@ -369,7 +369,7 @@
&& dxx_name == NULL && dyy_name == NULL && dxy_name == NULL)
{
G_warning("You must specify at least one of the parameters:"
- "\n<%s>, <%s>, <%s>, <%s>, <%s>, <%s>, <%s>, <%s>, or <%s>\n",
+ "\n<%s>, <%s>, <%s>, <%s>, <%s>, <%s>, <%s>, <%s> or <%s>.\n",
parm.slope->key, parm.aspect->key, parm.pcurv->key,
parm.tcurv->key, parm.dx->key, parm.dy->key,
parm.dxx->key, parm.dyy->key, parm.dxy->key);
@@ -380,7 +380,7 @@
/* check elevation file existence */
mapset = G_find_cell2(elev_name, "");
if (!mapset)
- G_fatal_error (_("elevation file [%s] not found"), elev_name);
+ G_fatal_error (_("Raster map <%s> not found"), elev_name);
/* set the window from the header for the elevation file */
if (!flag.a->answer)
@@ -431,7 +431,7 @@
/* give warning if location units are different from meters and zfactor=1*/
factor = G_database_units_to_meters_factor();
if (factor != 1.0)
- G_warning("converting units to meters, factor=%.6f", factor);
+ G_warning("Converting units to meters, factor=%.6f", factor);
G_begin_distance_calculations();
north = G_row_to_northing(0.5, &window);
@@ -1032,7 +1032,7 @@
G_percent (row, nrows, 2);
G_close_cell (elevation_fd);
- G_message(_("Creating support files"));
+ G_message(_("Creating support files..."));
G_message(_("Elevation products for mapset [%s] in [%s]"),
G_mapset(), G_location());
@@ -1050,9 +1050,9 @@
G_quantize_fp_map_range(aspect_name, G_mapset(), 0., 360., 0, 360);
G_read_raster_cats (aspect_name, G_mapset(), &cats);
- G_set_raster_cats_title ("aspect counterclockwise in degrees from east", &cats);
+ G_set_raster_cats_title ("Aspect counterclockwise in degrees from east", &cats);
- G_message(_("min computed aspect %.4f max computed aspect %.4f"), min_asp, max_asp);
+ G_message(_("Min computed aspect %.4f, max computed aspect %.4f"), min_asp, max_asp);
/* the categries quant intervals are 1.0 long, plus
we are using reverse order so that the label looked up
for i-.5 is not the one defined for i-.5, i+.5 interval, but
@@ -1145,7 +1145,7 @@
if(deg) G_set_raster_cats_title ("slope in degrees", &cats);
else if(perc) G_set_raster_cats_title ("percent slope", &cats);
- G_message(_("min computed slope %.4f max computed slope %.4f"), min_slp, max_slp);
+ G_message(_("Min computed slope %.4f, max computed slope %.4f"), min_slp, max_slp);
/* the categries quant intervals are 1.0 long, plus
we are using reverse order so that the label looked up
for i-.5 is not the one defined for i-.5, i+.5 interval, but
Modified: grass/branches/releasebranch_6_3/translators.csv
===================================================================
--- grass/branches/releasebranch_6_3/translators.csv 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/translators.csv 2007-12-17 13:53:55 UTC (rev 29462)
@@ -1,38 +1,43 @@
-Solomon Gizaw <solohavi yahoo.com>, AM
-Dr. Alaa Masoud <alaamasoud hotmail.com>, AR
-Radim Blazek <radim.blazek gmail.com>, CS
-Michal Bíl <michal.bil seznam.cz>, CZ
-Jáchym Cepický <jachym.cepicky centrum.cz>, CZ
-Martin Landa <landa.martin gmail.com>, CZ
-Záboj Hrázský <zabojhrazsky seznam.cz>, CZ
-Markus Neteler <neteler itc.it>, DE IT
-Robert Nuske <rnuske gwdg.de>, DE
-Stephan Holl <stephan.holl intevation.de>, DE
-Agustin Diez Castillo <adiez uv.es>, ES
-Carlos Dávila <carluti users.sourceforge.net>, ES
-Daniel Calvelo Aros <dca users.sf.net>, ES FR
-Daniel de Castro Victoria <daniel.victoria gmail.com>, ES
-el bueno <manzano_jm yahoo.es>, ES
-Enrique Cerrillo Cuenca <ecerrillo unex.es>, ES
-Luis Izquierdo <luisizq2002 hotmail.com>, ES
-Roberto Antolin <tolanss yahoo.es>, ES
-Emmanuel Saracco <esaracco users.labs.libre-entreprise.org>, FR
-Eve Rousseau <phytosociologue yahoo fr>, FR
-Vincent Bain <bain toraval.fr>, FR
-Lorenzo Moretti <lorenzo.moretti bologna.enea.it>, IT
-Luciano Montanaro <mikelima cirulla.net>, IT
-Susumu Nonogaki <nonogaki sci.osaka-cu.ac.jp>, JA
-Huidae Cho <grass4u gmail.com>, KO
-Maris Nartiss <maris.kde gmail.com>, LV
-Peteris Bruns <peteris.bruns gmail.com>, LV
-Sheetal Nepte <sheetal_nepte yahoo.co.in>, MR
-Artur Niecior <nieart interia.pl>, PL
-Marcin Sanecki, PL
-Monika Tylus <monikatylus gmail.com>, PL
-Paulo E. P. Marcondes <paulomarcondes gmail.com>, PT_BR
-Ricardo Oliveira <ricardoabeloliveira gmail.com>, PT_BR
-Alex Shevlakov <sixote yahoo.com>, RU
-Miha Staut <mihastaut yahoo.co.uk>, SL
-Aras.Gor.O Yalcin Yilmaz <yilmazy istanbul.edu.tr>, TR
-Bui Huu Manh <bhmanh73 yahoo.com>, VI
-Zhang Jun <nilarcs gmail.com>, ZH
+name,email,languages
+Solomon Gizaw, <solohavi yahoo.com>, AM
+Dr. Alaa Masoud, <alaamasoud hotmail.com>, AR
+Radim Blazek, <radim.blazek gmail.com>, CS
+Michal Bíl, <michal.bil seznam.cz>, CZ
+Peteris Bruns, <peteris.bruns gmail.com>, LV
+Jáchym Cepický, <jachym.cepicky centrum.cz>, CZ
+Martin Landa, <landa.martin gmail.com>, CZ
+Záboj Hrázský, <zabojhrazsky seznam.cz>, CZ
+Markus Neteler, <neteler osgeo.org>, DE IT
+Robert Nuske, <rnuske gwdg.de>, DE
+Stephan Holl, <stephan.holl intevation.de>, DE
+Agustin Diez Castillo, <adiez uv.es>, ES
+Carlos Dávila, <carluti users.sourceforge.net>, ES
+Daniel Calvelo Aros, <dca users.sf.net>, ES FR
+Daniel de Castro Victoria, <daniel.victoria gmail.com>, ES
+el bueno, <manzano_jm yahoo.es>, ES
+Enrique Cerrillo Cuenca, <ecerrillo unex.es>, ES
+Luis Izquierdo, <luisizq2002 hotmail.com>, ES
+Roberto Antolin, <tolanss yahoo.es>, ES
+Emmanuel Saracco, <esaracco users.labs.libre-entreprise.org>, FR
+Eve Rousseau, <phytosociologue yahoo fr>, FR
+Vincent Bain, <bain toraval.fr>, FR
+Lorenzo Moretti, <lorenzo.moretti bologna.enea.it>, IT
+Luciano Montanaro, <mikelima cirulla.net>, IT
+Susumu Nonogaki, <nonogaki sci.osaka-cu.ac.jp>, JA
+Huidae Cho, <grass4u gmail.com>, KO
+Maris Nartiss, <maris.kde gmail.com>, LV
+Sheetal Nepte, <sheetal_nepte yahoo.co.in>, MR
+Artur Niecior, <nieart interia.pl>, PL
+Sarawut Ninsawat, <sarawut.map gmail.com>, TH
+Marcin Sanecki,<? ?>, PL
+Monika Tylus, <monikatylus gmail.com>, PL
+Paulo E. P. Marcondes, <paulomarcondes gmail.com>, PT_BR
+Ricardo Oliveira, <ricardoabeloliveira gmail.com>, PT_BR
+Alex Shevlakov, <sixote yahoo.com>, RU
+Miha Staut, <mihastaut yahoo.co.uk>, SL
+Aras.Gor.O Yalcin Yilmaz, <yilmazy istanbul.edu.tr>, TR
+Bui Huu Manh, <bhmanh73 yahoo.com>, VI
+Zhang Jun, <nilarcs gmail.com>, ZH
+Su Yongheng, <night2008 gmail.com>, ZH
+Tobias Vigl, <vigltobias icqmail.com>, IT
+Fernando Ferreira, <fernando vps.fmvz.usp.br>, PT_BR
Modified: grass/branches/releasebranch_6_3/vector/lidar/lidarlib/InterpSpline.c
===================================================================
--- grass/branches/releasebranch_6_3/vector/lidar/lidarlib/InterpSpline.c 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/vector/lidar/lidarlib/InterpSpline.c 2007-12-17 13:53:55 UTC (rev 29462)
@@ -22,7 +22,7 @@
#include <math.h>
#include <string.h>
-#include <grass/PolimiFunct.h>
+#include "PolimiFunct.h"
/*----------------------------------------------------------------------------*/
/* Abscissa node index computation */
Modified: grass/branches/releasebranch_6_3/vector/lidar/lidarlib/raster.c
===================================================================
--- grass/branches/releasebranch_6_3/vector/lidar/lidarlib/raster.c 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/vector/lidar/lidarlib/raster.c 2007-12-17 13:53:55 UTC (rev 29462)
@@ -8,7 +8,7 @@
#include <grass/glocale.h>
#include <grass/config.h>
-#include <grass/PolimiFunct.h>
+#include "PolimiFunct.h"
/*------------------------------------------------------------------------------------------------*/
void
@@ -71,7 +71,7 @@
db_append_string (&sql, buf);
if (db_execute_immediate (driver, &sql) != DB_OK)
- G_fatal_error (_("It was not possible writing in <%s>."), tab_name);
+ G_fatal_error (_("Unable to create table: %s"), buf);
} else if ((*point->y < Overlap.S)) { /*(1)*/
csi = (*point->x - Overlap.E)/overlap;
@@ -85,7 +85,7 @@
db_append_string (&sql, buf);
if (db_execute_immediate (driver, &sql) != DB_OK)
- G_fatal_error (_("It was not possible writing in <%s>."), tab_name);
+ G_fatal_error (_("Unable to create table: %s"), buf);
} else { /*(1)*/
weight = (*point->x - Overlap.E)/overlap;
@@ -97,7 +97,7 @@
db_append_string (&sql, buf);
if (db_execute_immediate (driver, &sql) != DB_OK)
- G_fatal_error (_("It was not possible writing in <%s>."), tab_name);
+ G_fatal_error (_("Unable to create table: %s"), buf);
}
} else if ((point->x[0] < Overlap.W)) {
@@ -113,7 +113,7 @@
db_append_string (&sql, buf);
if (db_execute_immediate (driver, &sql) != DB_OK)
- G_fatal_error (_("It was not possible writing in <%s>."), tab_name);
+ G_fatal_error (_("Unable to create table: %s"), buf);
} else if ((*point->y < Overlap.S)) { /*(2)*/
csi = (*point->x - General.W)/overlap;
@@ -127,7 +127,7 @@
db_append_string (&sql, buf);
if (db_execute_immediate (driver, &sql) != DB_OK)
- G_fatal_error (_("It was not possible writing in <%s>."), tab_name);
+ G_fatal_error (_("Unable to create table: %s"), buf);
} else { /*(2)*/
weight = (Overlap.W - *point->x)/overlap;
@@ -139,7 +139,7 @@
db_append_string (&sql, buf);
if (db_execute_immediate (driver, &sql) != DB_OK)
- G_fatal_error (_("It was not possible writing in <%s>."), tab_name);
+ G_fatal_error (_("Unable to create table: %s"), buf);
}
} else {
@@ -153,7 +153,7 @@
db_append_string (&sql, buf);
if (db_execute_immediate (driver, &sql) != DB_OK)
- G_fatal_error (_("It was not possible writing in <%s>."), tab_name);
+ G_fatal_error (_("Unable to create table: %s"), buf);
} else { /*(1)*/
weight = (Overlap.S - *point->y)/overlap;
*point->z = (1-weight)*interpolation;
@@ -164,7 +164,7 @@
db_append_string (&sql, buf);
if (db_execute_immediate (driver, &sql) != DB_OK)
- G_fatal_error (_("It was not possible writing in <%s>."), tab_name);
+ G_fatal_error (_("Unable to create table: %s"), buf);
}
}
}
Modified: grass/branches/releasebranch_6_3/vector/v.in.ascii/in.c
===================================================================
--- grass/branches/releasebranch_6_3/vector/v.in.ascii/in.c 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/vector/v.in.ascii/in.c 2007-12-17 13:53:55 UTC (rev 29462)
@@ -305,7 +305,7 @@
&Map));
if (driver == NULL) {
Vect_delete(new->answer);
- G_fatal_error(_("Unavle to open database <%s> by driver <%s>"),
+ G_fatal_error(_("Unable to open database <%s> by driver <%s>"),
Vect_subst_var(Fi->database, &Map), Fi->driver);
}
db_begin_transaction(driver);
@@ -374,7 +374,7 @@
G_debug(3, db_get_string(&sql));
if (db_execute_immediate(driver, &sql) != DB_OK) {
Vect_delete(new->answer);
- G_fatal_error(_("Unable create table: %s"),
+ G_fatal_error(_("Unable to create table: %s"),
db_get_string(&sql));
}
Modified: grass/branches/releasebranch_6_3/vector/v.in.ogr/description.html
===================================================================
--- grass/branches/releasebranch_6_3/vector/v.in.ogr/description.html 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/vector/v.in.ogr/description.html 2007-12-17 13:53:55 UTC (rev 29462)
@@ -10,9 +10,11 @@
are imported.
<P>
The optional <b>spatial</b> parameter defines spatial query extents.
-This parameter allows to restrict the region to a spatial subset while
-importing the data. All vector completely or partially falling into
-this rectangle subregion are imported.
+This parameter allows the user to restrict the region to a spatial subset
+while importing the data. All vector features completely or partially
+falling into this rectangle subregion are imported.
+The <b>-r</b> current region flag is identical, but uses the current region
+settings as the spatial bounds (see <em><a href="g.region.html">g.region</a></em>).
<P>
Topology cleaning on areas is automatically performed, but may fail in
special cases (then use <a href="v.clean.html">v.clean</a>).
@@ -62,6 +64,11 @@
<ul>
<li><B>SHAPE files</B>
<div class="code"><pre>
+v.in.ogr dsn=/home/user/shape_data/test_shape.shp output=grass_map
+</pre></div>
+
+Alternate method:
+<div class="code"><pre>
v.in.ogr dsn=/home/user/shape_data layer=test_shape output=grass_map
</pre></div>
<BR>
Modified: grass/branches/releasebranch_6_3/vector/v.in.ogr/main.c
===================================================================
--- grass/branches/releasebranch_6_3/vector/v.in.ogr/main.c 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/vector/v.in.ogr/main.c 2007-12-17 13:53:55 UTC (rev 29462)
@@ -31,6 +31,11 @@
#include "ogr_api.h"
#include "global.h"
+#ifndef MAX
+# define MIN(a,b) ((a<b) ? a : b)
+# define MAX(a,b) ((a>b) ? a : b)
+#endif
+
int geom(OGRGeometryH hGeom, struct Map_info *Map, int field, int cat, double min_area, int type, int mk_centr );
int centroid(OGRGeometryH hGeom, CENTR *Centr, SPATIAL_INDEX *Sindex, int field, int cat, double min_area, int type);
@@ -44,13 +49,13 @@
double min_area, snap;
struct Option *dsn_opt, *out_opt, *layer_opt, *spat_opt, *where_opt, *min_area_opt;
struct Option *snap_opt, *type_opt, *outloc_opt, *cnames_opt;
- struct Flag *list_flag, *no_clean_flag, *z_flag, *notab_flag;
+ struct Flag *list_flag, *no_clean_flag, *z_flag, *notab_flag, *region_flag;
struct Flag *over_flag, *extend_flag, *formats_flag, *tolower_flag;
char buf[2000], namebuf[2000];
char *separator;
struct Key_Value *loc_proj_info = NULL, *loc_proj_units = NULL;
struct Key_Value *proj_info, *proj_units;
- struct Cell_head cellhd, loc_wind;
+ struct Cell_head cellhd, loc_wind, cur_wind;
char error_msg[8192];
/* Vector */
@@ -101,8 +106,8 @@
dsn_opt->gisprompt = "old_file,file,dsn";
dsn_opt->label = _("OGR datasource name");
dsn_opt->description = _("Examples:\n"
- "\t\tESRI Shapefile: directory containing shapefiles\n"
- "\t\tMapInfo File: directory containing mapinfo files");
+ "\t\tESRI Shapefile: directory containing shapefiles\n"
+ "\t\tMapInfo File: directory containing mapinfo files");
out_opt = G_define_standard_option(G_OPT_V_OUTPUT);
out_opt->required = NO;
@@ -114,14 +119,15 @@
layer_opt->multiple = YES;
layer_opt->label = _("OGR layer name. If not given, all available layers are imported");
layer_opt->description = _("Examples:\n"
- "\t\tESRI Shapefile: shapefile name\n"
- "\t\tMapInfo File: mapinfo file name");
+ "\t\tESRI Shapefile: shapefile name\n"
+ "\t\tMapInfo File: mapinfo file name");
spat_opt = G_define_option();
spat_opt->key = "spatial";
spat_opt->type = TYPE_DOUBLE;
spat_opt->multiple = YES;
spat_opt->required = NO;
+ spat_opt->key_desc = "xmin,ymin,xmax,ymax";
spat_opt->label = _("Import subregion only");
spat_opt->guisection = _("Subregion");
spat_opt->description = _("Format: xmin,ymin,xmax,ymax - usually W,S,E,N");
@@ -136,17 +142,18 @@
min_area_opt->label = _("Minimum size of area to be imported (square units)");
min_area_opt->guisection = _("Min-area & snap");
min_area_opt->description = _("Smaller areas and "
- "islands are ignored. Should be greater than snap^2");
+ "islands are ignored. Should be greater than snap^2");
type_opt = G_define_standard_option(G_OPT_V_TYPE) ;
type_opt->options = "point,line,boundary,centroid";
type_opt->answer = "";
type_opt->description = _("Optionaly change default input type");
- type_opt->descriptions = _("point;import area centroids as points;"
- "line;import area boundaries as lines;"
- "boundary;import lines as area boundaries;"
- "centroid;import points as centroids");
-
+ type_opt->descriptions =
+ _("point;import area centroids as points;"
+ "line;import area boundaries as lines;"
+ "boundary;import lines as area boundaries;"
+ "centroid;import points as centroids");
+
snap_opt = G_define_option();
snap_opt->key = "snap";
snap_opt->type = TYPE_DOUBLE;
@@ -167,8 +174,9 @@
cnames_opt->type = TYPE_STRING;
cnames_opt->required = NO;
cnames_opt->multiple = YES;
- cnames_opt->description = _("List of column names to be used instead of original names, "
- "first is used for category column");
+ cnames_opt->description =
+ _("List of column names to be used instead of original names, "
+ "first is used for category column");
list_flag = G_define_flag ();
list_flag->key = 'l';
@@ -195,6 +203,11 @@
over_flag->key = 'o';
over_flag->description = _("Override dataset projection (use location's projection)");
+ region_flag = G_define_flag();
+ region_flag->key = 'r';
+ region_flag->guisection = _("Subregion");
+ region_flag->description = _("Limit import to the current region");
+
extend_flag = G_define_flag();
extend_flag->key = 'e';
extend_flag->description = _("Extend location extents based on new dataset");
@@ -336,6 +349,16 @@
/* Get first imported layer to use for extents and projection check */
Ogr_layer = OGR_DS_GetLayer( Ogr_ds, layers[0] );
+ if ( region_flag->answer ) {
+ if ( spat_opt->answer )
+ G_fatal_error(_("Select either the current region flag or the spatial option, not both"));
+
+ G_get_window (&cur_wind);
+ xmin=cur_wind.west;
+ xmax=cur_wind.east;
+ ymin=cur_wind.south;
+ ymax=cur_wind.north;
+ }
if ( spat_opt->answer ) {
/* See as reference: gdal/ogr/ogr_capi_test.c */
@@ -351,6 +374,8 @@
}
if ( arg_s_num != 4 )
G_fatal_error ( _("4 parameters required for 'spatial' parameter"));
+ }
+ if ( spat_opt->answer || region_flag->answer) {
G_debug( 2, "cut out with boundaries: xmin:%f ymin:%f xmax:%f ymax:%f",xmin,ymin,xmax,ymax);
/* in theory this could be an irregular polygon */
@@ -974,6 +999,30 @@
Vect_close ( &Map );
+
+/* -------------------------------------------------------------------- */
+/* Extend current window based on dataset. */
+/* -------------------------------------------------------------------- */
+ if( extend_flag->answer )
+ {
+ G_get_default_window( &loc_wind );
+
+ loc_wind.north = MAX(loc_wind.north,cellhd.north);
+ loc_wind.south = MIN(loc_wind.south,cellhd.south);
+ loc_wind.west = MIN(loc_wind.west, cellhd.west);
+ loc_wind.east = MAX(loc_wind.east, cellhd.east);
+
+ loc_wind.rows = (int) ceil((loc_wind.north - loc_wind.south)
+ / loc_wind.ns_res);
+ loc_wind.south = loc_wind.north - loc_wind.rows * loc_wind.ns_res;
+
+ loc_wind.cols = (int) ceil((loc_wind.east - loc_wind.west)
+ / loc_wind.ew_res);
+ loc_wind.east = loc_wind.west + loc_wind.cols * loc_wind.ew_res;
+
+ G__put_window(&loc_wind, "../PERMANENT", "DEFAULT_WIND");
+ }
+
if (with_z && !z_flag->answer )
G_warning (_("Input data contains 3D features. Created vector is 2D only, "
"use -z flag to import 3D vector"));
Modified: grass/branches/releasebranch_6_3/vector/v.net.steiner/description.html
===================================================================
--- grass/branches/releasebranch_6_3/vector/v.net.steiner/description.html 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/vector/v.net.steiner/description.html 2007-12-17 13:53:55 UTC (rev 29462)
@@ -3,6 +3,14 @@
<em>v.net.steiner</em> calculates the optimal connection of nodes on a
vector network.
+<P>
+A Steiner tree is used to calculate the minimum-cost vector network
+connecting some number of end nodes in a network framework.
+For example it could be used to find the path following a road system
+which will minimize the amount of fibre optic cable needed to connect
+a series of satellite offices.
+
+
<h2>EXAMPLE</h2>
Steiner tree for for 6 digitized nodes (Spearfish):
Modified: grass/branches/releasebranch_6_3/vector/v.surf.rst/README
===================================================================
--- grass/branches/releasebranch_6_3/vector/v.surf.rst/README 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/vector/v.surf.rst/README 2007-12-17 13:53:55 UTC (rev 29462)
@@ -1,3 +1,7 @@
+dnorm is an average size of the segment (not window); so points that are
+farther apart than dnorm + window size are computed independently.
+
+############################################################
This is a GRASS 5.0 version of a program
for interpolation by regularized spline with tension.
The original version was implemented in GRASS4.1 as
Modified: grass/branches/releasebranch_6_3/vector/v.vol.rst/README
===================================================================
--- grass/branches/releasebranch_6_3/vector/v.vol.rst/README 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/vector/v.vol.rst/README 2007-12-17 13:53:55 UTC (rev 29462)
@@ -1,11 +1,23 @@
+dnorm: in the 3D version we normalize
+based on the overlapping window rather than segment
+(essentially based on npmin rather than segmax)
-copied from Mark 15.may.1996,
-just a beta version, not fully tested
+Reason: the overlapping window can be large and then the
+normalization based on the segment size was not sufficient.
+But that means that the segments are smaller than dnorm.
+#######################################################
+HISTORY:
+
+02/03/03 (jh) - added deviation site file to the output
+
03/11/00 (jh) - re-written I/O operations, several bug fixes
including 3D topo parameters, and 2nd RST derivatives
-12/07/00 (MN) - added field selection parameter for sites lists
+12/07/00 (MN) - added field selection parameter for sites lists
(allows to select column in site_lists)
-02/03/03 (jh) - added deviation site file to the output
+copied from Mark 15.may.1996,
+just a beta version, not fully tested
+
+
Modified: grass/branches/releasebranch_6_3/vector/v.vol.rst/user1.c
===================================================================
--- grass/branches/releasebranch_6_3/vector/v.vol.rst/user1.c 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/vector/v.vol.rst/user1.c 2007-12-17 13:53:55 UTC (rev 29462)
@@ -277,7 +277,7 @@
if (OUTRANGE > 0)
G_warning ("There are points outside specified 2D/3D region--ignored %d points (total points: %d)", OUTRANGE, k);
if (NPOINT > 0)
- G_warning ("Points are more dense than specified 'DMIN'--ignored %d points", NPOINT);
+ G_warning ("Points are more dense than specified 'DMIN'--ignored %d points (remain %d)", NPOINT, k - NPOINT);
NPOINT = k - NPOINT - NPT - OUTRANGE;
if(NPOINT<KMIN) {
if (NPOINT!=0) {
Modified: grass/branches/releasebranch_6_3/visualization/nviz/Makefile
===================================================================
--- grass/branches/releasebranch_6_3/visualization/nviz/Makefile 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/visualization/nviz/Makefile 2007-12-17 13:53:55 UTC (rev 29462)
@@ -37,7 +37,7 @@
for file in $(SCRIPTS) ; do $(INSTALL) $$file $(INSTALL_DIR)/scripts ; done
-$(MKDIR) $(INSTALL_DIR)/bitmaps
-$(MKDIR) $(INSTALL_DIR)/bitmaps/flythrough
- find bitmaps -path '*/CVS' -prune -o -type f -print | \
+ find bitmaps -path '*/.svn' -prune -o -type f -print | \
while read file ; do $(INSTALL_DATA) $$file $(INSTALL_DIR)/$$file ; done
docs:
Modified: grass/branches/releasebranch_6_3/visualization/xganim/description.html
===================================================================
--- grass/branches/releasebranch_6_3/visualization/xganim/description.html 2007-12-17 13:45:01 UTC (rev 29461)
+++ grass/branches/releasebranch_6_3/visualization/xganim/description.html 2007-12-17 13:53:55 UTC (rev 29462)
@@ -60,7 +60,8 @@
<H2>SEE ALSO</H2>
-<em><a href="d.slide.show.html">d.slide.show</a></em>
+<em><a href="d.slide.show.html">d.slide.show</a></em>,
+<em><a href="gm_animate.html">gis.m: ANIMATE TOOL</a></em>
<H2>AUTHOR</H2>
More information about the grass-commit
mailing list