[GRASS-SVN] r64270 - in grass/trunk: lib/raster3d raster3d raster3d/r3.in.ascii raster3d/r3.out.ascii
svn_grass at osgeo.org
svn_grass at osgeo.org
Tue Jan 20 19:31:26 PST 2015
Author: wenzeslaus
Date: 2015-01-20 19:31:26 -0800 (Tue, 20 Jan 2015)
New Revision: 64270
Added:
grass/trunk/lib/raster3d/raster3d_layout.png
grass/trunk/lib/raster3d/raster3d_layout.xcf
grass/trunk/lib/raster3d/raster3d_tile_cell_generator.sh
grass/trunk/raster3d/r3.in.ascii/raster3d_layout.png
grass/trunk/raster3d/r3.out.ascii/raster3d_layout.png
Removed:
grass/trunk/lib/raster3d/r3_volume_layout.png
grass/trunk/lib/raster3d/r3_volume_layout.xcf
grass/trunk/lib/raster3d/r3_volume_layout_large.png
grass/trunk/lib/raster3d/volume_tile_cell_generator.sh
grass/trunk/raster3d/r3.in.ascii/r3_volume_layout.png
grass/trunk/raster3d/r3.out.ascii/r3_volume_layout.png
Modified:
grass/trunk/lib/raster3d/README
grass/trunk/lib/raster3d/raster3dlib.dox
grass/trunk/raster3d/r3.in.ascii/r3.in.ascii.html
grass/trunk/raster3d/r3.out.ascii/r3.out.ascii.html
grass/trunk/raster3d/raster3dintro.html
Log:
change terminology in 3D raster layout image
* replace G3D, volume, and voxel
* all should related to the image file be unified now (e.g., cell was already used in script name)
* font in the image changed a little bit, the text area is now wider
* xcf file should be ok now, see r57780 for note about broken file and r64263 for restoration from r47531
* files in r.in.ascii and r.out.ascii are svn cp from the file in lib (one of them is the one going to documentation)
* related file names changed too
Modified: grass/trunk/lib/raster3d/README
===================================================================
--- grass/trunk/lib/raster3d/README 2015-01-21 02:36:57 UTC (rev 64269)
+++ grass/trunk/lib/raster3d/README 2015-01-21 03:31:26 UTC (rev 64270)
@@ -1,9 +1,9 @@
-The r3_volume_layout.png was created from r3_volume_layout.xcf then resized to
-543x480 pixels. The original file is now r3_volume_layout_large.png (877x755).
-Unfortunatelly, the source file r3_volume_layout.xcf is probably broken.
+The raster3_layout.png was created from raster3_layout.xcf by export from GIMP
+then resized to 540x477 using:
+ mogrify -resize 540x480 raster3_layout.png
-See also volume_tile_cell_generator.sh.
+See also raster3d_tile_cell_generator.sh.
-The r3_volume_layout.png is used on several places in programming and user
+The image is used on several places in programming and user
documentation. To find all usages use:
- find . -name "*volume_layout*.png"
+ find . -name "*raster3d_layout.png"
Deleted: grass/trunk/lib/raster3d/r3_volume_layout.png
===================================================================
(Binary files differ)
Deleted: grass/trunk/lib/raster3d/r3_volume_layout.xcf
===================================================================
(Binary files differ)
Deleted: grass/trunk/lib/raster3d/r3_volume_layout_large.png
===================================================================
(Binary files differ)
Copied: grass/trunk/lib/raster3d/raster3d_layout.png (from rev 64268, grass/trunk/lib/raster3d/r3_volume_layout.png)
===================================================================
(Binary files differ)
Copied: grass/trunk/lib/raster3d/raster3d_layout.xcf (from rev 64268, grass/trunk/lib/raster3d/r3_volume_layout.xcf)
===================================================================
(Binary files differ)
Copied: grass/trunk/lib/raster3d/raster3d_tile_cell_generator.sh (from rev 64268, grass/trunk/lib/raster3d/volume_tile_cell_generator.sh)
===================================================================
--- grass/trunk/lib/raster3d/raster3d_tile_cell_generator.sh (rev 0)
+++ grass/trunk/lib/raster3d/raster3d_tile_cell_generator.sh 2015-01-21 03:31:26 UTC (rev 64270)
@@ -0,0 +1,13 @@
+# Use this script to generate the VTK files for 3D raster visualization
+# showing cells, tiles and tile dimension.
+# VTK files can bevisualized with Paraview (www.paraview.org)
+
+g.region s=0 n=120 w=0 e=160 b=0 t=80 res3=10 -p3
+r3.mapcalc --o expr="sample_raster = col() + row() + depth()"
+r3.out.vtk --o input=sample_raster output=sample_raster.vtk dp=0 null=0
+
+g.region s=0 n=120 w=0 e=160 b=0 t=80 res3=40 -p3
+r3.out.vtk --o input=sample_raster output=tiles.vtk dp=0 null=0
+
+g.region s=0 n=40 w=0 e=40 b=40 t=80 res3=10 -p3
+r3.out.vtk --o input=sample_raster output=tile.vtk dp=0 null=0
Modified: grass/trunk/lib/raster3d/raster3dlib.dox
===================================================================
--- grass/trunk/lib/raster3d/raster3dlib.dox 2015-01-21 02:36:57 UTC (rev 64269)
+++ grass/trunk/lib/raster3d/raster3dlib.dox 2015-01-21 03:31:26 UTC (rev 64270)
@@ -22,7 +22,7 @@
Default size is 16777216 bytes.The number of tiles hold in memory can be specified with the environmental variable
RASTER3D_DEFAULT_CACHE_SIZE. Default is 1000.
-\image html "r3_volume_layout.png" "The volume coordinate system and tile layout of the 3D Raster Library"
+\image html "raster3d_layout.png" "The volume coordinate system and tile layout of the 3D Raster Library"
\section Directory_Structure Directory Structure
Deleted: grass/trunk/lib/raster3d/volume_tile_cell_generator.sh
===================================================================
--- grass/trunk/lib/raster3d/volume_tile_cell_generator.sh 2015-01-21 02:36:57 UTC (rev 64269)
+++ grass/trunk/lib/raster3d/volume_tile_cell_generator.sh 2015-01-21 03:31:26 UTC (rev 64270)
@@ -1,13 +0,0 @@
-# Use this script to generate the VTK files for volume visualization
-# showing voxel, tiles and tile dimension.
-# VTK files can bevisualized with Paraview (www.paraview.org)
-
-g.region s=0 n=120 w=0 e=160 b=0 t=80 res3=10 -p3
-r3.mapcalc --o expr="volume = col() + row() + depth()"
-r3.out.vtk --o input=volume output=volume.vtk dp=0 null=0
-
-g.region s=0 n=120 w=0 e=160 b=0 t=80 res3=40 -p3
-r3.out.vtk --o input=volume output=tiles.vtk dp=0 null=0
-
-g.region s=0 n=40 w=0 e=40 b=40 t=80 res3=10 -p3
-r3.out.vtk --o input=volume output=tile.vtk dp=0 null=0
Modified: grass/trunk/raster3d/r3.in.ascii/r3.in.ascii.html
===================================================================
--- grass/trunk/raster3d/r3.in.ascii/r3.in.ascii.html 2015-01-21 02:36:57 UTC (rev 64269)
+++ grass/trunk/raster3d/r3.in.ascii/r3.in.ascii.html 2015-01-21 03:31:26 UTC (rev 64270)
@@ -17,7 +17,7 @@
that is visualized in the following picture, independently from the specified
ordering in the ASCII input file:
<center>
-<img src="r3_volume_layout.png" border=0><br>
+<img src="raster3d_layout.png" border=0><br>
<table border=0 width=700>
<tr><td><center>
<i>The volume coordinate system and tile layout of the imported voxel map</i>
Deleted: grass/trunk/raster3d/r3.in.ascii/r3_volume_layout.png
===================================================================
(Binary files differ)
Copied: grass/trunk/raster3d/r3.in.ascii/raster3d_layout.png (from rev 64268, grass/trunk/lib/raster3d/r3_volume_layout.png)
===================================================================
(Binary files differ)
Modified: grass/trunk/raster3d/r3.out.ascii/r3.out.ascii.html
===================================================================
--- grass/trunk/raster3d/r3.out.ascii/r3.out.ascii.html 2015-01-21 02:36:57 UTC (rev 64269)
+++ grass/trunk/raster3d/r3.out.ascii/r3.out.ascii.html 2015-01-21 03:31:26 UTC (rev 64270)
@@ -71,7 +71,7 @@
<p>
The internal storage scheme of 3D raster maps is visualized in the following picture:
<center>
-<img src="r3_volume_layout.png" border=0><br>
+<img src="raster3d_layout.png" border=0><br>
<table border=0 width=700>
<tr><td><center>
<i>The coordinate system and tile layout of a voxel map in GRASS</i>
Deleted: grass/trunk/raster3d/r3.out.ascii/r3_volume_layout.png
===================================================================
(Binary files differ)
Copied: grass/trunk/raster3d/r3.out.ascii/raster3d_layout.png (from rev 64268, grass/trunk/lib/raster3d/r3_volume_layout.png)
===================================================================
(Binary files differ)
Modified: grass/trunk/raster3d/raster3dintro.html
===================================================================
--- grass/trunk/raster3d/raster3dintro.html 2015-01-21 02:36:57 UTC (rev 64269)
+++ grass/trunk/raster3d/raster3dintro.html 2015-01-21 03:31:26 UTC (rev 64270)
@@ -21,7 +21,7 @@
<a href="r3.retile.html">r3.retile</a> after import or creation.
<div align="center" style="margin: 10px">
-<img src="r3_volume_layout.png" border=0><br>
+<img src="raster3d_layout.png" border=0><br>
<i>The 3D raster map coordinate system and tile layout of the RASTER3D library</i>
</div>
More information about the grass-commit
mailing list