[GRASS-SVN] r32885 - in grass/trunk: general/g.region
raster/r.category raster/r.mapcalc scripts/r.tileset tools
svn_grass at osgeo.org
svn_grass at osgeo.org
Tue Aug 19 07:09:17 EDT 2008
Author: glynn
Date: 2008-08-19 07:09:16 -0400 (Tue, 19 Aug 2008)
New Revision: 32885
Modified:
grass/trunk/general/g.region/g.region.html
grass/trunk/raster/r.category/r.category.html
grass/trunk/raster/r.mapcalc/r.mapcalc.html
grass/trunk/raster/r.mapcalc/r3.mapcalc.html
grass/trunk/scripts/r.tileset/r.tileset.html
grass/trunk/tools/grassdocs.css
Log:
More HTML fixes
Modified: grass/trunk/general/g.region/g.region.html
===================================================================
--- grass/trunk/general/g.region/g.region.html 2008-08-19 10:54:52 UTC (rev 32884)
+++ grass/trunk/general/g.region/g.region.html 2008-08-19 11:09:16 UTC (rev 32885)
@@ -170,19 +170,19 @@
<h2>EXAMPLES</h2>
<dl>
-<dt>
-<div class="code"><pre>
+<dt><span class="code"><tt>
g.region n=7360100 e=699000
-</pre></div>
+</tt></span>
+
<dd> will reset the northing and easting for the current
region, but leave the south edge, west edge, and the region
cell resolutions unchanged.
<p>
-<dt><div class="code"><pre>
+<dt><span class="code"><tt>
g.region n=51:36:05N e=10:10:05E s=51:29:55N w=9:59:55E res=0:00:01
-</pre></div>
+</tt></span>
<dd> will reset the northing, easting, southing, westing and resolution
for the current region, here in DMS latitude-longitude style
@@ -190,9 +190,9 @@
<p>
-<dt><div class="code"><pre>
+<dt><span class="code"><tt>
g.region -dp s=698000
-</pre></div>
+</tt></span>
<dd> will set the current region from the default region
for the GRASS data base location, reset the south edge to
@@ -200,9 +200,9 @@
<p>
-<dt><div class="code"><pre>
+<dt><span class="code"><tt>
g.region n=n+1000 w=w-500
-</pre></div>
+</tt></span>
<dd> The n=<em>value</em> may also be specified as a
function of its current value: n=n+<em>value</em>
@@ -215,9 +215,9 @@
<p>
-<dt><div class="code"><pre>
+<dt><span class="code"><tt>
g.region n=s+1000 e=w+1000
-</pre></div>
+</tt></span>
<dd> This form allows the user to set the region boundary
values relative to one another. Here, the northern
@@ -234,9 +234,9 @@
northern and eastern boundary values.
-<dt><div class="code"><pre>
+<dt><span class="code"><tt>
g.region rast=soils
-</pre></div>
+</tt></span>
<dd> This form will make the current region settings
exactly the same as those given in the cell header file for
@@ -245,9 +245,9 @@
<p>
-<dt><div class="code"><pre>
+<dt><span class="code"><tt>
g.region rast=soils zoom=soils
-</pre></div>
+</tt></span>
<dd> This form will first look up the cell header file for
the raster map layer <em>soils</em>, use this as the
@@ -262,9 +262,9 @@
<p>
-<dt><div class="code"><pre>
+<dt><span class="code"><tt>
g.region -up rast=soils
-</pre></div>
+</tt></span>
<dd> The <b>-u</b> option suppresses the re-setting of the
current region definition. This can be useful when it is
@@ -274,9 +274,9 @@
<p>
-<dt><div class="code"><pre>
+<dt><span class="code"><tt>
g.region -up zoom=soils save=soils
-</pre></div>
+</tt></span>
<dd> This will zoom into the smallest region which
encompasses all non-NULL soils data values, and save the
@@ -287,10 +287,10 @@
<p>
-<dt><div class="code"><pre>
+<dt><span class="code"><tt>
g.region b=0 t=3000 tbres=200 res3=100
g.region -p3
-</pre></div>
+</tt></span>
<dd> This will define the 3D region for voxel computations.
In this example a volume with bottom (0m) to top (3000m)
@@ -299,9 +299,9 @@
<p>
-<dt><div class="code"><pre>
+<dt><span class="code"><tt>
g.region -p
-</pre></div>
+</tt></span>
<dd> This will print the current region in the format:
@@ -322,9 +322,9 @@
<p>
-<dt><div class="code"><pre>
+<dt><span class="code"><tt>
g.region -p3
-</pre></div>
+</tt></span>
<dd> This will print the current region and the 3D region (used for voxels)
in the format:
@@ -354,9 +354,9 @@
<p>
-<dt><div class="code"><pre>
+<dt><span class="code"><tt>
g.region -g
-</pre></div>
+</tt></span>
<dd> The <b>-g</b> option prints the region in the
following script style (key=value) format:
@@ -374,9 +374,9 @@
<p>
-<dt><div class="code"><pre>
+<dt><span class="code"><tt>
g.region -bg
-</pre></div>
+</tt></span>
<dd> The <b>-bg</b> option prints the region in the
following script style (key=value) format plus the
@@ -399,9 +399,9 @@
<p>
-<dt><div class="code"><pre>
+<dt><span class="code"><tt>
g.region -l
-</pre></div>
+</tt></span>
<dd> The <b>-l</b> option prints the region in the
following format:
@@ -419,9 +419,9 @@
<p>
-<dt><div class="code"><pre>
+<dt><span class="code"><tt>
g.region -pm
-</pre></div>
+</tt></span>
<dd> This will print the current region in the format
(latitude-longitude location):
Modified: grass/trunk/raster/r.category/r.category.html
===================================================================
--- grass/trunk/raster/r.category/r.category.html 2008-08-19 10:54:52 UTC (rev 32884)
+++ grass/trunk/raster/r.category/r.category.html 2008-08-19 11:09:16 UTC (rev 32885)
@@ -119,23 +119,23 @@
<p>
<dl>
-<dt><div class="code"><pre>
+<dt><span class="code"><tt>
r.category map=soils
-</pre></div>
+</tt></span>
<dd>
prints the values and labels associated with all of the categories in the
<em>soils</em> raster map layer;
-<dt><div class="code"><pre>
+<dt><span class="code"><tt>
r.category map=soils cats=10,12,15-20
-</pre></div>
+</tt></span>
<dd>
prints only the category values and labels for <em>soils</em> map layer
categories <tt>10, 12</tt>, and <tt>15</tt> through <tt>20</tt>; and
-<dt><div class="code"><pre>
+<dt><span class="code"><tt>
r.category map=soils cats=10,20 fs=':'
-</pre></div>
+</tt></span>
<dd>
prints the values and labels for <em>soils</em> map layer categories
<tt>10</tt> and <tt>20</tt>, but uses "<tt>:</tt>" (instead of a tab)
Modified: grass/trunk/raster/r.mapcalc/r.mapcalc.html
===================================================================
--- grass/trunk/raster/r.mapcalc/r.mapcalc.html 2008-08-19 10:54:52 UTC (rev 32884)
+++ grass/trunk/raster/r.mapcalc/r.mapcalc.html 2008-08-19 11:09:16 UTC (rev 32885)
@@ -364,7 +364,7 @@
r.mapcalc "ndvi=float(lsat.4 - lsat.3) / (lsat.4 + lsat.3)"
</pre></div>
<h2>NULL support</h2>
-<menu>
+<ul>
<li>Division by zero should result in NULL.
<li>Modulus by zero should result in NULL.
<li> NULL-values in any arithmetic or logical operation should result
@@ -401,7 +401,7 @@
sqrt(-2)
pow(a,b) where a is negative and b is not an integer
</pre></div>
-</menu>
+</ul>
<p>
NULL support: Please note that any math performed with NULL cells always
results in a NULL value for these cells. If you want to replace a NULL cell
Modified: grass/trunk/raster/r.mapcalc/r3.mapcalc.html
===================================================================
--- grass/trunk/raster/r.mapcalc/r3.mapcalc.html 2008-08-19 10:54:52 UTC (rev 32884)
+++ grass/trunk/raster/r.mapcalc/r3.mapcalc.html 2008-08-19 11:09:16 UTC (rev 32885)
@@ -248,7 +248,7 @@
r.mapcalc "ndvi=float(lsat.4 - lsat.3) / (lsat.4 + lsat.3)"
</PRE></div>
<H2>NULL support</H2>
-<menu>
+<ul>
<li>Division by zero should result in NULL.
<li>Modulus by zero should result in NULL.
<li> NULL-values in any arithmetic or logical operation should result
@@ -285,7 +285,7 @@
sqrt(-2)
pow(a,b) where a is negative and b is not an integer
</PRE></div>
-</menu>
+</ul>
<P>
NULL support: Please note that any math performed with NULL cells always
results in a NULL value for these cells. If you want to replace a NULL cell
Modified: grass/trunk/scripts/r.tileset/r.tileset.html
===================================================================
--- grass/trunk/scripts/r.tileset/r.tileset.html 2008-08-19 10:54:52 UTC (rev 32884)
+++ grass/trunk/scripts/r.tileset/r.tileset.html 2008-08-19 11:09:16 UTC (rev 32885)
@@ -14,9 +14,9 @@
<dl>
<dt>
-<div class="code"><pre>
+<span class="code"><tt>
5|125|45|175|80|100
-</pre></div>
+</tt></span>
<dd>
This is the default output format. It is the tile's minimum x coordinate, minimum y coordinate, maximum x coordinate, maximum y coordinate, width in cells, and height in cells seperated by the "|" character. The fields can be seperated by a different character by changing the fs option.
@@ -24,9 +24,9 @@
<p>
<dt>
-<div class="code"><pre>
+<span class="code"><tt>
w=5;s=125;e=45;n=175;cols=80;rows=100;
-</pre></div>
+</tt></span>
<dd>
This is output in a format convinent for setting variables in a shell script.
@@ -34,9 +34,9 @@
<p>
<dt>
-<div class="code"><pre>
+<span class="code"><tt>
bbox=5,125,45,175&width=80&height=100
-</pre></div>
+</tt></span>
<dd>
This is output in a format convinent for requesting data from some http services.
@@ -49,25 +49,25 @@
<dl>
<dt>
-<div class="code"><pre>
+<span class="code"><tt>
r.tileset sourceproj=+init=epsg:4326 maxrows=1024 maxcols=2048
-</pre></div>
+</tt></span>
<dd> Generates tiles in latitude longitude that cover the current region, each tile will be less than 1024 cells high and 2048 cells across. The bounds and sizes of tiles in the output are seperated by |
<p>
<dt>
-<div class="code"><pre>
+<span class="code"><tt>
r.tileset sourceproj=+init=epsg:4326 overlap=2 -w region=ne-rio
-</pre></div>
+</tt></span>
<dd>Generates tiles in latitude longitude projection that cover the named region "ne-rio". The tiles will have 2 cells of overlap. The output format will be strings like the bbox requests for WMS servers.
<p>
<dt>
-<div class="code"><pre>
+<span class="code"><tt>
r.tileset sourceproj=`g.proj -j location=IrishGrid` maxrows=400 maxcols=300 overlap=3 -g
-</pre></div>
+</tt></span>
<dd>Generates tiles in the projection of the location "IrishGrid". Each tile will be less than 300x400 cells in size, with 3 cells of overlap in the top and right sides of each tile. The output is in a format where each line is in shell script style. The substitution <code>`g.proj -j location=IrishGrid`</code> will only work in a unix style shell.
</dl>
Modified: grass/trunk/tools/grassdocs.css
===================================================================
--- grass/trunk/tools/grassdocs.css 2008-08-19 10:54:52 UTC (rev 32884)
+++ grass/trunk/tools/grassdocs.css 2008-08-19 11:09:16 UTC (rev 32885)
@@ -51,6 +51,13 @@
padding-right: 1em;
}
+SPAN.code{ width: 95%;
+ color : black;
+ background-color: rgb(90%, 90%, 90%);
+ padding-left: 1em;
+ padding-right: 1em;
+}
+
.leftmenu {
padding-left: 10px;
}
More information about the grass-commit
mailing list