[GRASS-SVN] r62555 - in grass/trunk: . doc gui/wxpython/gcp imagery imagery/i.group imagery/i.ortho.photo/lib imagery/i.rectify imagery/i.target lib/imagery misc/m.transform scripts/g.extension tools vector/v.rectify vector/v.transform
svn_grass at osgeo.org
svn_grass at osgeo.org
Sun Nov 2 12:52:19 PST 2014
Author: neteler
Date: 2014-11-02 12:52:19 -0800 (Sun, 02 Nov 2014)
New Revision: 62555
Removed:
grass/trunk/imagery/i.points/
grass/trunk/imagery/i.vpoints/
Modified:
grass/trunk/TODO
grass/trunk/doc/projectionintro.html
grass/trunk/gui/wxpython/gcp/g.gui.gcp.html
grass/trunk/gui/wxpython/gcp/g.gui.gcp.py
grass/trunk/imagery/i.group/i.group.html
grass/trunk/imagery/i.ortho.photo/lib/TODO
grass/trunk/imagery/i.rectify/main.c
grass/trunk/imagery/i.target/i.target.html
grass/trunk/imagery/imageryintro.html
grass/trunk/lib/imagery/group.c
grass/trunk/lib/imagery/imagerylib.dox
grass/trunk/lib/imagery/target.c
grass/trunk/misc/m.transform/m.transform.html
grass/trunk/scripts/g.extension/g.extension.html
grass/trunk/tools/dep_tree2sql.sh
grass/trunk/vector/v.rectify/main.c
grass/trunk/vector/v.rectify/v.rectify.html
grass/trunk/vector/v.transform/v.transform.html
Log:
unused i.points + i.vpoints removed: replaced by g.gui.gcp
Modified: grass/trunk/TODO
===================================================================
--- grass/trunk/TODO 2014-11-02 20:07:37 UTC (rev 62554)
+++ grass/trunk/TODO 2014-11-02 20:52:19 UTC (rev 62555)
@@ -26,8 +26,9 @@
- lib/image3/: never finished improvement which integrated the standard lib and
the ortho lib. Seems to provide also ortho rectification for
satellite data (i.points3, i.rectify3)
+- See
+ http://grasswiki.osgeo.org/wiki/Image_processing#Ideas_collection_for_improving_GRASS.27_Image_processing_capabilities
- image modules:
- - merge of i.points, i.vpoints, i.points3
- merge of i.rectify and i.rectify3
- addition of new resampling algorithms such as bilinear, cubic convolution
(take from r.proj?)
@@ -35,3 +36,8 @@
- implement/finish linewise ortho-rectification of satellite data
- Add support for > 8bit colors (only 0-255 supported currently)
+-----------------
+See also
+
+http://trac.osgeo.org/grass/wiki/Grass7Planning
+
Modified: grass/trunk/doc/projectionintro.html
===================================================================
--- grass/trunk/doc/projectionintro.html 2014-11-02 20:07:37 UTC (rev 62554)
+++ grass/trunk/doc/projectionintro.html 2014-11-02 20:52:19 UTC (rev 62555)
@@ -23,7 +23,7 @@
The unreferenced map is geocoded within the XY location by defining
four corner points or by seeking several ground control points
(<a href="i.group.html">i.group</a>, <a href="i.target.html">i.target</a>,
- <a href="i.points.html">i.points</a>) and then transformed into the
+ <a href="g.gui.gcp.html">g.gui.gcp</a>) and then transformed into the
target location (<a href="i.rectify.html">i.rectify</a>). Polynomial
transformation of 1st, 2nd and 3rd order are supported.
<p>
Modified: grass/trunk/gui/wxpython/gcp/g.gui.gcp.html
===================================================================
--- grass/trunk/gui/wxpython/gcp/g.gui.gcp.html 2014-11-02 20:07:37 UTC (rev 62554)
+++ grass/trunk/gui/wxpython/gcp/g.gui.gcp.html 2014-11-02 20:52:19 UTC (rev 62555)
@@ -299,8 +299,9 @@
<p>
<em>
- <a href="i.rectify.html">i.rectify</a>,
- <a href="m.transform.html">m.transform</a>
+<a href="i.rectify.html">i.rectify</a>,
+<a href="m.transform.html">m.transform</a>,
+<a href="v.rectify.html">v.rectify</a>
</em>
<p>
Modified: grass/trunk/gui/wxpython/gcp/g.gui.gcp.py
===================================================================
--- grass/trunk/gui/wxpython/gcp/g.gui.gcp.py 2014-11-02 20:07:37 UTC (rev 62554)
+++ grass/trunk/gui/wxpython/gcp/g.gui.gcp.py 2014-11-02 20:52:19 UTC (rev 62555)
@@ -24,6 +24,7 @@
#% keywords: general
#% keywords: GUI
#% keywords: georectification
+#% keywords: GCP
#%end
"""
Modified: grass/trunk/imagery/i.group/i.group.html
===================================================================
--- grass/trunk/imagery/i.group/i.group.html 2014-11-02 20:07:37 UTC (rev 62554)
+++ grass/trunk/imagery/i.group/i.group.html 2014-11-02 20:52:19 UTC (rev 62555)
@@ -5,7 +5,7 @@
enables the user to run analyses on any combination of the raster map layers
in a group. The user creates the groups and subgroups and selects the
raster map layers that are to reside in them. Imagery analysis programs like
-<em><a href="i.points.html">i.points</a></em>,
+<em><a href="g.gui.gcp.html">g.gui.gcp</a></em>,
<em><a href="i.rectify.html">i.rectify</a></em>,
<em><a href="i.ortho.photo.html">i.ortho.photo</a></em> and
others ask the user for the name of an imagery group whose data are to be
@@ -30,9 +30,9 @@
Processing manual</a></em>
<p><em>
+<a href="g.gui.gcp.html">g.gui.gcp</a>,
<a href="i.cluster.html">i.cluster</a>,
<a href="i.maxlik.html">i.maxlik</a>,
-<a href="i.points.html">i.points</a>,
<a href="i.rectify.html">i.rectify</a>,
<a href="i.ortho.photo.html">i.ortho.photo</a>
</em>
Modified: grass/trunk/imagery/i.ortho.photo/lib/TODO
===================================================================
--- grass/trunk/imagery/i.ortho.photo/lib/TODO 2014-11-02 20:07:37 UTC (rev 62554)
+++ grass/trunk/imagery/i.ortho.photo/lib/TODO 2014-11-02 20:52:19 UTC (rev 62555)
@@ -6,6 +6,7 @@
>From grass64/TODO:
+- merge of image libraries:
A)
- lib/imagery/: standard lib, in use (i.* except for i.points3, i.rectify3)
- imagery/i.ortho.photo/libes/: standard lib, in use (i.ortho.photo, photo.*)
@@ -16,3 +17,17 @@
Possibly a lot is already done in lib/image3/ ?
+- See
+ http://grasswiki.osgeo.org/wiki/Image_processing#Ideas_collection_for_improving_GRASS.27_Image_processing_capabilities
+- image modules:
+ - merge of i.rectify and i.rectify3
+ - addition of new resampling algorithms such as bilinear, cubic convolution
+ (take from r.proj?)
+ - add other warping methods (maybe thin splines from GDAL?)
+ - implement/finish linewise ortho-rectification of satellite data
+ - Add support for > 8bit colors (only 0-255 supported currently)
+
+-----------------
+See also
+
+http://trac.osgeo.org/grass/wiki/Grass7Planning
Modified: grass/trunk/imagery/i.rectify/main.c
===================================================================
--- grass/trunk/imagery/i.rectify/main.c 2014-11-02 20:07:37 UTC (rev 62554)
+++ grass/trunk/imagery/i.rectify/main.c 2014-11-02 20:52:19 UTC (rev 62555)
@@ -14,7 +14,7 @@
* Markus Metz
* PURPOSE: calculate a transformation matrix and then convert x,y cell
* coordinates to standard map coordinates for each pixel in the
- * image (control points can come from i.points or i.vpoints)
+ * image (control points can come from g.gui.gcp)
* COPYRIGHT: (C) 2002-2011 by the GRASS Development Team
*
* This program is free software under the GNU General Public
Modified: grass/trunk/imagery/i.target/i.target.html
===================================================================
--- grass/trunk/imagery/i.target/i.target.html 2014-11-02 20:07:37 UTC (rev 62554)
+++ grass/trunk/imagery/i.target/i.target.html 2014-11-02 20:52:19 UTC (rev 62555)
@@ -9,7 +9,7 @@
<em>i.target</em> enables the user to specify this location.
<em>i.target</em> must be run before
-<em><a href="i.points.html">i.points</a></em> and
+<em><a href="g.gui.gcp.html">g.gui.gcp</a></em> and
<em><a href="i.rectify.html">i.rectify</a></em>.
<h2>NOTES</h2>
@@ -29,15 +29,19 @@
The GRASS 4 <em>
<a href="http://grass.osgeo.org/gdp/imagery/grass4_image_processing.pdf">Image Processing manual</a></em>
-<p><em>
+<p>
+<em>
+<a href="g.gui.gcp.html">g.gui.gcp</a>,
<a href="i.group.html">i.group</a>,
-<a href="i.points.html">i.points</a>,
-<a href="i.vpoints.html">i.vpoints</a>,
<a href="i.rectify.html">i.rectify</a>
-</em><br>
-<em><a href="wxGUI.gcp.html">Manage Ground Control Points</a></em>
+</em>
+<br>
+<em>
+<a href="wxGUI.gcp.html">Manage Ground Control Points</a>
+</em>
+
<h2>AUTHOR</h2>
Michael Shapiro,
Modified: grass/trunk/imagery/imageryintro.html
===================================================================
--- grass/trunk/imagery/imageryintro.html 2014-11-02 20:07:37 UTC (rev 62554)
+++ grass/trunk/imagery/imageryintro.html 2014-11-02 20:52:19 UTC (rev 62555)
@@ -95,11 +95,11 @@
<ul>
<li>unreferenced scanned maps by defining four corner points
(<a href="i.group.html">i.group</a>, <a href="i.target.html">i.target</a>,
- <a href="i.points.html">i.points</a>, <a href="i.rectify.html">i.rectify</a>)</li>
+ <a href="g.gui.gcp.html">g.gui.gcp</a>, <a href="i.rectify.html">i.rectify</a>)</li>
<li>unreferenced satellite data from optical and Radar sensors by
defining a certain number of ground control points
(<a href="i.group.html">i.group</a>, <a href="i.target.html">i.target</a>,
- <a href="i.points.html">i.points</a>, <a href="i.rectify.html">i.rectify</a>)</li>
+ <a href="g.gui.gcp.html">g.gui.gcp</a>, <a href="i.rectify.html">i.rectify</a>)</li>
<li>interactive graphical <a href="wxGUI.gcp.html">Ground Control Point (GCP) manager</a></li>
<!--
<li>orthophoto generation based on DEM: <a href="i.ortho.photo.html">i.ortho.photo</a></li>
Modified: grass/trunk/lib/imagery/group.c
===================================================================
--- grass/trunk/lib/imagery/group.c 2014-11-02 20:07:37 UTC (rev 62554)
+++ grass/trunk/lib/imagery/group.c 2014-11-02 20:52:19 UTC (rev 62555)
@@ -386,7 +386,7 @@
for (n = 0; n < src.nfiles; n++)
I_transfer_group_ref_file (&src, n, &dst);
\endcode
- * This routine is used by <i>i.points</i> to create the REF file for a
+ * This routine is used by <i>g.gui.gcp</i> to create the REF file for a
* subgroup.
*
* \param src
Modified: grass/trunk/lib/imagery/imagerylib.dox
===================================================================
--- grass/trunk/lib/imagery/imagerylib.dox 2014-11-02 20:07:37 UTC (rev 62554)
+++ grass/trunk/lib/imagery/imagerylib.dox 2014-11-02 20:52:19 UTC (rev 62555)
@@ -210,7 +210,7 @@
\endverbatim
<P>
-This routine is used by <I>i.points</I> to create the REF file for a
+This routine is used by <I>g.gui.gcp</I> to create the REF file for a
subgroup.
<P>
@@ -229,7 +229,7 @@
Reads the target <B>location</B> and <B>mapset</B> from the TARGET
file for the specified group. Returns 1 if successful; 0 otherwise
(and prints a diagnostic error). This routine is used by
-<I>i.points</I> and <I>i.rectify</I> and probably should not be used
+<I>g.gui.gcp</I> and <I>i.rectify</I> and probably should not be used
by other programs.
<P>
@@ -256,7 +256,7 @@
<P>
The following routines read and write the POINTS file, which contains
the image registration control points. This file is created and
-updated by the module <I>i.points</I>,and read by <I>i.rectify.</I>
+updated by the module <I>g.gui.gcp</I>,and read by <I>i.rectify.</I>
<P>
These routines use the <I>Control_Points</I> structure, which is
Modified: grass/trunk/lib/imagery/target.c
===================================================================
--- grass/trunk/lib/imagery/target.c 2014-11-02 20:07:37 UTC (rev 62554)
+++ grass/trunk/lib/imagery/target.c 2014-11-02 20:52:19 UTC (rev 62555)
@@ -9,7 +9,7 @@
* Reads the target <b>location</b> and <b>mapset</b>
* from the TARGET file for the specified group. Returns 1 if successful; 0
* otherwise (and prints a diagnostic error). This routine is used by
- * <i>i.points</i> and <i>i.rectify</i> and probably should not be used by
+ * <i>g.gui.gcp</i> and <i>i.rectify</i> and probably should not be used by
* other programs.
* <b>Note.</b> This routine does <b>not</b> validate the target information.
*
Modified: grass/trunk/misc/m.transform/m.transform.html
===================================================================
--- grass/trunk/misc/m.transform/m.transform.html 2014-11-02 20:07:37 UTC (rev 62554)
+++ grass/trunk/misc/m.transform/m.transform.html 2014-11-02 20:52:19 UTC (rev 62555)
@@ -51,7 +51,11 @@
<h2>SEE ALSO</h2>
-<em><a href="i.rectify.html">i.rectify</a></em>
+<em>
+<a href="i.rectify.html">i.rectify</a>,
+<a href="v.rectify.html">v.rectify</a>,
+<a href="v.transform.html">v.transform</a>
+</em>
<h2>AUTHORS</h2>
Modified: grass/trunk/scripts/g.extension/g.extension.html
===================================================================
--- grass/trunk/scripts/g.extension/g.extension.html 2014-11-02 20:07:37 UTC (rev 62554)
+++ grass/trunk/scripts/g.extension/g.extension.html 2014-11-02 20:52:19 UTC (rev 62555)
@@ -1,8 +1,8 @@
<h2>DESCRIPTION</h2>
<em>g.extension</em> downloads and installs, removes or updates
-extensions from <a href="http://svn.osgeo.org/grass/grass-addons/grass7/">GRASS Addons SVN repository</a> into the local GRASS
-installation.
+extensions from
+<a href="http://svn.osgeo.org/grass/grass-addons/grass7/">GRASS Addons SVN repository</a> into the local GRASS GIS installation.
<p>Re-running <em>g.extension</em> on an installed GRASS Addons
extension re-installs the requested extension which may include
@@ -12,16 +12,16 @@
<h2>EXAMPLES</h2>
-Download and install <em>i.points.auto</em> into current GRASS installation
+Download and install <em>r.stream.distance</em> into current GRASS installation
<div class="code"><pre>
-g.extension extension=i.points.auto
+g.extension extension=r.stream.distance
</pre></div>
Remove locally installed extension
<div class="code"><pre>
-g.extension extension=i.points.auto operation=remove
+g.extension extension=r.stream.distance operation=remove
</pre></div>
List all available extensions from GRASS Addons SVN repository
@@ -39,16 +39,16 @@
<h2>SEE ALSO</h2>
<em>
- <a href="g.extension.all.html">g.extension.all</a>
+<a href="g.extension.all.html">g.extension.all</a>
</em>
<p>
See also <a href="http://grasswiki.osgeo.org/wiki/GRASS_AddOns">GRASS Addons</a> wiki page.
-<h2>AUTHOR</h2>
+<h2>AUTHORS</h2>
-Markus Neteler<br>
-Martin Landa, Czech Technical University in Prague, Czech Republic
+Markus Neteler (original shell script)<br>
+Martin Landa, Czech Technical University in Prague, Czech Republic (Python rewrite)
<p>
<i>Last changed: $Date$</i>
Modified: grass/trunk/tools/dep_tree2sql.sh
===================================================================
--- grass/trunk/tools/dep_tree2sql.sh 2014-11-02 20:07:37 UTC (rev 62554)
+++ grass/trunk/tools/dep_tree2sql.sh 2014-11-02 20:52:19 UTC (rev 62555)
@@ -44,9 +44,7 @@
# imagery/i.ortho.photo/photo.elev/OBJ.i686-pc-linux-gnu/main.o
# imagery/i.ortho.photo/photo.rectify/OBJ.i686-pc-linux-gnu/target.o
# imagery/i.ortho.photo/photo.target/OBJ.i686-pc-linux-gnu/main.o
-# imagery/i.points/OBJ.i686-pc-linux-gnu/target.o
# imagery/i.rectify/OBJ.i686-pc-linux-gnu/target.o
-# imagery/i.vpoints/OBJ.i686-pc-linux-gnu/target.o
#
# to discover which files import a given symbol, or more complex queries
# such as:
Modified: grass/trunk/vector/v.rectify/main.c
===================================================================
--- grass/trunk/vector/v.rectify/main.c 2014-11-02 20:07:37 UTC (rev 62554)
+++ grass/trunk/vector/v.rectify/main.c 2014-11-02 20:52:19 UTC (rev 62555)
@@ -7,7 +7,7 @@
* PURPOSE: calculate a transformation matrix and then convert x,y(,z)
* coordinates to standard map coordinates for all objects in
* the vector
- * control points can come from i.points or i.vpoints or
+ * control points can come from g.gui.gcp or
* a user-given text file
* COPYRIGHT: (C) 2002-2011 by the GRASS Development Team
*
Modified: grass/trunk/vector/v.rectify/v.rectify.html
===================================================================
--- grass/trunk/vector/v.rectify/v.rectify.html 2014-11-02 20:07:37 UTC (rev 62554)
+++ grass/trunk/vector/v.rectify/v.rectify.html 2014-11-02 20:52:19 UTC (rev 62555)
@@ -22,9 +22,7 @@
<p>
2D Ground Control Points can be identified in
-<em><a href="i.points.html">i.points</a></em>
-or
-<em><a href="i.vpoints.html">i.vpoints</a></em>
+<em><a href="g.gui.gcp.html">g.gui.gcp</a></em>.
<p>
3D Ground Control Points must be provided in a text file with the
<b>points</b> option. The 3D format is equivalent to the format for 2D
@@ -104,23 +102,26 @@
<a href="http://grass.osgeo.org/gdp/imagery/grass4_image_processing.pdf">Image
Processing manual</a></em>
-<p><em>
- <a href="v.transform.html">v.transform</a>,
- <a href="m.transform.html">m.transform</a>,
- <a href="i.rectify.html">i.rectify</a>,
- <a href="r.proj.html">r.proj</a>,
- <a href="v.proj.html">v.proj</a>,
- <a href="i.group.html">i.group</a>,
- <a href="i.points.html">i.points</a>,
- <a href="i.vpoints.html">i.vpoints</a>,
- <a href="i.target.html">i.target</a>
- <br>
- <a href="wxGUI.gcp.html">Manage Ground Control Points</a>
+<p>
+<em>
+<a href="g.gui.gcp.html">g.gui.gcp</a>,
+<a href="i.group.html">i.group</a>,
+<a href="i.rectify.html">i.rectify</a>,
+<a href="i.target.html">i.target</a>,
+<a href="m.transform.html">m.transform</a>,
+<a href="r.proj.html">r.proj</a>,
+<a href="v.proj.html">v.proj</a>,
+<a href="v.transform.html">v.transform</a>,
</em>
+<br>
+<em>
+<a href="wxGUI.gcp.html">Manage Ground Control Points</a>
+</em>
-<h2>AUTHORS</h2>
+<h2>AUTHOR</h2>
+
Markus Metz
<p>
Modified: grass/trunk/vector/v.transform/v.transform.html
===================================================================
--- grass/trunk/vector/v.transform/v.transform.html 2014-11-02 20:07:37 UTC (rev 62554)
+++ grass/trunk/vector/v.transform/v.transform.html 2014-11-02 20:52:19 UTC (rev 62555)
@@ -79,8 +79,8 @@
<em>
<a href="m.transform.html">m.transform</a>,
-<a href="v.rectify.html">v.rectify</a>,
-<a href="v.in.ogr.html">v.in.ogr</a>
+<a href="i.rectify.html">i.rectify</a>,
+<a href="v.rectify.html">v.rectify</a>
</em>
<h2>AUTHOR</h2>
More information about the grass-commit
mailing list