[GRASS-SVN] r62527 - in grass/branches/releasebranch_7_0: . gui/wxpython/xml raster raster/r.in.ascii raster/r.in.bin raster/r.in.gdal raster/r.out.ascii raster/r.out.bin raster/r.out.gdal raster/r.out.png raster/r.out.ppm

svn_grass at osgeo.org svn_grass at osgeo.org
Sat Nov 1 12:59:35 PDT 2014 

Author: neteler
Date: 2014-11-01 12:59:34 -0700 (Sat, 01 Nov 2014)
New Revision: 62527

Removed:
   grass/branches/releasebranch_7_0/raster/r.in.arc/
   grass/branches/releasebranch_7_0/raster/r.out.arc/
   grass/branches/releasebranch_7_0/raster/r.out.tiff/
Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/gui/wxpython/xml/toolboxes.xml
   grass/branches/releasebranch_7_0/raster/Makefile
   grass/branches/releasebranch_7_0/raster/r.in.ascii/r.in.ascii.html
   grass/branches/releasebranch_7_0/raster/r.in.bin/r.in.bin.html
   grass/branches/releasebranch_7_0/raster/r.in.gdal/r.in.gdal.html
   grass/branches/releasebranch_7_0/raster/r.out.ascii/r.out.ascii.html
   grass/branches/releasebranch_7_0/raster/r.out.bin/r.out.bin.html
   grass/branches/releasebranch_7_0/raster/r.out.gdal/r.out.gdal.html
   grass/branches/releasebranch_7_0/raster/r.out.png/r.out.png.html
   grass/branches/releasebranch_7_0/raster/r.out.ppm/r.out.ppm.html
Log:
r.in.arc, r.out.arc, r.out.tiff modules moved to Addons (trunk, r62524)


Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:62487,62491,62494,62506,62508-62509,62515,62519,62521
   + /grass/trunk:62487,62491,62494,62506,62508-62509,62515,62519,62521,62526

Modified: grass/branches/releasebranch_7_0/gui/wxpython/xml/toolboxes.xml
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/xml/toolboxes.xml	2014-11-01 19:57:37 UTC (rev 62526)
+++ grass/branches/releasebranch_7_0/gui/wxpython/xml/toolboxes.xml	2014-11-01 19:59:34 UTC (rev 62527)
@@ -263,9 +263,6 @@
       <module-item name="r.in.bin">
         <label>Raw binary array import</label>
       </module-item>
-      <module-item name="r.in.arc">
-        <label>ESRI ASCII grid import</label>
-      </module-item>
       <module-item name="r.in.gridatb">
         <label>GRIDATB.FOR import</label>
       </module-item>
@@ -385,9 +382,6 @@
         <label>ASCII x,y,z points export</label>
       </module-item>
       <separator/>
-      <module-item name="r.out.arc">
-        <label>ESRI ASCII grid export</label>
-      </module-item>
       <module-item name="r.out.gridatb">
         <label>GRIDATB.FOR export</label>
       </module-item>
@@ -414,9 +408,6 @@
       <module-item name="r.out.pov">
         <label>POV-Ray export</label>
       </module-item>
-      <module-item name="r.out.tiff">
-        <label>TIFF export</label>
-      </module-item>
       <module-item name="r.out.vrml">
         <label>VRML export</label>
       </module-item>

Modified: grass/branches/releasebranch_7_0/raster/Makefile
===================================================================
--- grass/branches/releasebranch_7_0/raster/Makefile	2014-11-01 19:57:37 UTC (rev 62526)
+++ grass/branches/releasebranch_7_0/raster/Makefile	2014-11-01 19:59:34 UTC (rev 62527)
@@ -28,7 +28,6 @@
 	r.gwflow \
 	r.his \
 	r.horizon \
-	r.in.arc \
 	r.in.ascii \
 	r.in.bin \
 	r.in.gdal \
@@ -48,7 +47,6 @@
 	r.mode \
 	r.neighbors \
 	r.null \
-	r.out.arc \
 	r.out.ascii \
 	r.out.bin \
 	r.out.gdal \
@@ -59,7 +57,6 @@
 	r.out.pov \
 	r.out.ppm \
 	r.out.ppm3 \
-	r.out.tiff \
 	r.out.vrml \
 	r.out.vtk \
 	r.param.scale \

Modified: grass/branches/releasebranch_7_0/raster/r.in.ascii/r.in.ascii.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.in.ascii/r.in.ascii.html	2014-11-01 19:57:37 UTC (rev 62526)
+++ grass/branches/releasebranch_7_0/raster/r.in.ascii/r.in.ascii.html	2014-11-01 19:59:34 UTC (rev 62527)
@@ -63,7 +63,7 @@
 <p>
 The header information in ESRI Raster ASCII files differs from GRASS.  
 To convert an Arc/Info (ArcView) ASCII grid file into GRASS, see 
