Переглянути джерело

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 https://trac.osgeo.org/grass/changeset/57780 for note about broken file and https://trac.osgeo.org/grass/changeset/64263 for restoration from https://trac.osgeo.org/grass/changeset/47531
 * 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


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@64270 15284696-431f-4ddb-bdfa-cd5b030d7da7
Vaclav Petras 10 роки тому
батько
коміт
440faf25a9

+ 6 - 6
lib/raster3d/README

@@ -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"

BIN
lib/raster3d/r3_volume_layout.png


BIN
lib/raster3d/r3_volume_layout_large.png


BIN
lib/raster3d/raster3d_layout.png


BIN
lib/raster3d/r3_volume_layout.xcf


+ 13 - 0
lib/raster3d/raster3d_tile_cell_generator.sh

@@ -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

+ 1 - 1
lib/raster3d/raster3dlib.dox

@@ -22,7 +22,7 @@ The size of the tile cache in memory can be set in bytes using the environmental
 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
 

+ 0 - 13
lib/raster3d/volume_tile_cell_generator.sh

@@ -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

+ 1 - 1
raster3d/r3.in.ascii/r3.in.ascii.html

@@ -17,7 +17,7 @@ The data is automatically imported into the correct internal coordinate system,
 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>

BIN
raster3d/r3.in.ascii/r3_volume_layout.png


BIN
raster3d/r3.in.ascii/raster3d_layout.png


+ 1 - 1
raster3d/r3.out.ascii/r3.out.ascii.html

@@ -71,7 +71,7 @@ Supported orders are:
 <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>

BIN
raster3d/r3.out.ascii/r3_volume_layout.png


BIN
raster3d/r3.out.ascii/raster3d_layout.png


+ 1 - 1
raster3d/raster3dintro.html

@@ -21,7 +21,7 @@ can be specified at import time with a given import module such as
 <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>