[GRASS-SVN] r55130 - in grass/trunk/imagery/i.ortho.photo: i.ortho.camera i.ortho.elev i.ortho.init i.ortho.rectify i.ortho.transform
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Feb 20 02:16:02 PST 2013
Author: neteler
Date: 2013-02-20 02:16:02 -0800 (Wed, 20 Feb 2013)
New Revision: 55130
Modified:
grass/trunk/imagery/i.ortho.photo/i.ortho.camera/i.ortho.camera.html
grass/trunk/imagery/i.ortho.photo/i.ortho.camera/main.c
grass/trunk/imagery/i.ortho.photo/i.ortho.elev/i.ortho.elev.html
grass/trunk/imagery/i.ortho.photo/i.ortho.init/i.ortho.init.html
grass/trunk/imagery/i.ortho.photo/i.ortho.init/main.c
grass/trunk/imagery/i.ortho.photo/i.ortho.rectify/i.ortho.rectify.html
grass/trunk/imagery/i.ortho.photo/i.ortho.rectify/main.c
grass/trunk/imagery/i.ortho.photo/i.ortho.transform/i.ortho.transform.html
grass/trunk/imagery/i.ortho.photo/i.ortho.transform/main.c
Log:
HTML fixes; mention former module names
Modified: grass/trunk/imagery/i.ortho.photo/i.ortho.camera/i.ortho.camera.html
===================================================================
--- grass/trunk/imagery/i.ortho.photo/i.ortho.camera/i.ortho.camera.html 2013-02-20 10:04:31 UTC (rev 55129)
+++ grass/trunk/imagery/i.ortho.photo/i.ortho.camera/i.ortho.camera.html 2013-02-20 10:16:02 UTC (rev 55130)
@@ -1,6 +1,6 @@
-<H2>DESCRIPTION</H2>
+<h2>DESCRIPTION</h2>
-<EM>i.photo.camera</EM> creates or modifies entries in a camera reference
+<em>i.ortho.camera</em> creates or modifies entries in a camera reference
file. For ortho-photo rectification, a camera reference file is required for
computation of scanned image to photo-coordinate transformation parameters.
There are two coordinate systems: The image coordinate system (in pixels)
@@ -8,24 +8,24 @@
establishes a relation between the pixels and the image coordinates with
help of fiducial marks.
-<P>
+<p>
The first prompt in the program will ask you for the name of
the camera reference file to be created or modified. You may
create a new camera reference file by entering a new name, or modify an
existing camera reference file by entering the name of an existing camera file.
-<P>
+<p>
After entering the camera file name, following menu is displayed:
-<P>
+<p>
Please provide the following information
-<P>
-<PRE>
+<p>
+<pre>
- CAMERA NAME: <EM>camera name</EM>______
- CAMERA IDENTIFICATION: <EM>identification</EM>___
+ CAMERA NAME: <em>camera name</em>______
+ CAMERA IDENTIFICATION: <em>identification</em>___
CALIBRATED FOCAL LENGTH mm.:_________________
POINT OF SYMMETRY (X) mm.:_________________
POINT OF SYMMETRY (Y) mm.:_________________
@@ -33,7 +33,7 @@
AFTER COMPLETING ALL ANSWERS, HIT <ESC> TO CONTINUE
(OR <Ctrl-C> TO CANCEL)
-</PRE>
+</pre>
The camera name and identification describe the camera reference file.
The calibrated focal length and the point of symmetry are used in computing
@@ -54,7 +54,7 @@
calibration certificate) the center is the origin and the values are 0 for
both X and Y of Point of Symmetry. But usually the principal point does not
fall on the intersection of the radii at the center of the picture. This
-excentricity is usually of the order of a few micrometers. <P>
+excentricity is usually of the order of a few micrometers. <p>
You are then asked to enter the X and Y photo coordinates of each fiducial
as follows.
@@ -64,15 +64,15 @@
below. The origin is the center of the image (or the point of symmetry) and
X and Y are left-right and up-down. The order is up to the user, but must be
kept consistent throughout the rectification process.
-<P>
+<p>
On this screen you should enter the fiducial or
reseau photo-coordinates as given in the camera calibration report. The X,
and Y coordinates are in milli-meters from the principle point.
-<P>
+<p>
Please provide the following information
-<PRE>
+<pre>
Fid# FID ID X Y
1__ _____ 0.0___ 0.0___
@@ -90,22 +90,22 @@
AFTER COMPLETING ALL ANSWERS, HIT <ESC> TO CONTINUE
(OR <Ctrl-C> TO CANCEL)
-</PRE>
+</pre>
The input display is repeated until the number of MAXIMUM FIDUCIALS
is reached.
-<H2>SEE ALSO</H2>
+<h2>SEE ALSO</h2>
-<EM>
-<A HREF="i.ortho.photo.html">i.ortho.photo</A>,
-<A HREF="i.photo.2image.html">i.photo.2image</A>,
-<A HREF="i.photo.2target.html">i.photo.2target</A>,
-<A HREF="i.photo.init.html">i.photo.init</A>
-</EM>
+<em>
+<a href="i.ortho.photo.html">i.ortho.photo</a>,
+<a href="i.photo.2image.html">i.photo.2image</a>,
+<a href="i.photo.2target.html">i.photo.2target</a>,
+<a href="i.ortho.init.html">i.ortho.init</a>
+</em>
-<H2>AUTHOR</H2>
+<h2>AUTHOR</h2>
Mike Baba, DBA Systems, Inc.
Modified: grass/trunk/imagery/i.ortho.photo/i.ortho.camera/main.c
===================================================================
--- grass/trunk/imagery/i.ortho.photo/i.ortho.camera/main.c 2013-02-20 10:04:31 UTC (rev 55129)
+++ grass/trunk/imagery/i.ortho.photo/i.ortho.camera/main.c 2013-02-20 10:16:02 UTC (rev 55130)
@@ -1,7 +1,7 @@
/****************************************************************************
*
- * MODULE: i.photo.camera
+ * MODULE: i.ortho.camera (former i.photo.camera)
* AUTHOR(S): Mike Baba, DBA Systems, Inc. (original contributor)
* Markus Neteler <neteler itc.it>,
* Roberto Flor <flor itc.it>,
Modified: grass/trunk/imagery/i.ortho.photo/i.ortho.elev/i.ortho.elev.html
===================================================================
--- grass/trunk/imagery/i.ortho.photo/i.ortho.elev/i.ortho.elev.html 2013-02-20 10:04:31 UTC (rev 55129)
+++ grass/trunk/imagery/i.ortho.photo/i.ortho.elev/i.ortho.elev.html 2013-02-20 10:16:02 UTC (rev 55130)
@@ -0,0 +1,22 @@
+<h2>DESCRIPTION</h2>
+
+<em>i.ortho.elev</em> is used to select or modify the target elevation model.
+
+<h2>SEE ALSO</h2>
+
+<em>
+<a href="i.ortho.photo.html">i.ortho.photo</a><br>
+<a href="i.ortho.camera.html">i.ortho.camera</a><br>
+<a href="i.photo.2image.html">i.photo.2image</a><br>
+<a href="i.photo.2target.html">i.photo.2target</a><br>
+<a href="i.ortho.init.html">i.ortho.init</a><br>
+<a href="i.rectify.html">i.rectify</a>
+</em>
+
+
+<h2>AUTHOR</h2>
+Mike Baba, DBA Systems, Inc.<br>
+Bugfixes and enhancements for GRASS GIS 7 by Markus Metz
+
+<p>
+<i>Last changed: $Date$</i>
Modified: grass/trunk/imagery/i.ortho.photo/i.ortho.init/i.ortho.init.html
===================================================================
--- grass/trunk/imagery/i.ortho.photo/i.ortho.init/i.ortho.init.html 2013-02-20 10:04:31 UTC (rev 55129)
+++ grass/trunk/imagery/i.ortho.photo/i.ortho.init/i.ortho.init.html 2013-02-20 10:16:02 UTC (rev 55130)
@@ -1,4 +1,4 @@
-<H2>DESCRIPTION</H2>
+<h2>DESCRIPTION</h2>
Aerial photographs may be either vertical or oblique. Vertical photographs
can be truly vertical (nadir), or slightly tilted (less than 3 degree
@@ -7,26 +7,26 @@
<br>
Oblique aerial photographs are purposely taken with an
angle between 3 and 90 degree from the nadir direction.
-<P>
-<b>The use of <EM>i.photo.init</EM> (menu 6) is only required when rectifying a
+<p>
+<b>The use of <em>i.ortho.init</em> (menu 6) is only required when rectifying a
tilted or oblique aerial photo.</b>
-<P>
-<EM>i.photo.init</EM> creates or modifies entries in a camera initial exposure
+<p>
+<em>i.ortho.init</em> creates or modifies entries in a camera initial exposure
station file for imagery group referenced by a sub-block. These entries
include: the (XC,YC,ZC) standard (e.g. UTM) approximate coordinates of the camera exposure
station; initial roll, pitch, and yaw angles (in degrees) of the cameras
-attitude; and the <EM>a priori</EM> standard deviations for these
-parameters. During the imagery program, <EM>i.photo.rectify</EM>, the initial camera
+attitude; and the <em>a priori</em> standard deviations for these
+parameters. During the imagery program, <em>i.photo.rectify</em>, the initial camera
exposure station file is used for computation of the ortho-rectification
parameters. If no initial camera exposure station file exist, the default
-values are computed from the control points file created in <EM><A
-HREF="i.photo.2target.html">i.photo.2target</A></EM>.
+values are computed from the control points file created in <em><A
+HREF="i.photo.2target.html">i.photo.2target</a></em>.
-<P>
+<p>
The following menu is displayed:
-<PRE>
+<pre>
Please provide the following information
INITIAL XC: Meters __________
@@ -47,9 +47,9 @@
AFTER COMPLETING ALL ANSWERS, HIT <ESC> TO CONTINUE
(OR <Ctrl-C> TO CANCEL)
-</PRE>
+</pre>
-<P>
+<p>
The INITIAL values for (XC,YC,ZC) are expressed in standard (e.g. UTM) coordinates, and
represent an approximation for the location of the camera at the time of
exposure.
@@ -60,7 +60,7 @@
<li> Z: Flight altitude above sea level
</ul>
-<P>
+<p>
The INITIAL values for (omega,phi,kappa) are expressed in degrees, and
represent an approximation for the cameras attitude at the time of
@@ -75,34 +75,34 @@
needs to be denoted as +90 degree for clockwise turn and -90 degree for
a counterclockwise turn.
</ul>
-<P>
+<p>
The standard deviations for (XC,YC,ZC) are expressed in meters, and
-are used as <EM>a priori</EM> values for the standard deviations used in
+are used as <em>a priori</em> values for the standard deviations used in
computation of the ortho rectification parameters.
-<P>
+<p>
The standard deviations for (omega,phi,kappa) are expressed in degrees, and
-are used as <EM>a priori</EM> values for the standard deviations used in
+are used as <em>a priori</em> values for the standard deviations used in
computation of the ortho rectification parameters.
-<P>
+<p>
If <i>Use these values at run time? (1=yes, 0=no)</i> is set to 0, the
values in this menu are not used.
-<H2>SEE ALSO</H2>
+<h2>SEE ALSO</h2>
-<EM>
-<A HREF="i.ortho.photo.html">i.ortho.photo</A>,
-<A HREF="i.photo.camera.html">i.photo.camera</A>,
-<A HREF="i.photo.2image.html">i.photo.2image</A>,
-<A HREF="i.photo.2target.html">i.photo.2target</A>,
-<A HREF="i.photo.rectify.html">i.photo.rectify</A>
-</EM>
+<em>
+<a href="i.ortho.photo.html">i.ortho.photo</a>,
+<a href="i.ortho.camera.html">i.ortho.camera</a>,
+<a href="i.photo.2image.html">i.photo.2image</a>,
+<a href="i.photo.2target.html">i.photo.2target</a>,
+<a href="i.photo.rectify.html">i.photo.rectify</a>
+</em>
-<H2>AUTHOR</H2>
+<h2>AUTHOR</h2>
Mike Baba, DBA Systems, Inc.
<p>
Modified: grass/trunk/imagery/i.ortho.photo/i.ortho.init/main.c
===================================================================
--- grass/trunk/imagery/i.ortho.photo/i.ortho.init/main.c 2013-02-20 10:04:31 UTC (rev 55129)
+++ grass/trunk/imagery/i.ortho.photo/i.ortho.init/main.c 2013-02-20 10:16:02 UTC (rev 55130)
@@ -1,7 +1,7 @@
/****************************************************************************
*
- * MODULE: i.photo.init
+ * MODULE: i.ortho.init (former i.photo.init)
* AUTHOR(S): Mike Baba, DBA Systems, Inc. (original contributor)
* Markus Neteler <neteler itc.it>,
* Roberto Flor <flor itc.it>,
Modified: grass/trunk/imagery/i.ortho.photo/i.ortho.rectify/i.ortho.rectify.html
===================================================================
--- grass/trunk/imagery/i.ortho.photo/i.ortho.rectify/i.ortho.rectify.html 2013-02-20 10:04:31 UTC (rev 55129)
+++ grass/trunk/imagery/i.ortho.photo/i.ortho.rectify/i.ortho.rectify.html 2013-02-20 10:16:02 UTC (rev 55130)
@@ -1,32 +1,32 @@
<H2>DESCRIPTION</H2>
-<EM>i.photo.rectify</EM> rectifies an image by using the image to photo
-coordinate transformation matrix created by <A HREF="i.photo.2image.html">i.photo.2image</A>
-and the rectification parameters created by <A HREF="i.photo.2target.html">i.photo.2target</A>.
+<em>i.photo.rectify</em> rectifies an image by using the image to photo
+coordinate transformation matrix created by <a href="i.photo.2image.html">i.photo.2image</a>
+and the rectification parameters created by <a href="i.photo.2target.html">i.photo.2target</a>.
Rectification is the process by which the geometry of an image is made
planimetric. This is accomplished by mapping an image from one coordinate
-system to another. In <EM>i.photo.rectify</EM> the parameters computed by
-<A HREF="i.photo.2image.html">i.photo.2image</A> and
-<A HREF="i.photo.2target.html">i.photo.2target</A> are used in equations to
+system to another. In <em>i.photo.rectify</em> the parameters computed by
+<a href="i.photo.2image.html">i.photo.2image</a> and
+<a href="i.photo.2target.html">i.photo.2target</a> are used in equations to
convert x,y image coordinates to standard map coordinates for each pixel in
the image. The result is an image with a standard map coordinate system,
compensated for relief distortions and photographic tilt. Upon completion of
the program the rectified image is deposited in a previously targeted GRASS
LOCATION.
-<P>
+<p>
Images can be resampled with various different interpolation methods:
nearest neighbor assignment, bilinear and bicubic interpolation. The
bilinear and bicubic interpolation methods are also available with a
fallback option. These methods "fall back" to simpler interpolation
methods along NULL borders. That is, from bicubic to bilinear to nearest.
-<P>
+<p>
The process may take an hour or more depending on the size of the image,
the speed of the computer, the number files, and the size and resolution
of the selected window.
-<P>
+<p>
The rectified image will be located in the target LOCATION when the program
is completed. The original unrectified files are not modified or removed.
-<P>
+<p>
The optional <em>angle</em> output holds the camera angle in degrees to
the local surface, considering local slope and aspect. A value of 90
degrees indicates that the camera angle was orthogonal to the local
@@ -37,46 +37,46 @@
appear blurred. Because terrain shadowing effects are not considered,
areas with high camera angles may also appear blurred if they are located
(viewed from the camera position) behind mountain ridges or peaks.
-<P>
-<EM>i.photo.rectify</EM> can be run directly, specifying options in the
+<p>
+<em>i.photo.rectify</em> can be run directly, specifying options in the
command line or the GUI, or it can be invoked as OPTION 8 through
-<A HREF="i.ortho.photo.html">i.ortho.photo</A>. If invoked though
-<A HREF="i.ortho.photo.html">i.ortho.photo</A>, an interactive terminal
+<a href="i.ortho.photo.html">i.ortho.photo</a>. If invoked though
+<a href="i.ortho.photo.html">i.ortho.photo</a>, an interactive terminal
is used to determine the options.
<H4>Interactive mode</H4>
-<P> You are first asked if all images within the imagery group should
+<p> You are first asked if all images within the imagery group should
be rectified. If this option is not chosen, you are asked to specify for
each image within the imagery group whether it should be rectified or not.
-<P>
+<p>
More than one file may be rectified at a time. Each file
should have a unique output file name. The next prompt asks you for an
extension to be appended to the rectified images.
-<P>
+<p>
The next prompt will ask you whether a camera angle map should be
produced and if yes, what should be its name.
-<P>
+<p>
After that you are asked if overwriting existing maps in the target
location and mapset should be allowed.
-<P>
+<p>
The next prompt asks you to select one of two windows:
-<P>
-<PRE>
+<p>
+<pre>
Please select one of the following options
1. Use the current window in the target location
2. Determine the smallest window which covers the image
>
-</PRE>
-<P>
+</pre>
+<p>
If you choose option 2, you can also specify a desired target resolution.
-<P>
-<EM>i.photo.rectify</EM> will only rectify that portion of the
+<p>
+<em>i.photo.rectify</em> will only rectify that portion of the
image that occurs within the chosen window. Only that portion will be
relocated in the target database. It is therefore important to check the
current window in the target LOCATION if choice number one is selected.
-<P>
+<p>
Next you are asked to select an interpolation method.
-<PRE>
+<pre>
Please select one of the following interpolation methods
1. nearest neighbor
2. bilinear
@@ -84,21 +84,21 @@
4. bilinear with fallback
5. bicubic with fallback
>
-</PRE>
-<P>
+</pre>
+<p>
The last prompt will ask you about the amount of memory to be used by
-<EM>i.photo.rectify</EM>.
+<em>i.photo.rectify</em>.
<H2>SEE ALSO</H2>
-<EM>
-<A HREF="i.ortho.photo.html">i.ortho.photo</A><br>
-<A HREF="i.photo.camera.html">i.photo.camera</A><br>
-<A HREF="i.photo.2image.html">i.photo.2image</A><br>
-<A HREF="i.photo.2target.html">i.photo.2target</A><br>
-<A HREF="i.photo.init.html">i.photo.init</A><br>
-<A HREF="i.rectify.html">i.rectify</A><br>
-</EM>
+<em>
+<a href="i.ortho.photo.html">i.ortho.photo</a><br>
+<a href="i.ortho.camera.html">i.ortho.camera</a><br>
+<a href="i.photo.2image.html">i.photo.2image</a><br>
+<a href="i.photo.2target.html">i.photo.2target</a><br>
+<a href="i.ortho.init.html">i.ortho.init</a><br>
+<a href="i.rectify.html">i.rectify</a>
+</em>
<H2>AUTHOR</H2>
Modified: grass/trunk/imagery/i.ortho.photo/i.ortho.rectify/main.c
===================================================================
--- grass/trunk/imagery/i.ortho.photo/i.ortho.rectify/main.c 2013-02-20 10:04:31 UTC (rev 55129)
+++ grass/trunk/imagery/i.ortho.photo/i.ortho.rectify/main.c 2013-02-20 10:16:02 UTC (rev 55130)
@@ -1,7 +1,7 @@
/****************************************************************************
*
- * MODULE: i.photo.rectify
+ * MODULE: i.ortho.rectify (former i.photo.rectify)
* AUTHOR(S): Mike Baba, DBA Systems, Inc. (original contributor)
* Markus Neteler <neteler itc.it>,
* Bernhard Reiter <bernhard intevation.de>,
Modified: grass/trunk/imagery/i.ortho.photo/i.ortho.transform/i.ortho.transform.html
===================================================================
--- grass/trunk/imagery/i.ortho.photo/i.ortho.transform/i.ortho.transform.html 2013-02-20 10:04:31 UTC (rev 55129)
+++ grass/trunk/imagery/i.ortho.photo/i.ortho.transform/i.ortho.transform.html 2013-02-20 10:16:02 UTC (rev 55130)
@@ -1,6 +1,6 @@
<h2>DESCRIPTION</h2>
-<em>m.transform</em> is an utility to compute transformation
+<em>i.ortho.transform</em> is an utility to compute transformation
based upon GCPs and output error measurements.
Modified: grass/trunk/imagery/i.ortho.photo/i.ortho.transform/main.c
===================================================================
--- grass/trunk/imagery/i.ortho.photo/i.ortho.transform/main.c 2013-02-20 10:04:31 UTC (rev 55129)
+++ grass/trunk/imagery/i.ortho.photo/i.ortho.transform/main.c 2013-02-20 10:16:02 UTC (rev 55130)
@@ -1,7 +1,7 @@
/****************************************************************************
*
- * MODULE: i.ortho.transform (cloned from m.tranform nee g.transform)
+ * MODULE: i.ortho.transform (cloned from m.transform and g.transform)
* AUTHOR(S): Brian J. Buckley
* Glynn Clements
* Hamish Bowman
More information about the grass-commit
mailing list