-<em><a href="r.in.arc.html">r.in.arc</a></em>.
+<em><a href="r.in.gdal.html">r.in.gdal</a></em>.
 
 <p>
 SURFER (Golden Software) ASCII files may be imported by passing the <b>-s</b> flag.
@@ -97,9 +97,8 @@
 
 <em>
 <a href="r.out.ascii.html">r.out.ascii</a>,
-<a href="r.in.arc.html">r.in.arc</a>, 
 <a href="r.in.gdal.html">r.in.gdal</a>, 
-<a href="r.out.arc.html">r.out.arc</a>,
+<a href="r.out.gdal.html">r.out.gdal</a>,
 <a href="r.in.bin.html">r.in.bin</a>,
 <a href="r3.in.ascii.html">r3.in.ascii</a>,
 <a href="http://grass.osgeo.org/gdp/html_grass5/ascii_formats.html">GRASS ASCII formats</a>

Modified: grass/branches/releasebranch_7_0/raster/r.in.bin/r.in.bin.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.in.bin/r.in.bin.html	2014-11-01 19:57:37 UTC (rev 62526)
+++ grass/branches/releasebranch_7_0/raster/r.in.bin/r.in.bin.html	2014-11-01 19:59:34 UTC (rev 62527)
@@ -17,8 +17,9 @@
 suggesting a closer bytes value. 
 
 <p><em>r.in.bin</em> can be used to import numerous binary arrays including:
-ETOPO30, ETOPO-5, ETOPO-2, Globe DEM, BIL, AVHRR and GMT binary arrays (ID 1 & 2)
-<p>
+ETOPO30, ETOPO-5, ETOPO-2, Globe DEM, BIL, AVHRR and GMT binary arrays
+(ID 1 & 2).
+
 <h2>NOTES</h2>
 
 If optional parameters are not supplied, <b>r.in.bin</b> attempts
@@ -77,7 +78,6 @@
 r.in.bin in=p07_b6.dat out=avhrr c=128 r=128
 </pre></div>
 
-
 <h3>ETOPO2</h3>
 The following is a sample call of <em>r.in.bin</em> to import 
 <a href="http://www.ngdc.noaa.gov/mgg/image/2minrelief.html">ETOPO2 DEM</a> data (here full data set):
@@ -121,10 +121,8 @@
 
 <em>
 <a href="r.out.bin.html">r.out.bin</a>,
-<a href="r.in.ascii.html">r.in.ascii</a>, 
-<a href="r.out.ascii.html">r.out.ascii</a>, 
-<a href="r.in.arc.html">r.in.arc</a>, 
-<a href="r.out.arc.html">r.out.arc</a>,
+<a href="r.in.ascii.html">r.in.ascii</a>,
+<a href="r.out.ascii.html">r.out.ascii</a>,
 <a href="r.in.gdal.html">r.in.gdal</a>,
 <a href="r.out.gdal.html">r.out.gdal</a>,
 <a href="r.in.srtm.html">r.in.srtm</a>
@@ -136,4 +134,5 @@
 Bob Covill, Canada (bcovill at tekmap.ns.ca)<br>
 Markus Metz<br>
 Man page: Zsolt Felker (felker at c160.pki.matav.hu)
+
 <p><i>Last changed: $Date$</i>

Modified: grass/branches/releasebranch_7_0/raster/r.in.gdal/r.in.gdal.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.in.gdal/r.in.gdal.html	2014-11-01 19:57:37 UTC (rev 62526)
+++ grass/branches/releasebranch_7_0/raster/r.in.gdal/r.in.gdal.html	2014-11-01 19:59:34 UTC (rev 62527)
@@ -311,7 +311,6 @@
 <em>
 <a href="r.colors.html">r.colors</a>,
 <a href="r.in.ascii.html">r.in.ascii</a>,
-<a href="r.in.arc.html">r.in.arc</a>,
 <a href="r.in.bin.html">r.in.bin</a>,
 <a href="r.null.html">r.null</a>
 </em>

Modified: grass/branches/releasebranch_7_0/raster/r.out.ascii/r.out.ascii.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.out.ascii/r.out.ascii.html	2014-11-01 19:57:37 UTC (rev 62526)
+++ grass/branches/releasebranch_7_0/raster/r.out.ascii/r.out.ascii.html	2014-11-01 19:59:34 UTC (rev 62527)
@@ -42,7 +42,7 @@
 
 <em>
 <a href="r.in.ascii.html">r.in.ascii</a>,
-<a href="r.in.arc.html">r.in.arc</a>,
+<a href="r.in.gdal.html">r.in.gdal</a>,
 <a href="r.out.bin.html">r.out.bin</a>,
 <a href="r.out.gdal.html">r.out.gdal</a>,
 <a href="r.out.xyz.html">r.out.xyz</a>

Modified: grass/branches/releasebranch_7_0/raster/r.out.bin/r.out.bin.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.out.bin/r.out.bin.html	2014-11-01 19:57:37 UTC (rev 62526)
+++ grass/branches/releasebranch_7_0/raster/r.out.bin/r.out.bin.html	2014-11-01 19:59:34 UTC (rev 62527)
@@ -27,14 +27,15 @@
 
 <h2>SEE ALSO</h2>
 
