[GRASS-SVN] r64084 - in grass/branches/releasebranch_7_0: . vector/v.lidar.correction vector/v.lidar.edgedetection
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Jan 12 05:37:13 PST 2015
Author: neteler
Date: 2015-01-12 05:37:13 -0800 (Mon, 12 Jan 2015)
New Revision: 64084
Modified:
grass/branches/releasebranch_7_0/
grass/branches/releasebranch_7_0/vector/v.lidar.correction/main.c
grass/branches/releasebranch_7_0/vector/v.lidar.correction/v.lidar.correction.html
grass/branches/releasebranch_7_0/vector/v.lidar.edgedetection/main.c
grass/branches/releasebranch_7_0/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 (trunk, r64083)
Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
- /grass/trunk:59626,59671,60054,60497,60563-60566,60670,60817,60922,60976,61046,61096,61141,61994,62026,62036,62085,62105,62179-62180,62182,62190,62403,62422,62424,62428-62429,62437,62466,62469,62484,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750-62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62828,62831,62838,62845,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,
63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63275-63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63361-63363,63367,63369,63379,63389,63391,63393,63402,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63461,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63528,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63604,63608-63610,63616,63618,63624,63626,63628,63630,63634,63639,63642,63644,63650,63652
,63656,63679,63685,63689,63691,63693,63695,63698,63700-63702,63704,63706-63707,63709,63711,63713,63715,63717-63718,63721-63727,63731,63733,63736,63740-63742,63744-63749,63751-63752,63756,63758,63760-63761,63767,63777,63780,63783,63787,63793,63796-63798,63801,63803,63807-63808,63812,63814,63816,63821,63823-63824,63827-63828,63830-63831,63834-63835,63837-63839,63841,63843-63844,63846-63847,63849,63851,63853,63855-63856,63858-63859,63862,63865,63869,63871,63882,63884,63889-63890,63892-63895,63897-63898,63900,63902-63903,63905,63907,63909-63911,63913-63914,63927,63930-63931,63940-63941,63945,63954-63955,63960,63965,63967,63976-63983,63995,64026,64030,64040,64056,64062
+ /grass/trunk:59626,59671,60054,60497,60563-60566,60670,60817,60922,60976,61046,61096,61141,61994,62026,62036,62085,62105,62179-62180,62182,62190,62403,62422,62424,62428-62429,62437,62466,62469,62484,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750-62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62828,62831,62838,62845,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,
63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63275-63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63361-63363,63367,63369,63379,63389,63391,63393,63402,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63461,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63528,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63604,63608-63610,63616,63618,63624,63626,63628,63630,63634,63639,63642,63644,63650,63652
,63656,63679,63685,63689,63691,63693,63695,63698,63700-63702,63704,63706-63707,63709,63711,63713,63715,63717-63718,63721-63727,63731,63733,63736,63740-63742,63744-63749,63751-63752,63756,63758,63760-63761,63767,63777,63780,63783,63787,63793,63796-63798,63801,63803,63807-63808,63812,63814,63816,63821,63823-63824,63827-63828,63830-63831,63834-63835,63837-63839,63841,63843-63844,63846-63847,63849,63851,63853,63855-63856,63858-63859,63862,63865,63869,63871,63882,63884,63889-63890,63892-63895,63897-63898,63900,63902-63903,63905,63907,63909-63911,63913-63914,63927,63930-63931,63940-63941,63945,63954-63955,63960,63965,63967,63976-63983,63995,64026,64030,64040,64056,64062,64083
Modified: grass/branches/releasebranch_7_0/vector/v.lidar.correction/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.lidar.correction/main.c 2015-01-12 13:36:28 UTC (rev 64083)
+++ grass/branches/releasebranch_7_0/vector/v.lidar.correction/main.c 2015-01-12 13:37:13 UTC (rev 64084)
@@ -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/branches/releasebranch_7_0/vector/v.lidar.correction/v.lidar.correction.html
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.lidar.correction/v.lidar.correction.html 2015-01-12 13:36:28 UTC (rev 64083)
+++ grass/branches/releasebranch_7_0/vector/v.lidar.correction/v.lidar.correction.html 2015-01-12 13:37:13 UTC (rev 64084)
@@ -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/branches/releasebranch_7_0/vector/v.lidar.edgedetection/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.lidar.edgedetection/main.c 2015-01-12 13:36:28 UTC (rev 64083)
+++ grass/branches/releasebranch_7_0/vector/v.lidar.edgedetection/main.c 2015-01-12 13:37:13 UTC (rev 64084)
@@ -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/branches/releasebranch_7_0/vector/v.lidar.edgedetection/v.lidar.edgedetection.html
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.lidar.edgedetection/v.lidar.edgedetection.html 2015-01-12 13:36:28 UTC (rev 64083)
+++ grass/branches/releasebranch_7_0/vector/v.lidar.edgedetection/v.lidar.edgedetection.html 2015-01-12 13:37:13 UTC (rev 64084)
@@ -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