[GRASS-SVN] r64063 - in grass/branches/releasebranch_7_0: . lib/gis vector/v.qcount

svn_grass at osgeo.org svn_grass at osgeo.org
Sun Jan 11 10:56:19 PST 2015


Author: neteler
Date: 2015-01-11 10:56:19 -0800 (Sun, 11 Jan 2015)
New Revision: 64063

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/lib/gis/renamed_options
   grass/branches/releasebranch_7_0/vector/v.qcount/main.c
Log:
renamed_options: missing modules updated; typos fixed; alphabetical order for easier human lookup for GRASS GIS 6 users and https://github.com/qgis/QGIS/tree/master/python/plugins/processing/algs/grass7 (trac #2409) (trunk, r64062)


Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:59626,59671,60497,60563-60566,60817,60922,60976,61046,61096,61141,61994,62085,62105,62179-62180,62182,62190,62403,62422,62424,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
   + /grass/trunk:59626,59671,60497,60563-60566,60817,60922,60976,61046,61096,61141,61994,62085,62105,62179-62180,62182,62190,62403,62422,62424,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

Modified: grass/branches/releasebranch_7_0/lib/gis/renamed_options
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/renamed_options	2015-01-11 18:55:22 UTC (rev 64062)
+++ grass/branches/releasebranch_7_0/lib/gis/renamed_options	2015-01-11 18:56:19 UTC (rev 64063)
@@ -194,6 +194,9 @@
 r.basins.fill|result:output
 # r.blend
 r.blend|output_prefix:output
+# r.carve
+r.carve|rast:raster
+r.carve|vect:vector
 # r.category
 r.category|vals:values
 # r.circle
@@ -230,8 +233,8 @@
 r.flow|aspin:aspect
 r.flow|barin:barrier
 r.flow|flout:flowline
-r.flow|lgout:flowpath
-r.flow|dsout:density
+r.flow|lgout:flowlength
+r.flow|dsout:flowaccumulation
 # r.his
 r.his|h_map:hue
 r.his|i_map:intensity
@@ -284,9 +287,13 @@
 r.profile|null:null_value
 # r.random
 r.random|raster_output:raster
+r.random|n:npoints
 r.random|vector_output:vector
 # r.reclass.area
 r.reclass.area|lesser,greater:value, mode
+# r.regression.line
+r.regression.line|map1:mapx
+r.regression.line|map2:mapy
 # r.report
 r.report|pl:page_length
 r.report|pw:page_width
@@ -303,69 +310,70 @@
 # r.rgb
 r.rgb:|output_prefix:output
 # r.sim.sediment
-r.sim.sediment|elevin:elevation
+r.sim.sediment|conc:sediment_concentration
+r.sim.sediment|detin:detachment_coeff
+r.sim.sediment|diffc:diffusion_coeff
 r.sim.sediment|dxin:dx
 r.sim.sediment|dyin:dy
-r.sim.sediment|wdepth:water_depth
-r.sim.sediment|detin:detachment_coeff
-r.sim.sediment|tranin:transport_coeff
-r.sim.sediment|tauin:shear_stress
+r.sim.sediment|elevin:elevation
+r.sim.sediment|erdep:erosion_deposition
+r.sim.sediment|et:tlimit_erosion_deposition
+r.sim.sediment|flux:sediment_flux
 r.sim.sediment|manin:man
-r.sim.sediment|flux:sediment_flux
 r.sim.sediment|maninval:man_value
-r.sim.sediment|outwalk:walkers_output
-r.sim.sediment|tc:transport_capacity
-r.sim.sediment|et:tlimit_erosion_deposition
-r.sim.sediment|conc:sediment_concentration
-r.sim.sediment|erdep:erosion_deposition
 r.sim.sediment|nwalk:nwalkers
 r.sim.sediment|niter:niterations
 r.sim.sediment|outiter:output_step
-r.sim.sediment|diffc:diffusion_coeff
+r.sim.sediment|outwalk:walkers_output
+r.sim.sediment|tauin:shear_stress
+r.sim.sediment|tc:transport_capacity
+r.sim.sediment|tranin:transport_coeff
+r.sim.sediment|wdepth:water_depth
 # r.sim.water
-r.sim.water|elevin:elevation
+r.sim.water|diffc:diffusion_coeff
+r.sim.water|disch:discharge
 r.sim.water|dxin:dx
 r.sim.water|dyin:dy
-r.sim.water|rain_val:rain_value
+r.sim.water|elevin:elevation
+r.sim.water|err:error
 r.sim.water|infil:infil
 r.sim.water|infil_val:infil_value
 r.sim.water|manin:man
 r.sim.water|manin_val:man_value
-r.sim.water|traps:flow_control
-r.sim.water|disch:discharge
-r.sim.water|err:error
-r.sim.water|outwalk:walkers_output
+r.sim.water|niter:niterations
 r.sim.water|nwalk:nwalkers
