[GRASS-SVN] r60463 - grass/branches/releasebranch_7_0/vector/v.vol.rst

[svn_grass at osgeo.org]

Author: annakrat
Date: 2014-05-24 13:48:12 -0700 (Sat, 24 May 2014)
New Revision: 60463

Modified:
   grass/branches/releasebranch_7_0/vector/v.vol.rst/user1.c
   grass/branches/releasebranch_7_0/vector/v.vol.rst/v.vol.rst.html
Log:
v.vol.rst: 3D aspect maps should be in degrees to be consistent with 2D (merged from trunk, r60460)

Modified: grass/branches/releasebranch_7_0/vector/v.vol.rst/user1.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.vol.rst/user1.c	2014-05-24 20:35:37 UTC (rev 60462)
+++ grass/branches/releasebranch_7_0/vector/v.vol.rst/user1.c	2014-05-24 20:48:12 UTC (rev 60463)
@@ -547,7 +547,7 @@
 			bmask = BM_get(bitmask, x, nsizr - y - 1);
 		    else
 			bmask = 1;
-		    value = data[cnt];
+		    value = data[cnt] * 180 / M_PI;
 		    if (!bmask)
 			Rast3d_set_null_value(&value, 1, FCELL_TYPE);
 		    if (Rast3d_put_float(cf3, x, y, iarc, value) == 0) {
@@ -597,7 +597,7 @@
 			bmask = BM_get(bitmask, x, nsizr - y - 1);
 		    else
 			bmask = 1;
-		    value = data[cnt];
+		    value = data[cnt] * 180 / M_PI;
 		    if (!bmask)
 			Rast3d_set_null_value(&value, 1, FCELL_TYPE);
 		    if (Rast3d_put_float(cf4, x, y, iarc, value) == 0) {

Modified: grass/branches/releasebranch_7_0/vector/v.vol.rst/v.vol.rst.html
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.vol.rst/v.vol.rst.html	2014-05-24 20:35:37 UTC (rev 60462)
+++ grass/branches/releasebranch_7_0/vector/v.vol.rst/v.vol.rst.html	2014-05-24 20:48:12 UTC (rev 60463)
@@ -18,7 +18,7 @@
 Gauss-Kronecker curvature, or mean curvature). These geometric
 parameteres are saved as
 3d raster maps <b>gradient, aspect1, aspect2, ncurv, gcurv, mcurv</b>,
-respectively.
+respectively. Maps <b>aspect1</b> and <b>aspect2</b> are in degrees.
 
 <p>At first, data points are checked for identical positions and points
 that are closer to each other than given <b>dmin</b> are removed.