[GRASS-SVN] r64083 - in grass/trunk/vector: v.lidar.correction v.lidar.edgedetection
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Jan 12 05:36:28 PST 2015
Author: neteler
Date: 2015-01-12 05:36:28 -0800 (Mon, 12 Jan 2015)
New Revision: 64083
Modified:
grass/trunk/vector/v.lidar.correction/main.c
grass/trunk/vector/v.lidar.correction/v.lidar.correction.html
grass/trunk/vector/v.lidar.edgedetection/main.c
grass/trunk/vector/v.lidar.edgedetection/v.lidar.edgedetection.html
Log:
v.lidar.correction,v.lidar.edgedetection: sync spline parameter names to v.surf.bspline (trac #2409); minor cleanup
Modified: grass/trunk/vector/v.lidar.correction/main.c
===================================================================
--- grass/trunk/vector/v.lidar.correction/main.c 2015-01-12 12:36:33 UTC (rev 64082)
+++ grass/trunk/vector/v.lidar.correction/main.c 2015-01-12 13:36:28 UTC (rev 64083)
@@ -1,24 +1,24 @@
/********************************************************************
- * *
- * MODULE: v.lidar.correction *
- * *
- * AUTHOR(S): Roberto Antolin & Gonzalo Moreno *
- * general update Markus Metz *
- * *
- * PURPOSE: Correction of the v.growing output *
- * *
- * COPYRIGHT: (C) 2005 by Politecnico di Milano - *
- * Polo Regionale di Como *
- * *
- * This program is free software under the *
- * GNU General Public License (>=v2). *
- * Read the file COPYING that comes with GRASS *
- * for details. *
- * *
- ********************************************************************/
+ *
+ * MODULE: v.lidar.correction
+ *
+ * AUTHOR(S): Roberto Antolin & Gonzalo Moreno
+ * general update Markus Metz
+ *
+ * PURPOSE: Correction of the v.growing output
+ *
+ * COPYRIGHT: (C) 2005 by Politecnico di Milano -
+ * Polo Regionale di Como
+ *
+ * This program is free software under the
+ * GNU General Public License (>=v2).
+ * Read the file COPYING that comes with GRASS
+ * for details.
+ *
+ **********************************************************************/
- /*INCLUDES*/
+/* INCLUDES */
#include <stdlib.h>
#include <string.h>
#include <math.h>
@@ -28,14 +28,14 @@
int main(int argc, char *argv[])
{
/* Declarations */
- int dim_vect, nparameters, BW, npoints, nrows, ncols;
+ int dim_vect, nparameters, BW, npoints;
int nsply, nsplx, nsplx_adj, nsply_adj;
int nsubregion_col, nsubregion_row;
int subregion = 0, nsubregions = 0;
const char *dvr, *db, *mapset;
char table_name[GNAME_MAX];
char xname[GNAME_MAX], xmapset[GMAPSET_MAX];
- double lambda, ew_resol, ns_resol, mean, stepN, stepE, HighThresh,
+ double lambda, mean, stepN, stepE, HighThresh,
LowThresh;
double N_extension, E_extension, edgeE, edgeN;
@@ -68,7 +68,7 @@
G_add_keyword(_("vector"));
G_add_keyword(_("LIDAR"));
module->description =
- _("Correction of the v.lidar.growing output. It is the last of the three algorithms for LIDAR filtering.");
+ _("Corrects the v.lidar.growing output. It is the last of the three algorithms for LIDAR filtering.");
spline_step_flag = G_define_flag();
spline_step_flag->key = 'e';
@@ -93,20 +93,22 @@
_("Only 'terrain' points output vector map");
stepE_opt = G_define_option();
- stepE_opt->key = "sce";
+ stepE_opt->key = "ew_step";
stepE_opt->type = TYPE_DOUBLE;
stepE_opt->required = NO;
stepE_opt->answer = "25";
stepE_opt->description =
- _("Interpolation spline step value in east direction");
+ _("Length of each spline step in the east-west direction");
+ stepE_opt->guisection = _("Settings");
stepN_opt = G_define_option();
- stepN_opt->key = "scn";
+ stepN_opt->key = "ns_step";
stepN_opt->type = TYPE_DOUBLE;
stepN_opt->required = NO;
stepN_opt->answer = "25";
stepN_opt->description =
- _("Interpolation spline step value in north direction");
+ _("Length of each spline step in the north-south direction");
+ stepN_opt->guisection = _("Settings");
lambda_f_opt = G_define_option();
lambda_f_opt->key = "lambda_c";
@@ -248,12 +250,6 @@
Vect_region_box(&elaboration_reg, &overlap_box);
Vect_region_box(&elaboration_reg, &general_box);
- nrows = Rast_window_rows();
- ncols = Rast_window_cols();
-
- ew_resol = original_reg.ew_res;
- ns_resol = original_reg.ns_res;
-
/*------------------------------------------------------------------
| Subdividing and working with tiles:
| Each original region will be divided into several subregions.
Modified: grass/trunk/vector/v.lidar.correction/v.lidar.correction.html
===================================================================
--- grass/trunk/vector/v.lidar.correction/v.lidar.correction.html 2015-01-12 12:36:33 UTC (rev 64082)
+++ grass/trunk/vector/v.lidar.correction/v.lidar.correction.html 2015-01-12 13:36:28 UTC (rev 64083)
@@ -34,9 +34,9 @@
OBJECT DOUBLE PULSE; and an vector map with only the points classified as
TERRAIN SINGLE PULSE or TERRAIN DOUBLE PULSE.
-The final result of the whole procedure (v.lidar.edgedetection,
-v.lidar.growing, v.lidar.correction) will be a point classification in
-four categories:
+The final result of the whole procedure (<em>v.lidar.edgedetection</em>,
+<em>v.lidar.growing</em>, <em>v.lidar.correction</em>) will be a point
+classification in four categories:
<br>
<br>
TERRAIN SINGLE PULSE (cat = 1, layer = 2)
@@ -60,12 +60,18 @@
v.lidar.correction input=correction output=correction_bis out_terrain=only_terrain_bis
</pre></div>
+
<h2>SEE ALSO</h2>
-<em><a href="v.lidar.edgedetection.html">v.lidar.edgedetection</a></em>,
-<em><a href="v.lidar.growing.html">v.lidar.growing</a></em>,
-<em><a href="v.surf.bspline.html">v.surf.bspline</a></em>
+<em>
+<a href="v.lidar.edgedetection.html">v.lidar.edgedetection</a>,
+<a href="v.lidar.growing.html">v.lidar.growing</a>,
+<a href="v.surf.bspline.html">v.surf.bspline</a>
+</em>
+
+
<h2>AUTHORS</h2>
+
Original version of program in GRASS 5.4:
<br>
Maria Antonia Brovelli, Massimiliano Cannata, Ulisse Longoni and Mirko Reguzzoni
@@ -92,7 +98,7 @@
<br>
<br>
Brovelli M. A. and Longoni U.M., 2003. Software per il filtraggio di dati
-LIDAR, Rivista dell?Agenzia del Territorio, n. 3-2003, pp. 11-22 (ISSN 1593-2192).
+LIDAR, Rivista dell'Agenzia del Territorio, n. 3-2003, pp. 11-22 (ISSN 1593-2192).
<br>
<br>
Brovelli M. A., Cannata M. and Longoni U.M., 2002. DTM LIDAR in area urbana,
Modified: grass/trunk/vector/v.lidar.edgedetection/main.c
===================================================================
--- grass/trunk/vector/v.lidar.edgedetection/main.c 2015-01-12 12:36:33 UTC (rev 64082)
+++ grass/trunk/vector/v.lidar.edgedetection/main.c 2015-01-12 13:36:28 UTC (rev 64083)
@@ -1,8 +1,8 @@
/**************************************************************
- *
- * MODULE: v.lidar.edgedetection
- *
+ *
+ * MODULE: v.lidar.edgedetection
+ *
* AUTHOR(S): Original version in GRASS 5.4 (s.edgedetection):
* Maria Antonia Brovelli, Massimiliano Cannata,
* Ulisse Longoni and Mirko Reguzzoni
@@ -12,17 +12,17 @@
*
* PURPOSE: Detection of object's edges on a LIDAR data set
*
- * COPYRIGHT: (C) 2006 by Politecnico di Milano -
- * Polo Regionale di Como
- *
- * This program is free software under the
- * GNU General Public License (>=v2).
- * Read the file COPYING that comes with GRASS
- * for details.
- *
- **************************************************************/
+ * COPYRIGHT: (C) 2006 by Politecnico di Milano -
+ * Polo Regionale di Como
+ *
+ * This program is free software under the
+ * GNU General Public License (>=v2).
+ * Read the file COPYING that comes with GRASS
+ * for details.
+ *
+ **********************************************************************/
- /*INCLUDES*/
+/* INCLUDES */
#include <stdlib.h>
#include <string.h>
#include <math.h>
@@ -86,21 +86,21 @@
out_opt = G_define_standard_option(G_OPT_V_OUTPUT);
stepE_opt = G_define_option();
- stepE_opt->key = "see";
+ stepE_opt->key = "ew_step";
stepE_opt->type = TYPE_DOUBLE;
stepE_opt->required = NO;
stepE_opt->answer = "4";
stepE_opt->description =
- _("Interpolation spline step value in east direction");
+ _("Length of each spline step in the east-west direction");
stepE_opt->guisection = _("Settings");
stepN_opt = G_define_option();
- stepN_opt->key = "sen";
+ stepN_opt->key = "ns_step";
stepN_opt->type = TYPE_DOUBLE;
stepN_opt->required = NO;
stepN_opt->answer = "4";
stepN_opt->description =
- _("Interpolation spline step value in north direction");
+ _("Length of each spline step in the north-south direction");
stepN_opt->guisection = _("Settings");
lambdaB_opt = G_define_option();
Modified: grass/trunk/vector/v.lidar.edgedetection/v.lidar.edgedetection.html
===================================================================
--- grass/trunk/vector/v.lidar.edgedetection/v.lidar.edgedetection.html 2015-01-12 12:36:33 UTC (rev 64082)
+++ grass/trunk/vector/v.lidar.edgedetection/v.lidar.edgedetection.html 2015-01-12 13:36:28 UTC (rev 64083)
@@ -65,11 +65,12 @@
<h3>Basic edge detection</h3>
<div class="code"><pre>
-v.lidar.edgedetection input=vector_last output=edge see=8 sen=8 lambda_g=0.5
+v.lidar.edgedetection input=vector_last output=edge ew_step=8 ns_step=8 lambda_g=0.5
</pre></div>
<h2>SEE ALSO</h2>
+
<em>
<a href="v.lidar.growing.html">v.lidar.growing</a>,
<a href="v.lidar.correction.html">v.lidar.correction</a>,
@@ -105,7 +106,7 @@
<br>
<br>
Brovelli M. A. and Longoni U.M., 2003. Software per il filtraggio di dati
-LIDAR, Rivista dell?Agenzia del Territorio, n. 3-2003, pp. 11-22 (ISSN 1593-2192).
+LIDAR, Rivista dell'Agenzia del Territorio, n. 3-2003, pp. 11-22 (ISSN 1593-2192).
<br>
<br>
Brovelli M. A., Cannata M. and Longoni U.M., 2002. DTM LIDAR in area urbana,
More information about the grass-commit
mailing list