-r.sim.water|niter:niterations
 r.sim.water|outiter:output_step
-r.sim.water|diffc:diffusion_coeff
+r.sim.water|outwalk:walkers_output
+r.sim.water|rain_val:rain_value
+r.sim.water|traps:flow_control
 # r.slope.aspect
+r.slope.aspect|min_slp_allowed:min_slope
 r.slope.aspect|pcurv:pcurvature
+r.slope.aspect|prec:precision
 r.slope.aspect|tcurv:tcurvature
 r.slope.aspect|zfactor:zscale
-r.slope.aspect|min_slp_allowed:min_slope
 # r.spreadpath
 r.spreadpath|coordinate:coordinates
 # r.stream.extract
 r.stream.extract|stream_rast:stream_raster
 r.stream.extract|stream_vect:stream_vector
 # r.sun
-r.sun|elevin:elevation
+r.sun|alb:albedo_value
+r.sun|albin:albedo
 r.sun|aspin:aspect
-r.sun|slopein:slope
-r.sun|linkein:linke
-r.sun|lin:linke_value
-r.sun|albin:albedo
-r.sun|alb:albedo_value
-r.sun|latin:lat
-r.sun|longin:long
+r.sun|civiltime:civil_time
 r.sun|coefbh:coeff_bh
 r.sun|coefdh:coeff_dh
-r.sun|horizonstep:horizon_step
 r.sun|declin:declination
 r.sun|dist:distance_step
+r.sun|elevin:elevation
+r.sun|horizonstep:horizon_step
+r.sun|latin:lat
+r.sun|lin:linke_value
+r.sun|linkein:linke
+r.sun|longin:long
 r.sun|numpartitions:npartitions
-r.sun|civiltime:civil_time
+r.sun|slopein:slope
 # r.surf.area
 r.surf.area|input:map
 # r.terraflow
@@ -396,8 +404,8 @@
 r.watershed|disturbed.land:disturbed_land
 r.watershed|half.basin:half_basin
 r.watershed|length.slope:length_slope
+r.watershed|max.slope.length:max_slope_length
 r.watershed|slope.steepness:slope_steepness
-r.watershed|max.slope.length:max_slope_length
 # r.what
 r.what|east_north:coordinates
 # r.viewshed
@@ -440,16 +448,18 @@
 v.clean|thresh:threshold
 # v.colors
 v.colors|volume:raster_3d
-# v.drape
 # v.db.join
 v.db.join|otable:other_table
 v.db.join|ocolumn:other_column
 v.db.join|scolumns:subset_columns
 # v.db.select
-v.db.select|vs:vertical separator
+v.db.select|nv:null_value
+v.db.select|vs:vertical_separator
 # v.db.update
 v.db.update|qcolumn:query_column
 v.drape|rast:elevation
+# v.drape
+v.drape|rast:elevation
 # v.edit
 v.edit|measure:method
 v.edit|thresh:threshold
@@ -467,7 +477,9 @@
 v.in.ogr|cnames:columns
 # v.in.wfs
 v.in.wfs|wfs:url
-v.in.wfs|input:map
+# v.kcv
+v.kcv|input:map
+v.kcv|k:npartitions
 # v.label
 v.label|background:bgcolor
 v.label|hcolor:highlight_color
@@ -594,9 +606,12 @@
 # v.outlier
 v.outlier|soe:ew_step
 v.outlier|son:ns_step
+v.outlier|thres_o:threshold
 # v.qcount
-v.qcount|n:nquadrants
+v.qcount|n:nquadrats
 v.qcount|r:radius
+# v.random
+v.random|n:npoints
 # v.rast.stats
 v.rast.stats|colprefix:column_prefix
 v.rast.stats|input:map
@@ -609,6 +624,8 @@
 # v.surf.bspline
 v.surf.bspline|sie:ew_step
 v.surf.bspline|sin:ns_step
+v.surf.bspline|raster:raster_output
+v.surf.bspline|sparse:sparse_input
 # v.surf.rst
 v.surf.rst|devi:deviations
 v.surf.rst|elev:elevation

Modified: grass/branches/releasebranch_7_0/vector/v.qcount/main.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.qcount/main.c	2015-01-11 18:55:22 UTC (rev 64062)
+++ grass/branches/releasebranch_7_0/vector/v.qcount/main.c	2015-01-11 18:56:19 UTC (rev 64063)
@@ -69,7 +69,7 @@
     parm.output = G_define_standard_option(G_OPT_V_OUTPUT);
     parm.output->required = NO;
     parm.output->description =
-	_("Name for output quadrant centers map (number of points is written as category)");
+	_("Name for output quadrat centers map (number of points is written as category)");
 
     parm.n = G_define_option();
     parm.n->key = "nquadrats";



More information about the grass-commit mailing list