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

v.vol.rst: 3D aspect maps should be in degrees to be consistent with 2D

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@60460 15284696-431f-4ddb-bdfa-cd5b030d7da7
Anna Petrášová 11 роки тому
батько
коміт
d74ee358e0
2 змінених файлів з 3 додано та 3 видалено
  1. 2 2
      vector/v.vol.rst/user1.c
  2. 1 1
      vector/v.vol.rst/v.vol.rst.html

+ 2 - 2
vector/v.vol.rst/user1.c

@@ -547,7 +547,7 @@ int OUTGR()
 			bmask = BM_get(bitmask, x, nsizr - y - 1);
 			bmask = BM_get(bitmask, x, nsizr - y - 1);
 		    else
 		    else
 			bmask = 1;
 			bmask = 1;
-		    value = data[cnt];
+		    value = data[cnt] * 180 / M_PI;
 		    if (!bmask)
 		    if (!bmask)
 			Rast3d_set_null_value(&value, 1, FCELL_TYPE);
 			Rast3d_set_null_value(&value, 1, FCELL_TYPE);
 		    if (Rast3d_put_float(cf3, x, y, iarc, value) == 0) {
 		    if (Rast3d_put_float(cf3, x, y, iarc, value) == 0) {
@@ -597,7 +597,7 @@ int OUTGR()
 			bmask = BM_get(bitmask, x, nsizr - y - 1);
 			bmask = BM_get(bitmask, x, nsizr - y - 1);
 		    else
 		    else
 			bmask = 1;
 			bmask = 1;
-		    value = data[cnt];
+		    value = data[cnt] * 180 / M_PI;
 		    if (!bmask)
 		    if (!bmask)
 			Rast3d_set_null_value(&value, 1, FCELL_TYPE);
 			Rast3d_set_null_value(&value, 1, FCELL_TYPE);
 		    if (Rast3d_put_float(cf4, x, y, iarc, value) == 0) {
 		    if (Rast3d_put_float(cf4, x, y, iarc, value) == 0) {

+ 1 - 1
vector/v.vol.rst/v.vol.rst.html

@@ -18,7 +18,7 @@ gradient defined by horizontal and vertical angles), change of gradient,
 Gauss-Kronecker curvature, or mean curvature). These geometric
 Gauss-Kronecker curvature, or mean curvature). These geometric
 parameteres are saved as
 parameteres are saved as
 3d raster maps <b>gradient, aspect1, aspect2, ncurv, gcurv, mcurv</b>,
 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
 <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.
 that are closer to each other than given <b>dmin</b> are removed.