[GRASS-SVN] r60750 - in grass/branches/releasebranch_7_0: lib/python/script raster3d/r3.info

[svn_grass at osgeo.org]

Author: annakrat
Date: 2014-06-08 05:34:04 -0700 (Sun, 08 Jun 2014)
New Revision: 60750

Modified:
   grass/branches/releasebranch_7_0/lib/python/script/raster3d.py
   grass/branches/releasebranch_7_0/raster3d/r3.info/r3.info.main.c
Log:
r3.info: output also rows, cols and depths (merge from trunk, r60615)

Modified: grass/branches/releasebranch_7_0/lib/python/script/raster3d.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/script/raster3d.py	2014-06-08 11:03:09 UTC (rev 60749)
+++ grass/branches/releasebranch_7_0/lib/python/script/raster3d.py	2014-06-08 12:34:04 UTC (rev 60750)
@@ -62,6 +62,8 @@
         kv[k] = float(kv[k])
     for k in ['nsres', 'ewres', 'tbres']:
         kv[k] = float_or_dms(kv[k])
+    for k in ['rows', 'cols', 'depths']:
+        kv[k] = int(kv[k])
     for k in ['tilenumx', 'tilenumy', 'tilenumz']:
         kv[k] = int(kv[k])
     for k in ['tiledimx', 'tiledimy', 'tiledimz']:

Modified: grass/branches/releasebranch_7_0/raster3d/r3.info/r3.info.main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster3d/r3.info/r3.info.main.c	2014-06-08 11:03:09 UTC (rev 60749)
+++ grass/branches/releasebranch_7_0/raster3d/r3.info/r3.info.main.c	2014-06-08 12:34:04 UTC (rev 60750)
@@ -418,6 +418,10 @@
 
 	    fprintf(out, "tbres=%g\n", cellhd.tb_res);
 
+	    fprintf(out, "rows=%d\n", cellhd.rows);
+	    fprintf(out, "cols=%d\n", cellhd.cols);
+	    fprintf(out, "depths=%d\n", cellhd.depths);
+
 	    fprintf(out, "datatype=\"%s\"\n",
 		    data_type == FCELL_TYPE ? "FCELL" :
 		    data_type == DCELL_TYPE ? "DCELL" :