Changeset 29462


Ignore:
Timestamp:
Dec 17, 2007, 5:53:55 AM (17 years ago)
Author:
neteler
Message:

backported fixes from HEAD

Location:
grass/branches/releasebranch_6_3
Files:
51 edited

Legend:

Unmodified
Added
Removed

  • grass/branches/releasebranch_6_3/AUTHORS

    r24974 r29462  
    2222Active parts of the program have authors dating back to GRASS's
    2323inception in 1982. Please check the GRASS 1.x - 5.0 credits list at:
    24  http://grass.itc.it/devel/grasscredits.html
     24 http://www.grass-gis.org/devel/grasscredits.html
    2525
    2626
    … …  
    6363 - SOCCER Labs at Ecole Polytechnique de Montreal, Canada
    6464   http://web.soccerlab.polymtl.ca/grass-evolution/grass-browsers/grass-index-en.html
    65    http://grass.itc.it/mailman/listinfo/grass-qa
     65   http://www.grass-gis.org/mailman/listinfo/grass-qa
    6666
    6767Bugtracker maintainer:
    … …  
    206206
    207207Please check additionally the GRASS 1.x-5.0 credits list at:
    208  http://grass.itc.it/devel/grasscredits.html
     208 http://www.grass-gis.org/devel/grasscredits.html
    209209
    210210While it is impossible for us to give credit to everyone (past
    … …  
    294294   U.S. Army Construction Engineering Research Laboratories  (CERL)
    295295   Jim Westervelt, Michael Shapiro, Chris Rewerts, Robert Lozar, ...
    296    See: http://grass.itc.it/devel/grasscredits.html
     296   See: http://www.grass-gis.org/devel/grasscredits.html
    297297
    298298Former Institutions
    … …  
    320320 Via Sommarive, 18
    321321 38050 Trento (Povo)
    322  email: neteler itc.it
    323 
    324 Internet:  http://grass.itc.it/      (main site)
     322 email: neteler fbk.eu
     323
     324Internet:  http://www.grass-gis.org/      (main site)
    325325           http://grass.ibiblio.org/ (mirror)
    326            http://grass.itc.it/mirrors.php (list of mirrors)
     326           http://www.grass-gis.org/mirrors.php (list of mirrors)
    327327
    328328with a worldwide distribution network.

  • grass/branches/releasebranch_6_3/COPYING

    r23762 r29462  
    3838 38050 Trento (Povo)
    3939 Italy
    40  neteler@itc.it
     40 neteler fbk.eu
    4141
    42 Internet:  http://grass.itc.it
     42Internet:  http://www.grass-gis.org/
    4343           http://grass.ibiblio.org

  • grass/branches/releasebranch_6_3/INSTALL

    r22993 r29462  
    282282Note that this code is still actively being developed and errors inevitably
    283283turn up. If you find a bug, please report it to the GRASS bug tracking system
    284 so we can fix it. see  http://grass.itc.it/bugtracking/bugreport.html
     284so we can fix it. see  http://www.grass-gis.org/bugtracking/bugreport.html
    285285
    286286If you are interested in helping to develop GRASS, please join the GRASS
    287 developers mailing list. see  http://grass.itc.it/devel/index.php
     287developers mailing list. see  http://www.grass-gis.org/devel/index.php
    288288
    289289
    … …  
    292292The Programmer's manual is generated with doxygen from the source code.
    293293Please see the README file and the files at:
    294 http://grass.itc.it/devel/index.php#prog
     294http://www.grass-gis.org/devel/index.php#prog
    295295
    296296
    297297(N) CONTRIBUTING CODE AND PATCHES
    298298
    299 Please see ./SUBMITTING and ./SUBMITTING_SCRIPTS in this
    300 directory.
     299Please see ./SUBMITTING, ./SUBMITTING_DOCS, ./SUBMITTING_TCLTK and
     300./SUBMITTING_SCRIPTS in this directory.
    301301
    302302

  • grass/branches/releasebranch_6_3/REQUIREMENTS.html

    r22103 r29462  
    102102[<a href="http://www.netlib.org/lapack/">http://www.netlib.org/lapack</a>] (usually available on Linux distros)
    103103<br>
    104 Note: the support is intended for future module implementations, no need to use it at time!
     104<I>Note: LAPACK/BLAS support is intended for future module implementations, no need to
     105use it at time!</I>
    105106
    106107
    … …  
    149150<a href="http://www.freetype.org">http://www.freetype.org</a>
    150151
    151 <li><B>Python</B> <br>
     152<li><B>Python</B> (for new wxPython GUI and SWIG interface)<br>
    152153<a href="http://www.python.org">http://www.python.org</a>
    153154
     155<li><B>FFMPEG</B> (for direct rendering of animations from NVIZ),
     156    including libavcodec, libavformat, libswscale <BR>
     157<a href="http://ffmpeg.mplayerhq.hu/">http://ffmpeg.mplayerhq.hu</a><BR>
     158
    154159</ul>
     160
    155161
    156162<h3>Note:</h3>
    … …  
    172178<br><i>&copy; GRASS Development Team 2001-2006</i>
    173179<p>Please report bugs here:
    174 <br><a href="http://grass.itc.it/bugtracking/bugreport.html">http://grass.itc.it/bugtracking/bugreport.html</a>
     180<br><a href="http://www.grass-gis.org/bugtracking/bugreport.html">http://www.grass-gis.org/bugtracking/bugreport.html</a>
    175181
    176182<p>

  • grass/branches/releasebranch_6_3/SUBMITTING

    r25170 r29462  
    55Dear (new) GRASS Developer,
    66
    7 When submitting C code to GRASS CVS repository, please take
    8 care of following rules:
     7When submitting C code to GRASS SVN repository, please take care of
     8following rules:
    99
    1010[ see SUBMITTING_SCRIPTS for shell script hints ]
    … …  
    1414
    15151.  Get and read the GRASS 6 Programmer's Manual here:
    16     http://grass.itc.it/devel/index.php#prog
     16    http://download.osgeo.org/grass/grass6_progman/
    1717
    1818    or generate it from this source code (the programmer's manual is
    … …  
    67674.  - deleted.
    6868    We don't want the $ ID $ in source code any more as it causes problems
    69     for the CVS branches.
     69    for the SVN branches.
    7070
    7171
    … …  
    7575
    7676    in your files and make use of the various system dependencies
    77     contained therein.  As one example of this, see
    78     lib/gmath/fft.c .  Please refrain from declaring
    79     system functions within the software; include the proper header files
    80     (conditionally dependent on config.h macros if necessary) instead.
     77    contained therein.  As one example of this, see lib/gmath/fft.c.
     78    Please refrain from declaring system functions within the
     79    software; include the proper header files (conditionally dependent
     80    on config.h macros if necessary) instead.
    8181
    8282
    … …  
    8787    1. Core system headers (stdio.h, ctype.h, ...)
    8888    2. Headers for non-core system components (X11, libraries).
    89     3. Headers for core systems of the package being compiled (grass/gis.h, grass/glocale.h ...)
     89    3. Headers for core systems of the package being compiled (grass/gis.h, grass/glocale.h, ...)
    9090    4. Headers for the specific library/program being compiled (geodesic.h, ...)
    9191 
    … …  
    127127
    128128      ...
    129       exit (EXIT_SUCCESS)
     129      exit (EXIT_SUCCESS);
    130130    }
    131131
    … …  
    142142    Always use the gettext macros with _("") for user messages,
    143143    example:
    144       G_fatal_error ( _("Vector file [%s] not available"), name);
     144      G_fatal_error (_("Vector map <%s> not found"), name);
    145145
    146146
    … …  
    155155
    156156
    157 10. Use the GRASS library function G_asprintf() instead of the 
    158     standard C functions asprintf(), vsnprintf() and snprintf().  These
     15710. Use the GRASS library function G_asprintf() instead of the
     158    standard C functions asprintf(), vsnprintf() and snprintf(). These
    159159    functions are not portable or have other issues.  Example:
    160160
    … …  
    17017011. Use the following GRASS library functions instead of the standard C
    171171    functions. The reason for this is that the following functions ensure
    172     good programming practice (eg always checking if memory was allocated)
     172    good programming practice (e.g. always checking if memory was allocated)
    173173    and/or improves portability. PLEASE refer to the programmers manual
    174     for the proper use (eg determining if any casts are needed for arguments
     174    for the proper use (e.g. determining if any casts are needed for arguments
    175175    or return values) of these library functions. They may perform a task
    176176    slightly different from their corresponding C library function, and thus,
    … …  
    228228    needed, do not check in any changes other than the indentation in the same
    229229    commit! Do add the indent switches and any indent warning messages to the
    230     CVS log. Any change or fix mixed in with an indent is very hard to track
     230    SVN log. Any change or fix mixed in with an indent is very hard to track
    231231    making it hard for others to follow the change or fix any new bugs.
    232232
    … …  
    275275
    276276    If you are unsure, please ask on the GRASS Developers list.
    277 
     277   
    27827820. Have a look at ./INSTALL
    279279
    280280
    28128121. Have a function included in your module which writes to the history
    282     file of the map (e.g. command line, parameters etc.). See eg
     282    file of the map (e.g. command line, parameters etc.). See e.g.
    283283    raster/r.patch/main.c
    284284
    … …  
    305305
    306306
    307 26. Be sure to develop on top of the LATEST GRASS code (which is in CVS).
    308     You can re-check before submission with 'cvs diff':
     30726. Be sure to develop on top of the LATEST GRASS code (which is in SVN repository).
     308    You can re-check before submission with 'svn diff':
    309309
    310310    Be sure to create unified ("diff -u") format. "Plain" diffs (the default
    … …  
    313313
    314314    Such diffs should be made from the top-level directory, e.g.
    315     "cvs diff -u display/d.vect/main.c"; that way, the diff will
     315    "svn diff display/d.vect/main.c"; that way, the diff will
    316316    include the pathname rather than just "main.c".
    317317
    … …  
    344344    You can easily write specific tests for your modules.
    345345
    346     If your module is part of grass and you created some standard test cases,
    347     please contact the developers to add your tests to the default test suite.
    348     This will automatize complex test scenarios and assure to find bugs much
    349     faster, if changes were made to your modules or to the grass library. 
     346    If your module is part of GRASS and you created some standard test
     347    cases, please contact the developers to add your tests to the
     348    default test suite.  This will automatize complex test scenarios
     349    and assure to find bugs much faster, if changes were made to your
     350    modules or to the grass library.
    350351
    351352    Consider to subscribe to the GRASS Quality Assessment System to
    352353    get immediate notification about the code quality:
    353354
    354     http://grass.itc.it/mailman/listinfo/grass-qa
     355    http://www.grass-gis.org/mailman/listinfo/grass-qa
    355356
    35635729. Tell the other developers about the new code using the following e-mail:
    357     grass-dev@grass.itc.it
     358    grass-dev@lists.osgeo.org
    358359 
    359360    To subscribe to this mailing list, see
    360     http://grass.itc.it/devel/index.php
     361    http://lists.osgeo.org/mailman/listinfo/grass-dev
    361362
    362363
    36336430. In case of questions feel free to contact the developers at the above
    364365    mailing list.
    365     http://grass.itc.it/devel/index.php#submission
     366    http://www.grass-gis.org/devel/index.php#submission
    366367
    367368...
    368369[please add further hints if required]
    369 

  • grass/branches/releasebranch_6_3/SUBMITTING_DOCS

    r25170 r29462  
    55Dear (new) GRASS Developer,
    66
    7 When submitting documentation to GRASS CVS repository, please take
     7When submitting documentation to GRASS SVN repository, please take
    88care of following rules:
    99
     10[ see SUBMITTING for C hints ]
    1011[ see SUBMITTING_SCRIPTS for shell script hints ]
    1112[ see SUBMITTING_TCLTK for tcl and tk hints ]
    12 [ see SUBMITTING for C hints ]
    1313
    14141. Editing of HTML pages
    … …  
    1818
    19192. Module manual page:
    20     Place the documentation in HTML format into 'description.html'.
    21     The easiest way to do this is to study an existing HTML page
    22     (to get the page style, e.g. vector/v.to.db/description.html).
    23     With a few exceptions header and footer are NOT allowed.
    24     You can add figures (PNG format), the figure name prefix should be the
    25     module name. See raster/r.terraflow/description.html for an example.
     20   Place the documentation in HTML format into 'description.html'.
     21   The easiest way to do this is to study an existing HTML page
     22   (to get the page style, e.g. vector/v.to.db/description.html).
     23   With a few exceptions header and footer are NOT allowed.
     24   You can add figures (PNG format), the figure name prefix should be the
     25   module name. See raster/r.terraflow/description.html for an example.
    2626
    27     Note that the parameter information is auto-generated upon
    28     compilation. This is done by running module in a virtual session
    29     after compilation (see the output of 'make'). To subsequently
    30     verify the final HTML page, check the resulting HTML pages which
    31     will be stored with the name of the module.
     27   Note that the parameter information is auto-generated upon
     28   compilation. This is done by running module in a virtual session
     29   after compilation (see the output of 'make'). To subsequently
     30   verify the final HTML page, check the resulting HTML pages which
     31   will be stored with the name of the module.
    3232
    33     Examples (please add some) should be coded like this:
     33   Examples (please add some) should be coded like this:
    3434
    35     <div class="code"><pre>
    36     v.to.db map=soils type=area option=area col=area_size unit=h
    37     </pre></div>
     35   <div class="code"><pre>
     36   v.to.db map=soils type=area option=area col=area_size unit=h
     37   </pre></div>
    3838 
    39     The online WWW man pages is updated every Saturday by CVS.
     39   The online WWW man pages is updated every Saturday (from SVN
     40   repository).
    4041
    41423. Usage of limited HTML tags
    … …  
    4647   <PRE> <SUP> <TABLE> <TD> <TH> <TITLE> <TR> <UL>
    4748
     49See also:
     50   http://grass.gdf-hannover.de/wiki/Updating_GRASS_Documentation
     51
    4852...
    4953[please add further hints if required]
    50 

  • grass/branches/releasebranch_6_3/SUBMITTING_SCRIPTS

    r25170 r29462  
    55Dear (new) GRASS Developer,
    66
    7 When submitting SHELL SCRIPTS to GRASS CVS repositiory,
     7When submitting SHELL scripts to GRASS SVN repositiory,
    88please take care of following rules:
    99
    … …  
    14140.  Instructions for the GRASS script parser can be found in the g.parser
    1515    module's help page.
    16     http://grass.ibiblio.org/grass63/manuals/html63_user/g.parser.html
     16    http://grass.osgeo.org/grass63/manuals/html63_user/g.parser.html
    1717
    18181.  Use the directory structure to place your script appropriately into
    … …  
    59593.  - deleted.
    6060    We don't want the $ ID $ in scripts any more as it
    61     causes problems for the CVS branches.
     61    causes problems for the SVN branches.
    6262
    63634.  As a general principle, shell variables should almost always be quoted.
    … …  
    152152        g.findfile element=cell file="$INPUT" > /dev/null
    153153        if [ $? -eq 0 ] ; then
    154           g.message -e "Raster map '$GIS_OPT_MAP' not found in mapset search path"
     154          g.message -e "Raster map <$GIS_OPT_MAP> not found in mapset search path"
    155155          exit 1
    156156        fi
    … …  
    159159        eval `g.findfile element=vector file=$GIS_OPT_MAP`
    160160        if [ ! "$file" ] ; then
    161            g.message -e "Vector map '$GIS_OPT_MAP' not found in mapset search path"
     161           g.message -e "Vector map <$GIS_OPT_MAP> not found in mapset search path"
    162162           exit 1
    163163        fi
    … …  
    170170
    171171        #normal message:
    172         g.message "Done."
     172        g.message "Done"
    173173
    174174        # warning:
    … …  
    18518512. For consistency, use README rather than README.txt for any README files.
    186186
    187 13. Be sure to develop on top of the LATEST GRASS code (which is in CVS).
     18713. Be sure to develop on top of the LATEST GRASS code (which is in SVN).
    188188    You can re-check before submission with 'cvs diff':
    189189
    … …  
    194194
    195195    Such diffs should be made from the top-level directory, e.g.
    196     "cvs diff -u display/d.vect/main.c"; that way, the diff will
     196    "cvs diff display/d.vect/main.c"; that way, the diff will
    197197    include the pathname rather than just "main.c".
    198198
    19919914. Tell the other developers about the new code using the following e-mail:
    200     grass-dev@grass.itc.it
     200    grass-dev@lists.osgeo.org
    201201 
    202202    To subscribe to this mailing list, see
    203     http://grass.itc.it/devel/index.php
     203    http://lists.osgeo.org/mailman/listinfo/grass-dev
    204204
    20520515. In case of questions feel free to contact the developers at the above
    206206    mailing list.
    207     http://grass.itc.it/devel/index.php#submission
     207    http://www.grass-gis.org/devel/index.php#submission
    208208
    209209

  • grass/branches/releasebranch_6_3/SUBMITTING_TCLTK

    r25170 r29462  
     1$Id$
     2
    13NOTE: Please improve this list!
    24
    35Dear (new) GRASS Developer,
    46
    5 When submitting TCL and TK SCRIPTS and C code to GRASS CVS repository,
     7When submitting TCL and TK SCRIPTS to GRASS SVN repository,
    68please take care of following rules:
    79
    … …  
    146148    file, to catch any error messages.
    147149
    148 13. Be sure to develop on top of the LATEST GRASS code (which is in CVS).
    149     You can re-check before submission with 'cvs diff':
     15013. Be sure to develop on top of the LATEST GRASS code (which is in
     151    SVN repository). You can re-check before submission with 'svn
     152    diff':
    150153
    151154    Be sure to create unified ("diff -u") format. "Plain"
    … …  
    155158
    156159    Such diffs should be made from the top-level directory, e.g.
    157     "cvs diff -u display/d.vect/main.c"; that way, the diff will
     160    "cvs diff display/d.vect/main.c"; that way, the diff will
    158161    include the pathname rather than just "main.c".
    159162
    16016314. Tell the other developers about the new code using the following e-mail:
    161     grass-dev@grass.itc.it
     164    grass-dev@lists.osgeo.org
    162165 
    163166    To subscribe to this mailing list, see
    164     http://grass.itc.it/devel/index.php
     167    http://lists.osgeo.org/mailman/listinfo/grass-dev
    165168
    16616915. In case of questions feel free to contact the developers at the above
    167170    mailing list.
    168     http://grass.itc.it/devel/index.php#submission
     171    http://www.grass-gis.org/devel/index.php#submission
    169172
    17017316. Try to evaluate things only once. Tcl compiles the program to bytecode which

  • grass/branches/releasebranch_6_3/contributors.csv

    r24224 r29462  
    1 alex,Alex Shevlakov <sixote yahoo.com>
    2 andreas,Andreas Lange <andreas.lange rhein-main.de>
    3 benjamin,Benjamin Ducke <benjamin.ducke ufg.uni-kiel.de>
    4 bernhard,Bernhard Reiter <bernhard intevation.de>
    5 bob,Bob Covill <bcovill tekmap.ns.ca>
    6 brad,Brad Douglas <rez touchofmadness.com>
    7 carlos,Carlos Davila <cdavilam jemila.jazztel.es>
    8 cedric,Cedric Shock <cedricgrass shockfamily.net>
    9 cho,Huidae Cho <grass4u gmail.com>
    10 danielc,Daniel Calvelo Aros <dca.gis gmail.com>
    11 david,David D. Gray <ddgray armadce.demon.co.uk>
    12 eric,Eric G. Miller <egm2 jps.net>
    13 florian,Florian Goessmann <florian wallweg39.de>
    14 frankw,Frank Warmerdam <warmerdam pobox.om>
    15 glynn,Glynn Clements <glynn gclements.plus.com>
    16 hamish,Hamish Bowman <hamish_nospam yahoo.com>
    17 helena,Helena Mitasova <hmitaso unity.ncsu.edu>
    18 jachym,Jachym Cepicky <jachym les-ejk.cz>
    19 jan,Jan-Oliver Wagner <jan intevation.de>
    20 john,John Huddleston <jhudd.lamar colostate.edu>
    21 justin,Justin Hickey <jhickey hpcc.nectec.or.th>
    22 markus,Markus Neteler <neteler itc.it>
    23 martin,Martin Wegmann <wegmann biozentrum.uni-wuerzburg.de>
    24 martinl,Martin Landa <landa.martin gmail.com>
    25 massimo,Massimo Cuomo <m.cuomo acsys.it>
    26 michael,Michael Barton <michael.barton asu.edu>
    27 mike,Mike Thomas <miketh brisbane.paradigmgeo.com>
    28 moritz,Moritz Lennert <mlennert club.worldonline.be>
    29 paul,Paul Kelly <paul-grass stjohnspoint.co.uk>
    30 paulo,Paulo Marcondes <pmarc.debian gmail.com>
    31 pallech,Serena Pallecchi <pallecch cli.di.unipi.it>
    32 radim,Radim Blazek <radim.blazek gmail.com>
    33 roberto,Roberto Micarelli <miro iol.it>
    34 robertoa,Roberto Antolin <roberto geomatica como.polimi.it>
    35 roger,Roger S. Miller <rgrmill rt66.com>
    36 scott,Scott Mitchell  <smitch mac.com>
    37 soeren,Soeren Gebbert <soeren.gebbert gmx.de>
    38 stephan,Stephan Holl <holl gdf-hannover.de>
    39 william,William Kyngesburye <kyngchaos kyngchaos.com>
    40 wolf,Wolf Bergenheim <wolf+grass bergenheim.net>
     1cvs_id,name,email,osgeo_id,rfc2_agreed
     2-,Eric Patton,<epatton nrcan.gc.ca>,epatton,yes
     3alex,Alex Shevlakov,<sixote yahoo.com>,,-
     4andreas,Andreas Lange,<andreas.c.lange gmx.de>,,-
     5benjamin,Benjamin Ducke,<benjamin.ducke ufg.uni-kiel.de>,benducke,yes
     6bernhard,Bernhard Reiter,<bernhard intevation.de>,,-
     7bob,Bob Covill,<bcovill tekmap.ns.ca>,,-
     8brad,Brad Douglas,<rez touchofmadness.com>,bdouglas,yes
     9carlos,Carlos Davila,<cdavilam jemila.jazztel.es>,cdavilam,yes
     10cedric,Cedric Shock,<cedricgrass shockfamily.net>,,-
     11cho,Huidae Cho,<grass4u gmail.com>,hcho,yes
     12danielc,Daniel Calvelo Aros,<dca.gis gmail.com>,dcalvelo,yes
     13david,David D. Gray,<ddgray armadce.demon.co.uk>,,-
     14eric,Eric G. Miller,<egm2 jps.net>,,-
     15florian,Florian Goessmann,<florian wallweg39.de>,,-
     16frankw,Frank Warmerdam,<warmerdam pobox.com>,warmerdam,-
     17glynn,Glynn Clements,<glynn gclements.plus.com>,glynn,yes
     18hamish,Hamish Bowman,<hamish_b yahoo.com>,hamish,yes
     19helena,Helena Mitasova,<hmitaso unity.ncsu.edu>,helena,yes
     20jachym,Jachym Cepicky,<jachym.cepicky gmail.com>,jachym,yes
     21jan,Jan-Oliver Wagner,<jan intevation.de>,,-
     22john,John Huddleston,<jhudd.lamar colostate.edu>,,-
     23justin,Justin Hickey,<jhickey hpcc.nectec.or.th>,,-
     24markus,Markus Neteler,<neteler fbk.eu>,neteler,yes
     25martin,Martin Wegmann,<wegmann biozentrum.uni-wuerzburg.de>,wegmann,-
     26martinl,Martin Landa,<landa.martin gmail.com>,martinl,yes
     27massimo,Massimo Cuomo,<m.cuomo acsys.it>,,-
     28michael,Michael Barton,<michael.barton asu.edu>,cmbarton,yes
     29mike,Mike Thomas,<miketh brisbane.paradigmgeo.com>,,-
     30moritz,Moritz Lennert,<mlennert club.worldonline.be>,mlennert,yes
     31msieczka,Maciek Sieczka,<tutey o2.pl>,msieczka,yes
     32paul,Paul Kelly,<paul-grass stjohnspoint.co.uk>,pkelly,yes
     33paulo,Paulo Marcondes,<pmarc.debian gmail.com>,pmarcondes,-
     34pallech,Serena Pallecchi,<pallecch cli.di.unipi.it>,,-
     35radim,Radim Blazek,<radim.blazek gmail.com>,rblazek,-
     36roberto,Roberto Micarelli,<miro iol.it>,,-
     37robertoa,Roberto Antolin,<roberto geomatica.como.polimi.it>,rantolin,yes
     38roger,Roger S. Miller,<rgrmill rt66.com>,,-
     39scott,Scott Mitchell,<smitch mac.com>,smitch,yes
     40soeren,Soeren Gebbert,<soerengebbert googlemail.com>,,-
     41stephan,Stephan Holl,<stephan.holl intevation.de>,sholl,yes
     42william,William Kyngesburye,<kyngchaos kyngchaos.com>,kyngchaos,yes
     43wolf,Wolf Bergenheim,<wolf+grass bergenheim.net>,wolf,yes

  • grass/branches/releasebranch_6_3/contributors_extra.csv

    r24970 r29462  
    1 Andrea Aime <aaime comune modena it>
    2 Lars Ahlzen <lars ahlzen com>
    3 Carl Anderson <candrsn mindspring com>
    4 Roger Bivand <Roger Bivand nhh no>
    5 Malcolm Blue <mblue nb sympatico ca>
    6 Jacques Bouchard <bouchard onera fr>
    7 Maria Brovelli <maria brovelli polimi it>
    8 William Brown <brown gis uiuc edu>
    9 Bruce Byars <Bruce_Byars baylor edu>
    10 Angus Carr <apcarr flash lakeheadu ca>
    11 Otto Dassau <dassau gdf-hannover de>
    12 Charles Ehlschlaeger <cre111 wiu edu>
    13 Pierre de Mouveaux <pierre polaris-technologies com>
    14 Roberto Flor <flor itc it>
    15 Antonio Galea <ant9000 netwise it>
    16 Ralf Gerlich <ralf gerlich at bsse biz>
    17 Jaro Hofierka <hofierka geomodel sk>
    18 Stephan Holl <stephan holl-land de>
    19 Bill Hughes <bhughes grasshoppernet com>
    20 Ari Jolma <ari jolma tkk fi>
    21 Jeshua Lacock <jeshua OpenOSX com>
    22 Andreas Lange <Andreas Lange Rhein-Main de>
    23 Roger Miller <rgrmill rt66 com>
    24 Brook Milligan <brook trillium NMSU Edu>
    25 Lubos Mitas <lmitas ncsa uiuc edu>
    26 Eric Mitchell <emitchell altaira com>
    27 Scott Mitchell <smitch mac com>
    28 Lorenzo Moretti <lorenzo moretti bologna enea it>
    29 Maris Nartiss <maris nartiss gmail com>
    30 Tomas Paudits <tpaudits mailbox sk>
    31 Francesco Pirotti <francesco pirotti unipd it>
    32 Phisan Santitamnont <fsvpss eng chula ac th>
    33 Christoph Simon <ciccio kiosknet com br>
    34 Job Spijker <spijker geo uu nl>
    35 Laura Toma <ltoma bowdoin edu>
    36 Alfonso Vitti <alfonso vitti ing unitn it>
    37 Philip Warner <pjw rhyme com au>
    38 Trevor Wiens <twiens interbaun com>
    39 Michel Wurtz <mw teledetection fr>
     1name,email,rfc2_agreed
     2Andrea Aime,<aaime openplans.org>,-
     3Lars Ahlzen,<lars ahlzen.com>,-
     4Carl Anderson,<candrsn mindspring.com>,-
     5Dylan Beaudette,<dylan.beaudette gmail.com>,yes
     6Roger Bivand,<Roger Bivand nhh.no>,-
     7Malcolm Blue,<mblue nb sympatico.ca>,-
     8Jacques Bouchard,<bouchard onera.fr>,-
     9Maria Brovelli,<maria.brovelli polimi.it>,-
     10William Brown,<brown gis.uiuc.edu>,-
     11Bruce Byars,<Bruce_Byars baylor.edu>,-
     12Angus Carr,<apcarr flash lakeheadu.ca>,-
     13Otto Dassau,<otto.dassau gmx de>,-
     14Charles Ehlschlaeger,<cre111 wiu.edu>,-
     15Pierre de Mouveaux,<pierre polaris-technologies.com>,-
     16Roberto Flor,<flor fbk.eu>,-
     17Antonio Galea,<ant9000 netwise.it>,-
     18Ralf Gerlich,<ralf gerlich at bsse.biz>,-
     19Jaro Hofierka,<hofierka geomodel.sk>,-
     20Stephan Holl,<stephan holl-land.de>,-
     21Bill Hughes,<bhughes grasshoppernet.com>,-
     22Ari Jolma,<ari jolma tkk fi>,-
     23Jeshua Lacock,<jeshua OpenOSX.com>,-
     24Roger Miller,<rgrmill rt66.com>,-
     25Brook Milligan,<brook trillium nmsu.edu>,-
     26Lubos Mitas,<lmitas ncsa uiuc.edu>,-
     27Eric Mitchell,<emitchell altaira.com>,-
     28Scott Mitchell,<smitch mac.com>,-
     29Lorenzo Moretti,<lorenzo moretti bologna.enea.it>,-
     30Maris Nartiss,<maris nartiss gmail.com>,-
     31Tomas Paudits,<tpaudits mailbox.sk>,-
     32Francesco Pirotti,<francesco.pirotti unipd.it>,-
     33Phisan Santitamnont,<fsvpss eng.chula.ac.th>,-
     34Christoph Simon,<ciccio kiosknet.com.br>,-
     35Job Spijker,<spijker geo.uu.nl>,-
     36Laura Toma,<ltoma bowdoin.edu>,-
     37Alfonso Vitti,<alfonso vitti ing.unitn.it>,-
     38Philip Warner,<pjw rhyme com.au>,-
     39Trevor Wiens,<twiens interbaun.com>,-
     40Michel Wurtz,<mw teledetection.fr>,-

  • grass/branches/releasebranch_6_3/db/drivers/postgres/README

    r24377 r29462  
    1515Because of this, type codes must be read from server when database is opened.
    1616
    17 Supported types:
     17Check also for PostgreSQL data types for defining them in GRASS:
     18 /usr/include/pgsql/server/catalog/pg_type.h
     19
     20
     21Supported types in ./globals.h:
    1822(http://www.postgresql.org/docs/8.2/interactive/datatype.html)
    1923DB_C_TYPE_INT:

  • grass/branches/releasebranch_6_3/lib/grasslib.dox

    r23243 r29462  
    1919code. This work is part of ongoing research being performed by the
    2020GRASS Development Team coordinated at
    21 <a href="http://mpa.itc.it/">FBK-irst</A>(formerly ITC-irst), Trento, Italy,
     21<a href="http://mpa.fbk.eu/">FBK-irst</A>(formerly ITC-irst), Trento, Italy,
    2222an international team of programmers,
    2323GRASS module authors are cited within their module's source code and the
    … …  
    3232Osnabr&uuml;ck, Germany, who provide the GRASS CVS repository.
    3333
    34 Main web site: <a href="http://grass.itc.it">http://grass.itc.it</a>
     34Main web site: <a href="http://grass.osgeo.org">http://grass.osgeo.org</a>
    3535
    3636<P>
    … …  
    142142</ul>
    143143
    144 <img src="http://grass.itc.it/images/loc_struct.png" alt="Diagram of GRASS file structure">
     144<img src="http://grass.osgeo.org/images/loc_struct.png" alt="Diagram of GRASS file structure">
    145145
    146146*/

  • grass/branches/releasebranch_6_3/lib/init/gis_set.tcl

    r24800 r29462  
    142142            if {[string compare $filename "PERMANENT"] == 0} {
    143143                # All good locations have valid PERMANENT mapset.
    144                 if {[file exists "$dir/PERMANENT/WIND"] != 0} {
     144                if {[file exists "$dir/PERMANENT/DEFAULT_WIND"] != 0} {
    145145                    set found 1
    146146                    .frame0.frameNMS.second.entry configure -state normal

  • grass/branches/releasebranch_6_3/lib/init/grass_intro.txt

    r16013 r29462  
    1010
    1111   3) Check the GRASS webpages for feedback mailinglists and more:
    12       http://grass.itc.it/
    13       http://grass.ibiblio.edu/
     12      http://www.grass-gis.org
     13      http://grass.osgeo.org

  • grass/branches/releasebranch_6_3/lib/init/init.sh

    r25400 r29462  
    802802fi
    803803
    804 echo "GRASS homepage:                          http://grass.itc.it/"
     804echo "GRASS homepage:                          http://grass.osgeo.org/"
    805805echo "This version running thru:               $shellname ($SHELL)"
    806806echo "Help is available with the command:      g.manual -i"

  • grass/branches/releasebranch_6_3/macosx/Makefile

    r24856 r29462  
    1414LN = /bin/ln -sf
    1515LN_DIR = /bin/ln -sfh
     16
     17# packagemaker location, options and behaviour changed in xcode 3
     18ifeq ($(findstring darwin9,$(ARCH)),darwin9)
     19XCODE_VER = xcode3
     20PACKAGEMAKER = /Developer/usr/bin/packagemaker
     21PKG_INST_DIR = ${prefix}
     22else
     23XCODE_VER = xcode2
     24PACKAGEMAKER = /Developer/Tools/packagemaker
     25PKG_INST_DIR = ${prefix}/${MACOSX_APP_NAME}
     26endif
    1627
    1728SUBDIRS =
    … …  
    99110        -chmod a+rx dist/resources/postflight
    100111        -sed -e "s#@GRASS_VER@#${GRASS_VERSION_MAJOR}.${GRASS_VERSION_MINOR}#g" pkg/resources/Description.plist.in > dist/Description.plist
    101         -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
     112        -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
    102113        -${INSTALL_DATA} pkg/resources/License.rtf dist/resources
    103114        -${INSTALL_DATA} pkg/resources/ReadMe.rtf dist/resources
    104115        -cd ${GISBASE} ; tar cBf - modbuild | (cd ${GRASS_HOME}/macosx/dist/resources ; tar xBf - ) 2>/dev/null
    105116        @# build the package
    106         /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
     117ifeq ($(XCODE_VER),xcode3)
     118        ${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
     119else
     120        ${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
     121endif
    107122        @# remove intermediate files
    108123        @# -rm -rf dist 2>/dev/null

  • grass/branches/releasebranch_6_3/macosx/app/Info.plist.in

    r24406 r29462  
    1212        <string>app.icns</string>
    1313        <key>CFBundleIdentifier</key>
    14         <string>it.itc.grass6</string>
     14        <string>org.osgeo.grass6</string>
    1515        <key>CFBundleInfoDictionaryVersion</key>
    1616        <string>6.0</string>

  • grass/branches/releasebranch_6_3/macosx/pkg/resources/Info.plist.in

    r24857 r29462  
    66        <string>GRASS-@GRASS_VERSION_MAJOR@.@GRASS_VERSION_MINOR@.@GRASS_VERSION_RELEASE@</string>
    77        <key>CFBundleIdentifier</key>
    8         <string>it.itc.grass</string>
     8        <string>org.osgeo.grass</string>
    99        <key>CFBundleShortVersionString</key>
    1010        <string>@GRASS_VERSION_MAJOR@.@VER_MINOR_REL@.@VER_DATE@</string>

  • grass/branches/releasebranch_6_3/ps/ps.map/description.html

    r25081 r29462  
    202202The default is a black border box of width 1 point.
    203203<P>
     204The border can be turned off completely with the
     205&quot;<tt>border&nbsp;n</tt>&quot; instruction. In this case
     206the <B>end</B> command should not be given as the
     207main command will be treated as a single line instruction.
     208<P>
    204209
    205210This example would create a grey border 0.1&quot; wide.
    … …  
    260265do this, you could write a script to add dummy labels to the cats file<br>
    261266(&lt;gisdbase&gt;/&lt;location&gt;/&lt;mapset&gt;/cats/&lt;mapname&gt;).
     267<P>
     268If the colortable is turned off with a &quot;<tt>colortable&nbsp;n</tt>&quot;
     269instruction the <B>end</B> command should not be given as the 
     270main command will be treated as a single line instruction.
    262271
    263272<P>

  • grass/branches/releasebranch_6_3/raster/r.average/description.html

    r24915 r29462  
    3030<EM>cover</EM> map will be averaged.
    3131
    32 The <B>cover</B> map is n existing raster map layer containing the values
     32The <EM>cover</EM> map is an existing raster map layer containing the values
    3333(in the form of cell category values or cell category labels) to be averaged
    3434within each category of the <EM>base</EM> map.
     35
     36<H2>NOTES</H2>
     37
     38The <B>-c</B> option requires that the category label for
     39each category in the <EM>cover</EM> map be a valid number,
     40integer, or decimal.  To be exact, if the first item in the
     41label is numeric, then that value is used. Otherwise, zero
     42is used.  The following table covers all possible cases:
     43
     44<P>
     45<PRE>
     46         category    value
     47         label       used by -c
     48         ______________________
     49          .12           .12
     50          .80 KF        .8
     51          no data       0
     52</PRE>
     53<P>
     54
     55(This flag is very similar to the @ operator in
     56<EM><A HREF="r.mapcalc.html">r.mapcalc</A></EM>,
     57and the user is encouraged to read the manual entry for
     58<EM><A HREF="r.mapcalc.html">r.mapcalc</A></EM>
     59to see how it works there.)
     60
     61<P>
     62
     63The user should use the results of <EM>r.average</EM> with
     64care.  Since this utility assigns a value to each cell
     65which is based on global information (i.e., information at
     66spatial locations other than just the location of the cell
     67itself), the resultant map layer is only valid if the
     68geographic region and mask settings are the same as they
     69were at the time that the result map was created.
     70
     71<P>
     72
     73Results are affected by the current region settings and mask.
    3574
    3675<H2>EXAMPLE</H2>
    … …  
    82121</PRE>
    83122
    84 <H2>NOTES</H2>
    85123
    86 The <B>-c</B> option requires that the category label for
    87 each category in the <EM>cover</EM> map be a valid number,
    88 integer, or decimal.  To be exact, if the first item in the
    89 label is numeric, then that value is used. Otherwise, zero
    90 is used.  The following table covers all possible cases:
    91 
    92 <P>
    93 <PRE>
    94          category    value
    95          label       used by -c
    96          ______________________
    97           .12           .12
    98           .80 KF        .8
    99           no data      0
    100 </PRE>
    101 
    102 <P>
    103 (This flag is very similar to the @ operator in
    104 <EM><A HREF="r.mapcalc.html">r.mapcalc</A></EM>,
    105 and the user is encouraged to read the manual entry for
    106 <EM><A HREF="r.mapcalc.html">r.mapcalc</A></EM>
    107 to see how it works there.)
    108 
    109 <P>
    110 
    111 The user should use the results of <EM>r.average</EM> with
    112 care.  Since this utility assigns a value to each cell
    113 which is based on global information (i.e., information at
    114 spatial locations other than just the location of the cell
    115 itself), the resultant map layer is only valid if the
    116 geographic region and mask settings are the same as they
    117 were at the time that the result map was created.
    118 
    119 <P>
    120 
    121 Results are affected by the current region settings and mask.
    122124
    123125<H2>SEE ALSO</H2>

  • grass/branches/releasebranch_6_3/raster/r.buffer/description.html

    r21028 r29462  
    3838zone's lower value is the previous zone's upper value. The
    3939first buffer zone always has distance <tt>0</tt> as its lower
    40 bound.) Distances can be entered in one of five units:
    41 <EM>meters, kilometers, feet, miles</EM>, and <EM>nautmiles</EM>
     40bound.) Buffer distances can be specified using one of five units with the <EM>
     41units</EM> parameter: <EM>meters, kilometers, feet, miles</EM>, and <EM>nautmiles</EM>
    4242(nautical miles).
    4343<P>
    … …  
    4545<!-- ??? is this the real method used or some ancient option ??? -->
    4646Distances from cells containing the user-specified category values
    47 are calculated using the "fromcell" method. This method goes to each
     47are calculated using the "fromcell" method. This method locates each
    4848cell that contains a category value from which distances are to be
    4949calculated, and draws the requested distance rings around
    … …  
    6666<EM><A HREF="r.reclass.html">r.reclass</A></EM> prior to
    6767<EM>r.buffer</EM>, to reclass all categories from which distance zones
    68 are not desired to be calculated into category NULL.
     68are not desired to be calculated into category NULL.
     69<P>
    6970
     71The <B>-z</B> flag can be used to ignore raster values of zero instead of NULL
     72values in the input raster map.
     73<P>
    7074
    7175<H2>EXAMPLE</H2>

  • grass/branches/releasebranch_6_3/raster/r.gwflow/description.html

    r24308 r29462  
    33unconfined groundwater flow in two dimensions based on 
    44raster maps and the current region resolution.
    5 All initial- and boundary-conditions must be provided as
     5All initial and boundary conditions must be provided as
    66raster maps.
    7 <br>
    8 <br>
    9 r.gwflow calculates the piezometric head and optionally the
     7
     8<p>
     9<center>
     10<img src=r_gwflow_concept.png border=0><BR>
     11<table border=0 width=700>
     12<tr><td><center>
     13<i>Workflow of r.gwflow</i>
     14</center></td></tr>
     15</table>
     16</center>
     17<p>
     18
     19<em>r.gwflow</em> calculates the piezometric head and optionally the
    1020filter velocity field, based on the hydraulic conductivity and the piezometric head.
    1121The vector components can be visualized with paraview if they are exported
    12 with r.out.vtk.
     22with <em>r.out.vtk</em>.
    1323<br>
    1424<br>
    … …  
    5767Aditionally a direct Gauss solver and LU solver are available. Those direct solvers
    5868only work with normal quadratic matrices, so be careful using them with large maps
    59 (maps of size 10.000 cells will need more than one gigabyte of ram).
     69(maps of size 10.000 cells will need more than one gigabyte of RAM).
    6070Always prefer a sparse matrix solver.
    6171
    … …  
    98108paraview --data=/tmp/gwdata_conf2d.vtk &
    99109paraview --data=/tmp/gwdata_unconf2d.vtk &
    100 
    101 
    102110</pre></div>
    103111

  • grass/branches/releasebranch_6_3/raster/r.in.gdal/description.html

    r24448 r29462  
    2626
    2727Selected formats of more than 40 supported formats:
    28 
    29 <table border="1">
    30   <tbody>
    31     <tr>
    32       <th>Long Format Name</th>
    33       <th>Code</th>
    34       <th>Creation</th>
    35       <th>Georeferencing</th>
    36       <th>Maximum file size</th>
    37     </tr>
    38     <tr>
    39       <td> Arc/Info ASCII Grid
    40       </td>
    41       <td> AAIGrid
    42       </td>
    43       <td> Yes
    44       </td>
    45       <td> Yes
    46       </td>
    47       <td> No limits
    48       </td>
    49     </tr>
    50     <tr>
    51       <td> Arc/Info Binary Grid (.adf)
    52       </td>
    53       <td> AIG
    54       </td>
    55       <td> No
    56       </td>
    57       <td> Yes
    58       </td>
    59       <td> --
    60       </td>
    61     </tr>
    62     <tr>
    63       <td> AIRSAR Polarimetric
    64       </td>
    65       <td> AIRSAR
    66       </td>
    67       <td> No
    68       </td>
    69       <td> No
    70       </td>
    71       <td> --
    72       </td>
    73     </tr>
    74     <tr>
    75       <td> Microsoft Windows Device Independent Bitmap (.bmp)
    76       </td>
    77       <td> BMP
    78       </td>
    79       <td> Yes
    80       </td>
    81       <td> Yes
    82       </td>
    83       <td> 4GiB
    84       </td>
    85     </tr>
    86     <tr>
    87       <td> BSB Nautical Chart Format (.kap)
    88       </td>
    89       <td> BSB
    90       </td>
    91       <td> No
    92       </td>
    93       <td> Yes
    94       </td>
    95       <td> --
    96       </td>
    97     </tr>
    98     <tr>
    99       <td> VTP Binary Terrain Format (.bt)
    100       </td>
    101       <td> BT
    102       </td>
    103       <td> Yes
    104       </td>
    105       <td> Yes
    106       </td>
    107       <td> --
    108       </td>
    109     </tr>
    110     <tr>
    111       <td> CEOS (Spot for instance)
    112       </td>
    113       <td> CEOS
    114       </td>
    115       <td> No
    116       </td>
    117       <td> No
    118       </td>
    119       <td> --
    120       </td>
    121     </tr>
    122     <tr>
    123       <td> First Generation USGS DOQ (.doq)
    124       </td>
    125       <td> DOQ1
    126       </td>
    127       <td> No
    128       </td>
    129       <td> Yes
    130       </td>
    131       <td> --
    132       </td>
    133     </tr>
    134     <tr>
    135       <td> New Labelled USGS DOQ (.doq)
    136       </td>
    137       <td> DOQ2
    138       </td>
    139       <td> No
    140       </td>
    141       <td> Yes
    142       </td>
    143       <td> --
    144       </td>
    145     </tr>
    146     <tr>
    147       <td> Military Elevation Data (.dt0, .dt1)
    148       </td>
    149       <td> DTED
    150       </td>
    151       <td> No
    152       </td>
    153       <td> Yes
    154       </td>
    155       <td> --
    156       </td>
    157     </tr>
    158     <tr>
    159       <td> ERMapper Compressed Wavelets (.ecw)
    160       </td>
    161       <td> ECW
    162       </td>
    163       <td> Yes
    164       </td>
    165       <td> Yes
    166       </td>
    167       <td><br>
    168       </td>
    169     </tr>
    170     <tr>
    171       <td> ESRI .hdr Labelled
    172       </td>
    173       <td> EHdr
    174       </td>
    175       <td> No
    176       </td>
    177       <td> Yes
    178       </td>
    179       <td> --
    180       </td>
    181     </tr>
    182     <tr>
    183       <td> ENVI .hdr Labelled Raster
    184       </td>
    185       <td> ENVI
    186       </td>
    187       <td> Yes
    188       </td>
    189       <td> Yes
    190       </td>
    191       <td> No limits
    192       </td>
    193     </tr>
    194     <tr>
    195       <td> Envisat Image Product (.n1)
    196       </td>
    197       <td> Envisat
    198       </td>
    199       <td> No
    200       </td>
    201       <td> No
    202       </td>
    203       <td> --
    204       </td>
    205     </tr>
    206     <tr>
    207       <td> EOSAT FAST Format
    208       </td>
    209       <td> FAST
    210       </td>
    211       <td> No
    212       </td>
    213       <td> Yes
    214       </td>
    215       <td> --
    216       </td>
    217     </tr>
    218     <tr>
    219       <td> FITS (.fits)
    220       </td>
    221       <td> FITS
    222       </td>
    223       <td> Yes
    224       </td>
    225       <td> No
    226       </td>
    227       <td><br>
    228       </td>
    229     </tr>
    230     <tr>
    231       <td> Graphics Interchange Format (.gif)
    232       </td>
    233       <td> GIF
    234       </td>
    235       <td> Yes
    236       </td>
    237       <td> No
    238       </td>
    239       <td> 2GB
    240       </td>
    241     </tr>
    242     <tr>
    243       <td> Arc/Info Binary Grid (.adf)
    244       </td>
    245       <td> GIO
    246       </td>
    247       <td> Yes
    248       </td>
    249       <td> Yes
    250       </td>
    251       <td><br>
    252       </td>
    253     </tr>
    254     <tr>
    255       <td> GRASS Rasters
    256       </td>
    257       <td> GRASS
    258       </td>
    259       <td> No
    260       </td>
    261       <td> Yes
    262       </td>
    263       <td> --
    264       </td>
    265     </tr>
    266     <tr>
    267       <td> TIFF / GeoTIFF (.tif)
    268       </td>
    269       <td> GTiff
    270       </td>
    271       <td> Yes
    272       </td>
    273       <td> Yes
    274       </td>
    275       <td> 4GiB
    276       </td>
    277     </tr>
    278     <tr>
    279       <td> Hierarchical Data Format Release 4 (HDF4)
    280       </td>
    281       <td> HDF4
    282       </td>
    283       <td> Yes
    284       </td>
    285       <td> Yes
    286       </td>
    287       <td> 2GiB
    288       </td>
    289     </tr>
    290     <tr>
    291       <td> Erdas Imagine (.img)
    292       </td>
    293       <td> HFA
    294       </td>
    295       <td> Yes
    296       </td>
    297       <td> Yes
    298       </td>
    299       <td> No limits
    300       </td>
    301     </tr>
    302     <tr>
    303       <td> Atlantis MFF2e
    304       </td>
    305       <td> HKV
    306       </td>
    307       <td> Yes
    308       </td>
    309       <td> Yes
    310       </td>
    311       <td> No limits
    312       </td>
    313     </tr>
    314     <tr>
    315       <td> Image Display and Analysis (WinDisp)
    316       </td>
    317       <td> IDA
    318       </td>
    319       <td> Yes
    320       </td>
    321       <td> Yes
    322       </td>
    323       <td> 2GB
    324       </td>
    325     </tr>
    326     <tr>
    327       <td> ILWIS Raster Map (.mpr,.mpl)
    328       </td>
    329       <td> ILWIS
    330       </td>
    331       <td> Yes
    332       </td>
    333       <td> Yes
    334       </td>
    335       <td> --
    336       </td>
    337     </tr>
    338     <tr>
    339       <td> Japanese DEM (.mem)
    340       </td>
    341       <td> JDEM
    342       </td>
    343       <td> No
    344       </td>
    345       <td> Yes
    346       </td>
    347       <td> --
    348       </td>
    349     </tr>
    350     <tr>
    351       <td> JPEG JFIF (.jpg)
    352       </td>
    353       <td> JPEG
    354       </td>
    355       <td> Yes
    356       </td>
    357       <td> Yes
    358       </td>
    359       <td> 4GiB (max dimentions 65500x65500)
    360       </td>
    361     </tr>
    362     <tr>
    363       <td> JPEG2000 (.jp2, .j2k)
    364       </td>
    365       <td> JPEG2000
    366       </td>
    367       <td> Yes
    368       </td>
    369       <td> Yes
    370       </td>
    371       <td> 2GiB
    372       </td>
    373     </tr>
    374     <tr>
    375       <td> JPEG2000 (.jp2, .j2k)
    376       </td>
    377       <td> JP2KAK
    378       </td>
    379       <td> Yes
    380       </td>
    381       <td> Yes
    382       </td>
    383       <td> No limits
    384       </td>
    385     </tr>
    386     <tr>
    387       <td> NOAA Polar Orbiter Level 1b Data Set (AVHRR)
    388       </td>
    389       <td> L1B
    390       </td>
    391       <td> No
    392       </td>
    393       <td> Yes
    394       </td>
    395       <td> --
    396       </td>
    397     </tr>
    398     <tr>
    399       <td> Erdas 7.x .LAN and .GIS
    400       </td>
    401       <td> LAN
    402       </td>
    403       <td> No
    404       </td>
    405       <td> Yes
    406       </td>
    407       <td> 2GB
    408       </td>
    409     </tr>
    410     <tr>
    411       <td> In Memory Raster
    412       </td>
    413       <td> MEM
    414       </td>
    415       <td> Yes
    416       </td>
    417       <td> Yes
    418       </td>
    419       <td> 2GiB
    420       </td>
    421     </tr>
    422     <tr>
    423       <td> Atlantis MFF
    424       </td>
    425       <td> MFF
    426       </td>
    427       <td> Yes
    428       </td>
    429       <td> Yes
    430       </td>
    431       <td> No limits
    432       </td>
    433     </tr>
    434     <tr>
    435       <td> Multi-resolution Seamless Image Database
    436       </td>
    437       <td> MrSID
    438       </td>
    439       <td> No
    440       </td>
    441       <td> Yes
    442       </td>
    443       <td> --
    444       </td>
    445     </tr>
    446     <tr>
    447       <td> NDF
    448       </td>
    449       <td> NLAPS Data Format
    450       </td>
    451       <td> No
    452       </td>
    453       <td> Yes
    454       </td>
    455       <td> No limits
    456       </td>
    457     </tr>
    458     <tr>
    459       <td> NITF
    460       </td>
    461       <td> NITF
    462       </td>
    463       <td> Yes
    464       </td>
    465       <td> Yes
    466       </td>
    467       <td><br>
    468       </td>
    469     </tr>
    470     <tr>
    471       <td> NetCDF
    472       </td>
    473       <td> netCDF
    474       </td>
    475       <td> Yes
    476       </td>
    477       <td> Yes
    478       </td>
    479       <td> 2GB
    480       </td>
    481     </tr>
    482     <tr>
    483       <td> OGDI Bridge
    484       </td>
    485       <td> OGDI
    486       </td>
    487       <td> No
    488       </td>
    489       <td> Yes
    490       </td>
    491       <td> --
    492       </td>
    493     </tr>
    494     <tr>
    495       <td> PCI .aux Labelled
    496       </td>
    497       <td> PAux
    498       </td>
    499       <td> Yes
    500       </td>
    501       <td> No
    502       </td>
    503       <td> No limits
    504       </td>
    505     </tr>
    506     <tr>
    507       <td> PCI Geomatics Database File
    508       </td>
    509       <td> PCIDSK
    510       </td>
    511       <td> Yes
    512       </td>
    513       <td> Yes
    514       </td>
    515       <td> No limits
    516       </td>
    517     </tr>
    518     <tr>
    519       <td> Portable Network Graphics (.png)
    520       </td>
    521       <td> PNG
    522       </td>
    523       <td> Yes
    524       </td>
    525       <td> No
    526       </td>
    527       <td><br>
    528       </td>
    529     </tr>
    530     <tr>
    531       <td> PCRaster (.map)
    532       </td>
    533       <td> PCRaster
    534       </td>
    535       <td> Yes
    536       </td>
    537       <td> No
    538       </td>
    539       <td><br>
    540       </td>
    541     </tr>
    542     <tr>
    543       <td> Netpbm (.ppm,.pgm)
    544       </td>
    545       <td> PNM
    546       </td>
    547       <td> Yes
    548       </td>
    549       <td> No
    550       </td>
    551       <td> No limits
    552       </td>
    553     </tr>
    554     <tr>
    555       <td> RadarSat2 XML (product.xml)
    556       </td>
    557       <td> RS2
    558       </td>
    559       <td> No
    560       </td>
    561       <td> Yes
    562       </td>
    563       <td> 4GB
    564       </td>
    565     </tr>
    566     <tr>
    567       <td> USGS SDTS DEM (*CATD.DDF)
    568       </td>
    569       <td> SDTS
    570       </td>
    571       <td> No
    572       </td>
    573       <td> Yes
    574       </td>
    575       <td> --
    576       </td>
    577     </tr>
    578     <tr>
    579       <td> SAR CEOS
    580       </td>
    581       <td> SAR_CEOS
    582       </td>
    583       <td> No
    584       </td>
    585       <td> Yes
    586       </td>
    587       <td> --
    588       </td>
    589     </tr>
    590     <tr>
    591       <td> USGS ASCII DEM (.dem)
    592       </td>
    593       <td> USGSDEM
    594       </td>
    595       <td> No
    596       </td>
    597       <td> Yes
    598       </td>
    599       <td> --
    600       </td>
    601     </tr>
    602     <tr>
    603       <td> X11 Pixmap (.xpm)
    604       </td>
    605       <td> XPM
    606       </td>
    607       <td> Yes
    608       </td>
    609       <td> No
    610       </td>
    611       <td><br>
    612       </td>
    613     </tr>
    614   </tbody>
    615 </table>
    616 
     28<PRE>
     29
     30Long Format Name                                        Code                    Creation        Georeferencing          Maximum File Size
     31
     32Arc/Info ASCII Grid                                     AAIGrid                 Yes             Yes                     No limits
     33Arc/Info Binary Grid                                    AIG                     No              Yes                     --
     34AIRSAR Polarimetric                                     AIRSAR                  No              No                      --
     35Microsoft Windows Device Independent Bitmap (.bmp)      BMP                     Yes             Yes                     4GiB
     36BSB Nautical Chart Format (.kap)                        BSB                     No              Yes                     --
     37VTP Binary Terrain Format (.bt)                         BT                      Yes             Yes                     --
     38CEOS (Spot for instance)                                CEOS                    No              No                      --
     39First Generation USGS DOQ (.doq)                        DOQ1                    No              Yes                     --
     40New Labelled USGS DOQ (.doq)                            DOQ2                    No              Yes                     --
     41Data (.dt0, .dt1)                                       DTED                    No              Yes                     --
     42ERMapper Compressed Wavelets (.ecw)                     ECW                     Yes             Yes                     
     43ESRI .hdr Labelled                                      EHdr                    No              Yes                     --
     44ENVI .hdr Labelled Raster                               ENVI                    Yes             Yes                     No limits
     45Envisat Image Product (.n1)                             Envisat                 No              No                      --
     46EOSAT FAST Format                                       FAST                    No              Yes                     --
     47FITS (.fits)                                            FITS                    Yes             No                     
     48Graphics Interchange Format (.gif)                      GIF                     Yes             No                      2GB
     49Arc/Info Binary Grid (.adf)                             GIO                     Yes             Yes                 
     50GRASS Rasters                                           GRASS                   No              Yes                     --
     51TIFF / GeoTIFF (.tif)                                   GTiff                   Yes             Yes                     4GiB
     52Hierarchical Data Format Release 4 (HDF4)               HDF4                    Yes             Yes                     2GiB
     53Erdas Imagine (.img)                                    HFA                     Yes             Yes                     No limits
     54Atlantis MFF2e                                          HKV                     Yes             Yes                     No limits
     55Image Display and Analysis (WinDisp)                    IDA                     Yes             Yes                     2GB
     56ILWIS Raster Map (.mpr,.mpl)                            ILWIS                   Yes             Yes                     --
     57Japanese DEM (.mem)                                     JDEM                    No              Yes                     --
     58JPEG JFIF (.jpg)                                        JPEG                    Yes             Yes                     4GiB (max dimentions 65500x65500)
     59JPEG2000 (.jp2, .j2k)                                   JPEG2000                Yes             Yes                     2GiB
     60JPEG2000 (.jp2, .j2k)                                   JP2KAK                  Yes             Yes                     No limits
     61NOAA Polar Orbiter Level 1b Data Set (AVHRR)            L1B                     No              Yes                     --
     62Erdas 7.x .LAN and .GIS                                 LAN                     No              Yes                     2GB
     63In Memory Raster                                        MEM                     Yes             Yes                     2GiB
     64Atlantis MFF                                            MFF                     Yes             Yes                     No limits
     65Multi-resolution Seamless Image Database                MrSID                   No              Yes                     --
     66NDF                                                     NLAPS Data Format       No              Yes                     No limits
     67NITF                                                    NITF                    Yes             Yes             
     68NetCDF                                                  netCDF                  Yes             Yes                     2GB
     69OGDI Bridge                                             OGDI                    No              Yes                     --
     70PCI .aux Labelled                                       PAux                    Yes             No                      No limits
     71PCI Geomatics Database File                             PCIDSK                  Yes             Yes                     No limits
     72Portable Network Graphics (.png)                        PNG                     Yes             No             
     73PCRaster (.map)                                         PCRaster                Yes             No                     
     74Netpbm (.ppm,.pgm)                                      PNM                     Yes             No                      No limits
     75RadarSat2 XML (product.xml)                             RS2                     No              Yes                     4GB
     76USGS SDTS DEM (*CATD.DDF)                               SDTS                    No              Yes                     --
     77SAR CEOS                                                SAR_CEOS                No              Yes                     --
     78USGS ASCII DEM (.dem)                                   USGSDEM                 No              Yes                     --
     79X11 Pixmap (.xpm)                                       XPM                     Yes             No                     
     80</PRE>
    61781<H2>Location Creation</H2>
    61882

  • grass/branches/releasebranch_6_3/raster/r.le/r.le.setup/sample.c

    r23552 r29462  
    2323#include <stdlib.h>
    2424#include <grass/gis.h>
    25 #include <grass/site.h>
    26 #include "setup.h"
     25#include <grass/Vect.h>
    2726#include <grass/config.h>
    2827#include <grass/raster.h>
    2928#include <grass/display.h>
     29#include <grass/glocale.h>
     30#include "setup.h"
    3031
    3132
    … …  
    730731        double nx, double x, double y)
    731732{
    732   char    *sites_mapset, sites_file_name[GNAME_MAX], *desc, *cmd;
    733   FILE    *sites_fp;
     733  char    *sites_mapset, sites_file_name[GNAME_MAX], *cmd;
     734  struct  Map_info Map;
    734735  struct  Cell_head region;
    735   double  east_coord, north_coord, D_u_to_a_col(), D_u_to_a_row();
     736  double  D_u_to_a_col(), D_u_to_a_row();
    736737  int     i, j, k, cnt=0, w_w = right - left, w_l = bot - top, exp1, exp2,
    737738          dx = w_w, dy = w_l, l, t, left1 = left, top1 = top, n, tmp,
    738739          ulrow, ulcol, *row_buf, lap=0;
     740  static struct line_pnts *Points;
     741  struct line_cats *Cats;
     742  int ltype;
    739743
    740744/*   VARIABLES:
    … …  
    915919
    916920  else if (method==5){
    917      sites_mapset=G_ask_sites_old("    Enter name of site map", sites_file_name) ;
     921     sites_mapset = G_ask_vector_old("    Enter name of vector points map", sites_file_name);
    918922     if (sites_mapset == NULL) {
    919923        G_system("d.frame -e");
    … …  
    921925     }
    922926
    923      if ((sites_fp = G_fopen_sites_old(sites_file_name,sites_mapset)) == NULL) {
    924         fprintf(stderr, "\n    Can't open sites file %s\n",sites_file_name);
    925 
    926      }
     927     Vect_open_old(&Map, sites_file_name, sites_mapset);
     928/*    fprintf(stderr, "\n    Can't open vector points file %s\n", sites_file_name); */
     929
    927930     *sites = 0;
    928931     i = 0;
    929932     n = 0;
    930933
    931      while( G_get_site(sites_fp,&east_coord,&north_coord,&desc) > 0) {
    932         ulcol = ((int)(D_u_to_a_col(east_coord))) + 1 - u_w/2;
    933         ulrow = ((int)(D_u_to_a_row(north_coord))) + 1 - u_l/2;
     934     Points = Vect_new_line_struct();    /* init line_pnts struct */
     935     Cats = Vect_new_cats_struct();
     936
     937     while (1) {
     938        ltype =  Vect_read_next_line (&Map, Points, Cats);
     939        if ( ltype == -1 ) G_fatal_error(_("Cannot read vector"));
     940        if ( ltype == -2 ) break;  /* EOF */
     941        /* point features only. (GV_POINTS is pts AND centroids, GV_POINT is just pts) */
     942        if (!(ltype & GV_POINT)) continue;
     943
     944        ulcol = ((int)(D_u_to_a_col(Points->x[0]))) + 1 - u_w/2;
     945        ulrow = ((int)(D_u_to_a_row(Points->y[0]))) + 1 - u_l/2;
    934946        if (ulcol <= left || ulrow <= top || ulcol+u_w-1 > right || ulrow+u_l-1 > bot) {
    935947           fprintf(stderr, "    No sampling unit over site %d at east=%8.1f north=%8.1f\n",
    936               n+1,east_coord,north_coord);
     948              n+1, Points->x[0], Points->y[0]);
    937949           fprintf(stderr, "       as it would extend outside the map\n");
    938950
    … …  
    954966     G_system(cmd);
    955967     G_free (cmd);
     968
     969     Vect_close(&Map);
     970     G_free(Points);
     971     G_free(Cats);
    956972
    957973  }

  • grass/branches/releasebranch_6_3/raster/r.los/description.html

    r25142 r29462  
    7373</pre></div>
    7474
     75<H2>TODO</H2>
     76
     77Rewrite using ideas from <em>r.cva</em> and a method which scales better
     78to large regions.<BR>A suggested method is detailed in:<BR>
     79Izraelevitz, David (USACE).<BR>
     80'A Fast Algorithm for Approximate Viewshed Computation'<BR>
     81<i>Photogrammetric Engineering & Remote Sensing</i>, July 2003
     82<!-- http://article.gmane.org/gmane.comp.gis.grass.devel/1781
     83  Post by Paul Kelly 2003-08-13 to grass-dev,
     84  "Re: [bug #2061] (grass) r.los needs FP update" -->
    7585
    7686<H2>SEE ALSO</H2>

  • grass/branches/releasebranch_6_3/raster/r.report/description.html

    r19577 r29462  
    8888<A HREF="r.describe.html">r.describe</A>,
    8989<A HREF="r.info.html">r.info</A>,
    90 <A HREF="r.stats.html">r.stats</A></EM>
     90<A HREF="r.stats.html">r.stats</A>,
     91<A HREF="r.univar.html">r.univar</A>
     92</EM>
    9193
    9294<H2>AUTHOR</H2>

  • grass/branches/releasebranch_6_3/raster/r.resamp.rst/description.html

    r22103 r29462  
    1111region (which may be different from that of the <i>input</i> raster map).
    1212<p>
    13 Optionally, and simultaneously with interpolation, the topographic parameters
    14 slope, aspect, profile curvature (measured in the direction of steepest
     13Optionally, and simultaneously with interpolation, topographic parameters
     14are computed from an input raster map containing z-values of elevation/depth: slope,
     15aspect, profile curvature (measured in the direction of steepest
    1516slope), tangential curvature (measured in the direction of a tangent to
    16 contour line) and/or mean curvature are computed and saved as raster maps
     17contour line) and/or mean curvature are computed from and saved as raster maps
    1718as specified by the options <i>slope, aspect, pcurv, tcurv, mcurv</i> respectively.
    1819<p>

  • grass/branches/releasebranch_6_3/raster/r.statistics/description.html

    r22960 r29462  
    11<H2>DESCRIPTION</H2>
    22
    3 <EM>r.statistics</EM> is a tool, where different class, resp. object
    4 oriented statistical analysis methods are possible (called "zonal statistics"
    5 in some GIS). As data preparation, all areas of contiguous cell category values
    6 can be clumped with <EM>r.clump</EM>.
     3<EM>r.statistics</EM> is a tool to analyse exploratory statistics of a "cover
     4layer" according to how it intersects with objects in a "base layer".  A
     5variety of standard statistical measures are possible (called "zonal statistics"
     6in some GIS).
     7
     8All cells in the base layer are considered one object for the analysis.  For
     9some applications, one will first want to prepare the input data so that
     10all areas of contiguous cell category values in the base layer are uniquely
     11identified, which can be done with <EM>r.clump</EM>.
    712<BR>
    813
    … …  
    2328</ul>
    2429
    25 The calculations will be performed for areas with data of the
    26 covering-layers which belong in the base-layer o the same category.
     30The calculations will be performed on each area of data of the
     31cover layers which fall within each unique value, or category, of the base layer.
    2732<P>
    2833Setting the <EM>-c</EM> flag the category lables of the covering raster
    … …  
    3237
    3338<P>
    34 The output-layer is a reclassified version of the base-layer with identical
    35 category values.  The results of the calculations are stored in the category
    36 labels of the output-layer.
     39All calculations except "distribution" create an output layer.  The output
     40layer is a reclassified version of the base layer with identical
     41category values, but modified category labels - the results of the calculations
     42are stored in the category labels of the output layer.
    3743
    3844<P>
    39 The described output is valid for all calculations with exception of
    40 distribution. Here the output is given to stdout. A file name eventually
    41 specified will be ignored. The result will be a table with three columns.
    42 In the 1. column are the category values of the base-layer (a), in the 2.
    43 column the associated value of the cover-Layers (b) and in the 3. column the
    44 percentage of b from a. Example:
     45For distributions, the output is printed to the user interface (stdout).
     46If an output file name was specified, it will be ignored. The result will
     47be a text table with three columns.
     48In the first column are the category values of the base layer (a), in the second
     49column the associated value of the cover layers (b), and in the third column the
     50percentage of area in that base layer category (a) that falls into that row's
     51value in the cover layer(b). Example:
    4552
    4653<div class="code"><pre>
    … …  
    5663     .
    5764</pre></div>
     65
     66So for the first line in the output above, we see that 23% of the cells of the
     67base layer category 1 have a value of 124 in the cover layer.
    5868
    5969To transfer the values stored as category labels into cell values,
    … …  
    7888<A HREF="r.median.html">r.median</A>,
    7989<A HREF="r.mapcalc.html">r.mapcalc</A>,
    80 <A HREF="r.neighbors.html">r.neighbors</A>
     90<A HREF="r.neighbors.html">r.neighbors</A>,
     91<A HREF="r.univar.html">r.univar</A>
     92<A HREF="r.cats">r.cats</A>
    8193</EM>
    8294

  • grass/branches/releasebranch_6_3/raster/r.stats/description.html

    r22959 r29462  
    8080<A HREF="r.describe.html">r.describe</A>,
    8181<A HREF="r.report.html">r.report</A>,
    82 <A HREF="r.statistics.html">r.statistics</A>
     82<A HREF="r.statistics.html">r.statistics</A>,
     83<A HREF="r.univar.html">r.univar</A>
    8384</EM>
    8485

  • grass/branches/releasebranch_6_3/scripts/d.monsize/d.monsize

    r25359 r29462  
    77#               updated to GRASS 5.7 by Michael Barton (michael.barton@asu.edu)
    88# PURPOSE:      selects/starts specified monitor at specified window size
    9 # COPYRIGHT:    (C) 2004 by the GRASS Development Team
     9# COPYRIGHT:    (C) 2004-2007 by the GRASS Development Team
    1010#
    1111#               This program is free software under the GNU General Public
    … …  
    1414#
    1515#############################################################################
    16 
    17 
    1816# NOTE: This is based on the output pattern of d.mon -p
    1917# Anantha Prasad <aprasad/ne_de@fs.fed.us>
    … …  
    2119# Version 1: Author?. Tue, 25 Jan 2000 10:31:37
    2220
     21
     22#### PLEASE REMOVE "SET" FROM OPTION NAMES FOR GRASS 7
     23####  (if this module is even used there; if so merge with d.resize)
    2324
    2425#%Module
    … …  
    4748
    4849
    49 
    5050if test -z "$GISBASE"; then
    5151 echo "You must be in GRASS GIS to run this program." >&2
    … …  
    5757fi
    5858
     59#### check if we have awk
     60if [ ! -x "`which awk`" ] ; then
     61    g.message -e "awk required, please install awk/gawk first"
     62    exit 1
     63fi
     64
    5965GRASS_WIDTH=$GIS_OPT_SETWIDTH
    6066export GRASS_WIDTH
    … …  
    6470
    6571# Check the current status of the monitor
    66 st1=`d.mon -p| sed s/'No monitor currently selected for output'//`
    67 st2=`echo $st1 | cut -d ":" -f2`
     72OPEN_MON=`d.mon -p | grep ':' | cut -d':' -f2  | awk '{print $1}'`
    6873
    69 # STrip leading blanks
    70 st3=`echo $st2|perl -pne 's/^\s+//g'`
    7174
    72 if [ -z "$st3" ]
    73 then
     75if [ -z "$OPEN_MON" ] ; then
    7476  # No monitor running so start a new one....
    75     g.message "No monitor selected"
    76     g.message "Starting monitor $GIS_OPT_SETMONITOR of size ${GIS_OPT_SETWIDTH}X${GIS_OPT_SETHEIGHT} ..."
    77   d.mon start=$GIS_OPT_SETMONITOR
     77    g.message -v "No monitor selected"
     78    g.message "Starting monitor $GIS_OPT_SETMONITOR at ${GIS_OPT_SETWIDTH}X${GIS_OPT_SETHEIGHT} ..."
     79    d.mon start=$GIS_OPT_SETMONITOR
    7880else
    79   if [ "$GIS_OPT_SETMONITOR" = "$st3" ]
    80   then
     81  if [ "$GIS_OPT_SETMONITOR" = "$OPEN_MON" ] ; then
    8182    # Monitor is already running...stop it and start new one
     83    g.message -v "Monitor already running and selected"
     84    g.message "Restarting monitor $GIS_OPT_SETMONITORAT at ${GIS_OPT_SETWIDTH}X${GIS_OPT_SETHEIGHT} ..."
     85# d.save > tmp file then source the tmp file to restore after the new mon is opened?
     86# (just use d.resize instead)
    8287    d.mon stop=$GIS_OPT_SETMONITOR
    83     g.message "Monitor already running and selected"
    84     g.message "Restarting monitor $GIS_OPT_SETMONITORAT size ${GIS_OPT_SETWIDTH}X${GIS_OPT_SETHEIGHT} ..."
     88# why the sleep?
    8589    sleep 4
    8690    d.mon start=$GIS_OPT_SETMONITOR
    8791  else
    88     g.message "A different monitor is selected"
    89     g.message "Selecting and restarting monitor ${GIS_OPT_SETWIDTH}X${GIS_OPT_SETHEIGHT} ..."
     92    g.message -v "A different monitor is selected"
     93    g.message "Selecting and restarting monitor at ${GIS_OPT_SETWIDTH}X${GIS_OPT_SETHEIGHT} ..."
    9094    #d.mon select=$GIS_OPT_SETMONITOR
    9195    d.mon stop=$GIS_OPT_SETMONITOR
     96# why the sleep?
    9297    sleep 4
    9398    d.mon start=$GIS_OPT_SETMONITOR

  • grass/branches/releasebranch_6_3/scripts/r.in.wms/description.html

    r24714 r29462  
    6666g.region save=panhandle-90ft
    6767
    68 r.in.wms output=elevation_feet mapserver=http://wms.jpl.nasa.gov/wms.cgi layers=us_ned styles=feet_real -o region=panhandle-90ft
     68r.in.wms output=elevation_feet mapserver=http://wms.jpl.nasa.gov/wms.cgi \
     69         layers=us_ned styles=feet_real -o region=panhandle-90ft
    6970</pre></div>
    7071

  • grass/branches/releasebranch_6_3/scripts/r.in.wms/r.in.wms

    r25031 r29462  
    123123#% description: Additional options for r.tileset
    124124#% required : no
    125 #% guisection: Request
    126125#%end
    127126#%option

  • grass/branches/releasebranch_6_3/scripts/r.regression.line/description.html

    r25454 r29462  
    55Optionally saves regression coefficients to an ASCII file.
    66The result includes the following coefficients:
    7 offset (a) and gain (b), residuals (R),
    8 number of elements (N), medians (medX, medY), standard deviations
     7offset/intercept (a) and gain/slope (b), residuals (R),
     8number of elements (N), means (medX, medY), standard deviations
    99(sdX, sdY), and the F test for testing the significance of the
    1010regression model as a whole (F).

  • grass/branches/releasebranch_6_3/scripts/r.regression.line/r.regression.line

    r25454 r29462  
    116116           echo "   R: sumXY - sumX*sumY/tot"
    117117           echo "   N: number of elements"
    118            echo "   medX, medY: Medians"
     118           echo "   medX, medY: Means"
    119119           echo "   sdX, sdY: Standard deviations"
    120120           echo "a  b  R  N  F medX  sdX  medY  sdY"
    … …  
    131131           echo "   R: sumXY - sumX*sumY/tot" >> "$TMP"c
    132132           echo "   N: number of elements" >> "$TMP"c
    133            echo "   medX, medY: Medians" >> "$TMP"c
     133           echo "   medX, medY: Means" >> "$TMP"c
    134134           echo "   sdX, sdY: Standard deviations" >> "$TMP"c
    135135           echo "a  b  R  N  F medX  sdX  medY  sdY" >> "$TMP"c

  • grass/branches/releasebranch_6_3/scripts/r.shaded.relief/r.shaded.relief

    r24520 r29462  
    159159if [ "$GIS_OPT_UNITS" = "meters" ] ; then
    160160   #scale=111120
    161    scale=`echo $scale | awk '{printf("%f", $1 * 111120 )}'`
     161   scale=`echo $scale | awk '{printf("%f", $1 * 1852*60 )}'`
    162162fi
    163163
    164164#LatLong locations only:
    165165if [ "$GIS_OPT_UNITS" = "feet" ] ; then
    166    #scale=370400
    167    scale=`echo $scale | awk '{printf("%f", $1 * 370400 )}'`
     166   #scale=364567.2
     167   scale=`echo $scale | awk '{printf("%f", $1 * 6076.12*60 )}'`
    168168fi             
    169169

  • grass/branches/releasebranch_6_3/scripts/v.rast.stats/v.rast.stats

    r24912 r29462  
    3737#%End
    3838#%option
     39#% key: layer
     40#% type: integer
     41#% description: Layer to which the table to be changed is connected
     42#% answer: 1
     43#% required : no
     44#%end
     45#%option
    3946#% key: raster
    4047#% type: string
    … …  
    196203DB_DATABASE="`v.db.connect -g "$VECTOR" | cut -d' ' -f4`"
    197204
     205#Find out which table is linked to the vector map on the given layer
     206TABLE=`v.db.connect $VECTOR -g | grep -w $GIS_OPT_LAYER | awk '{print $2}'`
     207if [ -z "$TABLE" ] ; then
     208   g.message -e 'There is no table connected to this map! Run v.db.connect or v.db.addtable first.'
     209   exit 1
     210fi
    198211
    199212
    … …  
    292305      fi
    293306
    294       echo "UPDATE $VECTOR SET ${colname}=${value} WHERE cat=$i;" >> "$SQLTMP"
     307      echo "UPDATE $TABLE SET ${colname}=${value} WHERE cat=$i;" >> "$SQLTMP"
    295308   done
    296309

  • grass/branches/releasebranch_6_3/scripts/v.report/v.report

    r24784 r29462  
    5050#% key: units
    5151#% type: string
    52 #% description: mi(les),f(eet),me(ters),k(ilometers),a(cres),h(ectares)
     52#% description: mi(les),f(eet),me(ters),k(ilometers),a(cres),h(ectares),p(ercent)
    5353#% options: mi,miles,f,feet,me,meters,k,kilometers,a,acres,h,hectares,p,percent
    5454#% required: no
    … …  
    131131
    132132#check for optional units parameter:
    133 if [ ! -z $GIS_OPT_UNITS ] ; then
     133if [ -n "$GIS_OPT_UNITS" ] ; then
    134134   UNITSPARAM="units=$GIS_OPT_UNITS"
    135135   # reset to meters since percent are unsupported in v.to.db
    … …  
    172172
    173173# calculate percents if requested
    174 if  [ ! -z $GIS_OPT_UNITS ] ; then
     174if  [ -n "$GIS_OPT_UNITS" ] ; then
    175175    if [ "$GIS_OPT_UNITS" = "p" -o "$GIS_OPT_UNITS" = "percent" ] ; then
    176176   

  • grass/branches/releasebranch_6_3/swig/perl/Makefile.PL.in

    r20764 r29462  
    1717WriteMakefile(
    1818              NAME => 'Grass',
    19               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",
     19              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",
    2020              OBJECT => 'grass_wrap.o R_slope_aspect/r_slope_aspect/opennew.o R_slope_aspect/r_slope_aspect/r_slope_aspect.o',
    2121              INC => "-I$grass_inc_dir"

  • grass/branches/releasebranch_6_3/swig/perl/R_slope_aspect/r_slope_aspect/r_slope_aspect.c

    r24318 r29462  
    370370    {
    371371        G_warning("You must specify at least one of the parameters:"
    372                 "\n<%s>, <%s>, <%s>, <%s>, <%s>, <%s>, <%s>, <%s>,  or <%s>\n",
     372                "\n<%s>, <%s>, <%s>, <%s>, <%s>, <%s>, <%s>, <%s> or <%s>.\n",
    373373                parm.slope->key, parm.aspect->key, parm.pcurv->key,
    374374                parm.tcurv->key, parm.dx->key, parm.dy->key,
    … …  
    381381    mapset = G_find_cell2(elev_name, "");
    382382    if (!mapset)
    383         G_fatal_error (_("elevation file [%s] not found"), elev_name);
     383        G_fatal_error (_("Raster map <%s> not found"), elev_name);
    384384
    385385    /* set the window from the header for the elevation file */
    … …  
    432432    factor = G_database_units_to_meters_factor();
    433433    if (factor != 1.0)
    434         G_warning("converting units to meters, factor=%.6f", factor);
     434        G_warning("Converting units to meters, factor=%.6f", factor);
    435435
    436436    G_begin_distance_calculations();
    … …  
    10331033
    10341034    G_close_cell (elevation_fd);
    1035     G_message(_("Creating support files"));
     1035    G_message(_("Creating support files..."));
    10361036
    10371037    G_message(_("Elevation products for mapset [%s] in [%s]"),
    … …  
    10511051
    10521052        G_read_raster_cats (aspect_name, G_mapset(), &cats);
    1053         G_set_raster_cats_title ("aspect counterclockwise in degrees from east", &cats);
    1054 
    1055         G_message(_("min computed aspect %.4f max computed aspect %.4f"), min_asp, max_asp);
     1053        G_set_raster_cats_title ("Aspect counterclockwise in degrees from east", &cats);
     1054
     1055        G_message(_("Min computed aspect %.4f, max computed aspect %.4f"), min_asp, max_asp);
    10561056        /* the categries quant intervals are 1.0 long, plus
    10571057           we are using reverse order so that the label looked up
    … …  
    11461146        else if(perc) G_set_raster_cats_title ("percent slope", &cats);
    11471147
    1148         G_message(_("min computed slope %.4f max computed slope %.4f"), min_slp, max_slp);
     1148        G_message(_("Min computed slope %.4f, max computed slope %.4f"), min_slp, max_slp);
    11491149        /* the categries quant intervals are 1.0 long, plus
    11501150           we are using reverse order so that the label looked up

  • grass/branches/releasebranch_6_3/translators.csv

    r24801 r29462  
    1 Solomon Gizaw <solohavi yahoo.com>, AM
    2 Dr. Alaa Masoud <alaamasoud hotmail.com>, AR
    3 Radim Blazek <radim.blazek gmail.com>, CS
    4 Michal Bíl <michal.bil seznam.cz>, CZ
    5 Jáchym Cepický <jachym.cepicky centrum.cz>, CZ
    6 Martin Landa <landa.martin gmail.com>, CZ
    7 Záboj Hrázský <zabojhrazsky seznam.cz>, CZ
    8 Markus Neteler <neteler itc.it>, DE IT
    9 Robert Nuske <rnuske gwdg.de>, DE
    10 Stephan Holl <stephan.holl intevation.de>, DE
    11 Agustin Diez Castillo <adiez uv.es>, ES
    12 Carlos Dávila <carluti users.sourceforge.net>, ES
    13 Daniel Calvelo Aros <dca users.sf.net>, ES FR
    14 Daniel de Castro Victoria <daniel.victoria gmail.com>, ES
    15 el bueno <manzano_jm yahoo.es>, ES
    16 Enrique Cerrillo Cuenca <ecerrillo unex.es>, ES
    17 Luis Izquierdo <luisizq2002 hotmail.com>, ES
    18 Roberto Antolin <tolanss yahoo.es>, ES
    19 Emmanuel Saracco <esaracco users.labs.libre-entreprise.org>, FR
    20 Eve Rousseau <phytosociologue yahoo fr>, FR
    21 Vincent Bain <bain toraval.fr>, FR
    22 Lorenzo Moretti <lorenzo.moretti bologna.enea.it>, IT
    23 Luciano Montanaro <mikelima cirulla.net>, IT
    24 Susumu Nonogaki <nonogaki sci.osaka-cu.ac.jp>, JA
    25 Huidae Cho <grass4u gmail.com>, KO
    26 Maris Nartiss <maris.kde gmail.com>, LV
    27 Peteris Bruns <peteris.bruns gmail.com>, LV
    28 Sheetal Nepte <sheetal_nepte yahoo.co.in>, MR
    29 Artur Niecior <nieart interia.pl>, PL
    30 Marcin Sanecki, PL
    31 Monika Tylus <monikatylus gmail.com>, PL
    32 Paulo E. P. Marcondes <paulomarcondes gmail.com>, PT_BR
    33 Ricardo Oliveira <ricardoabeloliveira gmail.com>, PT_BR
    34 Alex Shevlakov <sixote yahoo.com>, RU
    35 Miha Staut <mihastaut yahoo.co.uk>, SL
    36 Aras.Gor.O Yalcin Yilmaz <yilmazy istanbul.edu.tr>, TR
    37 Bui Huu Manh <bhmanh73 yahoo.com>, VI
    38 Zhang Jun <nilarcs gmail.com>, ZH
     1name,email,languages
     2Solomon Gizaw, <solohavi yahoo.com>, AM
     3Dr. Alaa Masoud, <alaamasoud hotmail.com>, AR
     4Radim Blazek, <radim.blazek gmail.com>, CS
     5Michal Bíl, <michal.bil seznam.cz>, CZ
     6Peteris Bruns, <peteris.bruns gmail.com>, LV
     7Jáchym Cepický, <jachym.cepicky centrum.cz>, CZ
     8Martin Landa, <landa.martin gmail.com>, CZ
     9Záboj Hrázský, <zabojhrazsky seznam.cz>, CZ
     10Markus Neteler, <neteler osgeo.org>, DE IT
     11Robert Nuske, <rnuske gwdg.de>, DE
     12Stephan Holl, <stephan.holl intevation.de>, DE
     13Agustin Diez Castillo, <adiez uv.es>, ES
     14Carlos Dávila, <carluti users.sourceforge.net>, ES
     15Daniel Calvelo Aros, <dca users.sf.net>, ES FR
     16Daniel de Castro Victoria, <daniel.victoria gmail.com>, ES
     17el bueno, <manzano_jm yahoo.es>, ES
     18Enrique Cerrillo Cuenca, <ecerrillo unex.es>, ES
     19Luis Izquierdo, <luisizq2002 hotmail.com>, ES
     20Roberto Antolin, <tolanss yahoo.es>, ES
     21Emmanuel Saracco, <esaracco users.labs.libre-entreprise.org>, FR
     22Eve Rousseau, <phytosociologue yahoo fr>, FR
     23Vincent Bain, <bain toraval.fr>, FR
     24Lorenzo Moretti, <lorenzo.moretti bologna.enea.it>, IT
     25Luciano Montanaro, <mikelima cirulla.net>, IT
     26Susumu Nonogaki, <nonogaki sci.osaka-cu.ac.jp>, JA
     27Huidae Cho, <grass4u gmail.com>, KO
     28Maris Nartiss, <maris.kde gmail.com>, LV
     29Sheetal Nepte, <sheetal_nepte yahoo.co.in>, MR
     30Artur Niecior, <nieart interia.pl>, PL
     31Sarawut Ninsawat, <sarawut.map gmail.com>, TH
     32Marcin Sanecki,<? ?>, PL
     33Monika Tylus, <monikatylus gmail.com>, PL
     34Paulo E. P. Marcondes, <paulomarcondes gmail.com>, PT_BR
     35Ricardo Oliveira, <ricardoabeloliveira gmail.com>, PT_BR
     36Alex Shevlakov, <sixote yahoo.com>, RU
     37Miha Staut, <mihastaut yahoo.co.uk>, SL
     38Aras.Gor.O Yalcin Yilmaz, <yilmazy istanbul.edu.tr>, TR
     39Bui Huu Manh, <bhmanh73 yahoo.com>, VI
     40Zhang Jun, <nilarcs gmail.com>, ZH
     41Su Yongheng, <night2008 gmail.com>, ZH
     42Tobias Vigl, <vigltobias icqmail.com>, IT
     43Fernando Ferreira, <fernando vps.fmvz.usp.br>, PT_BR

  • grass/branches/releasebranch_6_3/vector/lidar/lidarlib/InterpSpline.c

    r21983 r29462  
    2323#include <string.h>
    2424
    25 #include <grass/PolimiFunct.h>
     25#include "PolimiFunct.h"
    2626
    2727/*----------------------------------------------------------------------------*/

  • grass/branches/releasebranch_6_3/vector/lidar/lidarlib/raster.c

    r24984 r29462  
    99#include <grass/config.h>
    1010
    11 #include <grass/PolimiFunct.h>
     11#include "PolimiFunct.h"
    1212
    1313/*------------------------------------------------------------------------------------------------*/
    … …  
    7272
    7373                        if (db_execute_immediate (driver, &sql) != DB_OK)
    74                             G_fatal_error (_("It was not possible writing in <%s>."), tab_name);
     74                            G_fatal_error (_("Unable to create table: %s"), buf);
    7575
    7676                    } else if ((*point->y < Overlap.S)) {       /*(1)*/
    … …  
    8686
    8787                        if (db_execute_immediate (driver, &sql) != DB_OK)
    88                             G_fatal_error (_("It was not possible writing in <%s>."), tab_name);
     88                            G_fatal_error (_("Unable to create table: %s"), buf);
    8989
    9090                    } else {                                    /*(1)*/
    … …  
    9898
    9999                        if (db_execute_immediate (driver, &sql) != DB_OK)
    100                             G_fatal_error (_("It was not possible writing in <%s>."), tab_name);
     100                            G_fatal_error (_("Unable to create table: %s"), buf);
    101101                    }
    102102
    … …  
    114114
    115115                        if (db_execute_immediate (driver, &sql) != DB_OK)
    116                             G_fatal_error (_("It was not possible writing in <%s>."), tab_name);
     116                            G_fatal_error (_("Unable to create table: %s"), buf);
    117117                       
    118118                    } else if ((*point->y < Overlap.S)) {       /*(2)*/
    … …  
    128128
    129129                        if (db_execute_immediate (driver, &sql) != DB_OK)
    130                             G_fatal_error (_("It was not possible writing in <%s>."), tab_name);
     130                            G_fatal_error (_("Unable to create table: %s"), buf);
    131131
    132132                    } else {                                    /*(2)*/
    … …  
    140140
    141141                        if (db_execute_immediate (driver, &sql) != DB_OK)
    142                             G_fatal_error (_("It was not possible writing in <%s>."), tab_name);
     142                            G_fatal_error (_("Unable to create table: %s"), buf);
    143143                    }
    144144
    … …  
    154154
    155155                        if (db_execute_immediate (driver, &sql) != DB_OK)
    156                             G_fatal_error (_("It was not possible writing in <%s>."), tab_name);
     156                            G_fatal_error (_("Unable to create table: %s"), buf);
    157157                    } else {                                            /*(1)*/
    158158                        weight = (Overlap.S - *point->y)/overlap;
    … …  
    165165
    166166                        if (db_execute_immediate (driver, &sql) != DB_OK)
    167                             G_fatal_error (_("It was not possible writing in <%s>."), tab_name);
     167                            G_fatal_error (_("Unable to create table: %s"), buf);
    168168                    }
    169169                }

  • grass/branches/releasebranch_6_3/vector/v.in.ascii/in.c

    r25398 r29462  
    306306            if (driver == NULL) {
    307307                Vect_delete(new->answer);
    308                 G_fatal_error(_("Unavle to open database <%s> by driver <%s>"),
     308                G_fatal_error(_("Unable to open database <%s> by driver <%s>"),
    309309                              Vect_subst_var(Fi->database, &Map), Fi->driver);
    310310            }
    … …  
    375375            if (db_execute_immediate(driver, &sql) != DB_OK) {
    376376                Vect_delete(new->answer);
    377                 G_fatal_error(_("Unable create table: %s"),
     377                G_fatal_error(_("Unable to create table: %s"),
    378378                              db_get_string(&sql));
    379379            }

  • grass/branches/releasebranch_6_3/vector/v.in.ogr/description.html

    r25348 r29462  
    1111<P>
    1212The optional <b>spatial</b> parameter defines spatial query extents.
    13 This parameter allows to restrict the region to a spatial subset while
    14 importing the data. All vector completely or partially falling into
    15 this rectangle subregion are imported.
     13This parameter allows the user to restrict the region to a spatial subset
     14while importing the data. All vector features completely or partially
     15falling into this rectangle subregion are imported.
     16The <b>-r</b> current region flag is identical, but uses the current region
     17settings as the spatial bounds (see <em><a href="g.region.html">g.region</a></em>).
    1618<P>
    1719Topology cleaning on areas is automatically performed, but may fail in
    … …  
    6264<ul>
    6365<li><B>SHAPE files</B>
     66<div class="code"><pre>
     67v.in.ogr dsn=/home/user/shape_data/test_shape.shp output=grass_map
     68</pre></div>
     69
     70Alternate method:
    6471<div class="code"><pre>
    6572v.in.ogr dsn=/home/user/shape_data layer=test_shape output=grass_map

  • grass/branches/releasebranch_6_3/vector/v.in.ogr/main.c

    r24817 r29462  
    3232#include "global.h"
    3333
     34#ifndef MAX
     35#  define MIN(a,b)      ((a<b) ? a : b)
     36#  define MAX(a,b)      ((a>b) ? a : b)
     37#endif
     38
    3439int geom(OGRGeometryH hGeom, struct Map_info *Map, int field, int cat, double min_area, int type, int mk_centr );
    3540int centroid(OGRGeometryH hGeom, CENTR *Centr, SPATIAL_INDEX *Sindex, int field, int cat, double min_area, int type);
    … …  
    4550    struct Option *dsn_opt, *out_opt, *layer_opt, *spat_opt, *where_opt, *min_area_opt;
    4651    struct Option *snap_opt, *type_opt, *outloc_opt, *cnames_opt;
    47     struct Flag *list_flag, *no_clean_flag, *z_flag, *notab_flag;
     52    struct Flag *list_flag, *no_clean_flag, *z_flag, *notab_flag, *region_flag;
    4853    struct Flag *over_flag, *extend_flag, *formats_flag, *tolower_flag;
    4954    char   buf[2000], namebuf[2000];
    … …  
    5156    struct Key_Value *loc_proj_info = NULL, *loc_proj_units = NULL;
    5257    struct Key_Value *proj_info, *proj_units;
    53     struct Cell_head cellhd, loc_wind;
     58    struct Cell_head cellhd, loc_wind, cur_wind;
    5459    char   error_msg[8192];
    5560
    … …  
    102107    dsn_opt->label = _("OGR datasource name");
    103108    dsn_opt->description = _("Examples:\n"
    104                              "\t\tESRI Shapefile: directory containing shapefiles\n"
    105                              "\t\tMapInfo File: directory containing mapinfo files");
     109        "\t\tESRI Shapefile: directory containing shapefiles\n"
     110        "\t\tMapInfo File: directory containing mapinfo files");
    106111
    107112    out_opt = G_define_standard_option(G_OPT_V_OUTPUT);
    … …  
    115120    layer_opt->label = _("OGR layer name. If not given, all available layers are imported");
    116121    layer_opt->description = _("Examples:\n"
    117                                "\t\tESRI Shapefile: shapefile name\n"
    118                                "\t\tMapInfo File: mapinfo file name");
     122        "\t\tESRI Shapefile: shapefile name\n"
     123        "\t\tMapInfo File: mapinfo file name");
    119124
    120125    spat_opt = G_define_option();
    … …  
    123128    spat_opt->multiple = YES;
    124129    spat_opt->required = NO;
     130    spat_opt->key_desc = "xmin,ymin,xmax,ymax";
    125131    spat_opt->label = _("Import subregion only");
    126132    spat_opt->guisection = _("Subregion");
    … …  
    137143    min_area_opt->guisection = _("Min-area & snap");
    138144    min_area_opt->description = _("Smaller areas and "
    139                                   "islands are ignored. Should be greater than snap^2");
     145        "islands are ignored. Should be greater than snap^2");
    140146
    141147    type_opt = G_define_standard_option(G_OPT_V_TYPE) ;
    … …  
    143149    type_opt->answer = "";
    144150    type_opt->description = _("Optionaly change default input type");
    145     type_opt->descriptions = _("point;import area centroids as points;"
    146                                "line;import area boundaries as lines;"
    147                                "boundary;import lines as area boundaries;"
    148                                "centroid;import points as centroids");
    149    
     151    type_opt->descriptions =
     152      _("point;import area centroids as points;"
     153        "line;import area boundaries as lines;"
     154        "boundary;import lines as area boundaries;"
     155        "centroid;import points as centroids");
     156
    150157    snap_opt = G_define_option();
    151158    snap_opt->key = "snap";
    … …  
    168175    cnames_opt->required = NO;
    169176    cnames_opt->multiple = YES;
    170     cnames_opt->description = _("List of column names to be used instead of original names, "
    171                               "first is used for category column");
     177    cnames_opt->description =
     178        _("List of column names to be used instead of original names, "
     179          "first is used for category column");
    172180
    173181    list_flag = G_define_flag ();
    … …  
    195203    over_flag->key = 'o';
    196204    over_flag->description = _("Override dataset projection (use location's projection)");
     205
     206    region_flag = G_define_flag();
     207    region_flag->key = 'r';
     208    region_flag->guisection = _("Subregion");
     209    region_flag->description = _("Limit import to the current region");
    197210
    198211    extend_flag = G_define_flag();
    … …  
    337350    Ogr_layer = OGR_DS_GetLayer( Ogr_ds, layers[0] );
    338351
     352    if ( region_flag->answer ) {
     353        if ( spat_opt->answer )
     354            G_fatal_error(_("Select either the current region flag or the spatial option, not both"));
     355
     356        G_get_window (&cur_wind);
     357        xmin=cur_wind.west;
     358        xmax=cur_wind.east;
     359        ymin=cur_wind.south;
     360        ymax=cur_wind.north;
     361    }
    339362    if ( spat_opt->answer ) {
    340363        /* See as reference: gdal/ogr/ogr_capi_test.c */
    … …  
    352375        if ( arg_s_num != 4 )
    353376            G_fatal_error ( _("4 parameters required for 'spatial' parameter"));
     377    }
     378    if ( spat_opt->answer || region_flag->answer) {
    354379        G_debug( 2, "cut out with boundaries: xmin:%f ymin:%f xmax:%f ymax:%f",xmin,ymin,xmax,ymax);
    355380
    … …  
    9751000    Vect_close ( &Map );
    9761001
     1002
     1003/* -------------------------------------------------------------------- */
     1004/*      Extend current window based on dataset.                         */
     1005/* -------------------------------------------------------------------- */
     1006    if( extend_flag->answer )
     1007    {
     1008        G_get_default_window( &loc_wind );
     1009
     1010        loc_wind.north = MAX(loc_wind.north,cellhd.north);
     1011        loc_wind.south = MIN(loc_wind.south,cellhd.south);
     1012        loc_wind.west  = MIN(loc_wind.west, cellhd.west);
     1013        loc_wind.east  = MAX(loc_wind.east, cellhd.east);
     1014
     1015        loc_wind.rows = (int) ceil((loc_wind.north - loc_wind.south)
     1016                                        / loc_wind.ns_res);
     1017        loc_wind.south = loc_wind.north - loc_wind.rows * loc_wind.ns_res;
     1018
     1019        loc_wind.cols = (int) ceil((loc_wind.east - loc_wind.west)
     1020                                        / loc_wind.ew_res);
     1021        loc_wind.east = loc_wind.west + loc_wind.cols * loc_wind.ew_res;
     1022
     1023        G__put_window(&loc_wind, "../PERMANENT", "DEFAULT_WIND");
     1024    }
     1025
    9771026    if (with_z && !z_flag->answer )
    9781027        G_warning (_("Input data contains 3D features. Created vector is 2D only, "

  • grass/branches/releasebranch_6_3/vector/v.net.steiner/description.html

    r24532 r29462  
    33<em>v.net.steiner</em> calculates the optimal connection of nodes on a
    44vector network.
     5
     6<P>
     7A Steiner tree is used to calculate the minimum-cost vector network
     8connecting some number of end nodes in a network framework.
     9For example it could be used to find the path following a road system
     10which will minimize the amount of fibre optic cable needed to connect
     11a series of satellite offices.
     12
    513
    614<h2>EXAMPLE</h2>

  • grass/branches/releasebranch_6_3/vector/v.surf.rst/README

    r10672 r29462  
     1dnorm is an average size of the segment (not window); so points that are
     2farther apart than dnorm + window size are computed independently.
     3
     4############################################################
    15This is a GRASS 5.0 version of a program
    26for interpolation by regularized spline with tension.

  • grass/branches/releasebranch_6_3/vector/v.vol.rst/README

    r14672 r29462  
     1dnorm: in the 3D version we normalize
     2based on the overlapping window rather than segment
     3(essentially based on npmin rather than segmax)
     4
     5Reason: the overlapping window can be large and then the
     6normalization based on the segment size was not sufficient.
     7But that means that the segments are smaller than dnorm.
     8
     9#######################################################
     10HISTORY:
     11
     1202/03/03 (jh) - added deviation site file to the output
     13
     1403/11/00 (jh) - re-written I/O operations, several bug fixes
     15including 3D topo parameters, and 2nd RST derivatives
     16
     1712/07/00 (MN) - added field selection parameter for sites lists
     18                (allows to select column in site_lists)
    119
    220copied from Mark 15.may.1996,
    321just a beta version, not fully tested
    422
    5 03/11/00 (jh) - re-written I/O operations, several bug fixes
    6 including 3D topo parameters, and 2nd RST derivatives
    723
    8 12/07/00 (MN) - added field selection parameter for sites lists 
    9                 (allows to select column in site_lists)
    10 
    11 02/03/03 (jh) - added deviation site file to the output

  • grass/branches/releasebranch_6_3/vector/v.vol.rst/user1.c

    r24989 r29462  
    278278    G_warning ("There are points outside specified 2D/3D region--ignored %d points (total points: %d)", OUTRANGE, k);
    279279  if (NPOINT > 0)
    280     G_warning ("Points are more dense than specified 'DMIN'--ignored %d points", NPOINT);
     280    G_warning ("Points are more dense than specified 'DMIN'--ignored %d points (remain %d)", NPOINT, k - NPOINT);
    281281  NPOINT = k - NPOINT - NPT - OUTRANGE;
    282282  if(NPOINT<KMIN) {

  • grass/branches/releasebranch_6_3/visualization/nviz/Makefile

    r25037 r29462  
    3838        -$(MKDIR) $(INSTALL_DIR)/bitmaps
    3939        -$(MKDIR) $(INSTALL_DIR)/bitmaps/flythrough
    40         find bitmaps -path '*/CVS' -prune -o -type f -print | \
     40        find bitmaps -path '*/.svn' -prune -o -type f -print | \
    4141                while read file ; do $(INSTALL_DATA) $$file $(INSTALL_DIR)/$$file ; done
    4242

  • grass/branches/releasebranch_6_3/visualization/xganim/description.html

    r24778 r29462  
    6161<H2>SEE ALSO</H2>
    6262
    63 <em><a href="d.slide.show.html">d.slide.show</a></em>
     63<em><a href="d.slide.show.html">d.slide.show</a></em>,
     64<em><a href="gm_animate.html">gis.m: ANIMATE TOOL</a></em>
    6465
    6566<H2>AUTHOR</H2>
Note: See TracChangeset for help on using the changeset viewer.