-<em><a href="r.in.bin.html">r.in.bin</a>,
-<a href="r.in.ascii.html">r.in.ascii</a> 
+<em>
+<a href="r.in.bin.html">r.in.bin</a>,
+<a href="r.in.ascii.html">r.in.ascii</a>,
+<a href="r.in.gdal.html">r.in.gdal</a>,
 <a href="r.out.ascii.html">r.out.ascii</a>
-<a href="r.in.arc.html">r.in.arc</a>,
-<a href="r.out.arc.html">r.out.arc</a></em>
+</em>
 
+<h2>AUTHOR</h2>
 
-<h2>AUTHOR</h2>
 This program is derived from <em><a href="r.out.ascii.html">r.out.ascii</a></em> 
 with a few modifications. <br>
 Author: <a href="mailto:bcovill at tekmap.ns.ca">Bob Covill</a>

Modified: grass/branches/releasebranch_7_0/raster/r.out.gdal/r.out.gdal.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.out.gdal/r.out.gdal.html	2014-11-01 19:57:37 UTC (rev 62526)
+++ grass/branches/releasebranch_7_0/raster/r.out.gdal/r.out.gdal.html	2014-11-01 19:59:34 UTC (rev 62527)
@@ -229,17 +229,12 @@
 <br>
 <em>
 <a href="r.out.ascii.html">r.out.ascii</a>,
-<a href="r.out.arc.html">r.out.arc</a>,
 <a href="r.out.bin.html">r.out.bin</a>,
 <a href="r.out.mat.html">r.out.mat</a>,
 <a href="r.out.png.html">r.out.png</a>,
-<a href="r.out.ppm.html">r.out.ppm</a>,
-<a href="r.out.tiff.html">r.out.tiff</a>
-<br>
-<a href="r.out.gdal.sh.html">r.out.gdal.sh</a></em>
- (old shell script version using <tt>gdal_translate</tt>)
+<a href="r.out.ppm.html">r.out.ppm</a>
+</em>
 
-
 <h2>REFERENCES</h2>
 
 GDAL Pages: <a href="http://www.gdal.org">http://www.gdal.org</a>

Modified: grass/branches/releasebranch_7_0/raster/r.out.png/r.out.png.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.out.png/r.out.png.html	2014-11-01 19:57:37 UTC (rev 62526)
+++ grass/branches/releasebranch_7_0/raster/r.out.png/r.out.png.html	2014-11-01 19:59:34 UTC (rev 62527)
@@ -15,7 +15,6 @@
 <em>
 <a href="r.out.gdal.html">r.out.gdal</a>,
 <a href="r.out.ppm.html">r.out.ppm</a>,
-<a href="r.out.tiff.html">r.out.tiff</a>,
 <a href="r.out.ascii.html">r.out.ascii</a>,
 <a href="r.in.png.html">r.in.png</a>
 </em>

Modified: grass/branches/releasebranch_7_0/raster/r.out.ppm/r.out.ppm.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.out.ppm/r.out.ppm.html	2014-11-01 19:57:37 UTC (rev 62526)
+++ grass/branches/releasebranch_7_0/raster/r.out.ppm/r.out.ppm.html	2014-11-01 19:59:34 UTC (rev 62527)
@@ -12,7 +12,8 @@
 By default the PPM file created is 24-bit color, rawbits storage.
 You can use the <b>-g</b> flag to force <em>r.out.ppm</em> to 
 output an 8-bit greyscale instead.
-The greyscale conversion uses the NTSC conversion:<p>
+The greyscale conversion uses the NTSC conversion:
+<p>
 <div class="code"><pre>
 Y = .30*Red + .59*Green + .11*Blue
 </pre></div>
@@ -42,12 +43,14 @@
 </pre></div>
 
 <h2>SEE ALSO</h2>
-<em><a href="d.out.png.html">d.out.png</a></em><br>
-<em><a href="r.out.ascii.html">r.out.ascii</a></em><br>
-<em><a href="r.out.mpeg.html">r.out.mpeg</a></em><br>
-<em><a href="r.out.png.html">r.out.png</a></em><br>
-<em><a href="r.out.ppm3.html">r.out.ppm3</a></em><br>
-<em><a href="r.out.tiff.html">r.out.tiff</a></em>
+<em>
+<a href="d.out.file.html">d.out.file</a>,
+<a href="r.out.ascii.html">r.out.ascii</a>,
+<a href="r.out.gdal.html">r.out.gdal</a>,
+<a href="r.out.mpeg.html">r.out.mpeg</a>,
+<a href="r.out.png.html">r.out.png</a>,
+<a href="r.out.ppm3.html">r.out.ppm3</a>
+</em>
  
 <h2>AUTHOR</h2>

More information about the grass-commit mailing list