فهرست منبع

r.cost|r.walk: stream_rast -> stream_raster (https://trac.osgeo.org/grass/ticket/2409)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@63711 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 10 سال پیش
والد
کامیت
261c23609e
4فایلهای تغییر یافته به همراه7 افزوده شده و 5 حذف شده
  1. 2 0
      lib/gis/renamed_options
  2. 1 1
      raster/r.cost/main.c
  3. 3 3
      raster/r.cost/r.cost.html
  4. 1 1
      raster/r.walk/main.c

+ 2 - 0
lib/gis/renamed_options

@@ -178,6 +178,7 @@ r.colors|volume:raster_3d
 r.colors.stddev|input:map
 r.colors.stddev|input:map
 # r.cost
 # r.cost
 r.cost|coordinate:start_coordinates
 r.cost|coordinate:start_coordinates
+r.cost|start_rast:start_raster
 # r.distance
 # r.distance
 r.distance|maps:map
 r.distance|maps:map
 # r.drain
 # r.drain
@@ -302,6 +303,7 @@ r.topmodel|qobs:
 r.uslek|usle_k:output
 r.uslek|usle_k:output
 # r.walk
 # r.walk
 r.walk|coordinate:start_coordinates
 r.walk|coordinate:start_coordinates
+r.walk|start_rast:start_raster
 # r.water.outlet
 # r.water.outlet
 r.water.outlet|drainage:input
 r.water.outlet|drainage:input
 r.water.outlet|basin:output
 r.water.outlet|basin:output

+ 1 - 1
raster/r.cost/main.c

@@ -180,7 +180,7 @@ int main(int argc, char *argv[])
     opt8->guisection = _("Stop");
     opt8->guisection = _("Stop");
 
 
     opt9 = G_define_standard_option(G_OPT_R_INPUT);
     opt9 = G_define_standard_option(G_OPT_R_INPUT);
-    opt9->key = "start_rast";
+    opt9->key = "start_raster";
     opt9->required = NO;
     opt9->required = NO;
     opt9->description = _("Name of starting raster points map");
     opt9->description = _("Name of starting raster points map");
     opt9->guisection = _("Start");
     opt9->guisection = _("Start");

+ 3 - 3
raster/r.cost/r.cost.html

@@ -32,7 +32,7 @@ Each <em>x,y</em> <b>start_coordinates</b> pair gives the geographic location of
 point from which the transportation cost should be figured. As many points as
 point from which the transportation cost should be figured. As many points as
 desired can be entered by the user. These starting points can also be read
 desired can be entered by the user. These starting points can also be read
 from a vector points file through the <b>start_points</b> option or from a
 from a vector points file through the <b>start_points</b> option or from a
-raster map through the <b>start_rast</b> option.
+raster map through the <b>start_raster</b> option.
 <p>
 <p>
 <em>r.cost</em> will stop cumulating costs when either <b>max_cost</b> is reached,
 <em>r.cost</em> will stop cumulating costs when either <b>max_cost</b> is reached,
 or one of the stop points given with <b>stop_coordinates</b> is reached.
 or one of the stop points given with <b>stop_coordinates</b> is reached.
@@ -219,7 +219,7 @@ used. The calculation is done with <em>r.cost</em> as follows
 <div class="code"><pre>
 <div class="code"><pre>
   g.region raster=roads -p
   g.region raster=roads -p
   r.mapcalc "area.one = 1"
   r.mapcalc "area.one = 1"
-  r.cost -k input=area.one output=distance start_rast=roads
+  r.cost -k input=area.one output=distance start_raster=roads
   d.rast distance
   d.rast distance
   d.rast.num distance
   d.rast.num distance
 
 
@@ -251,7 +251,7 @@ cost map "costsurf" for given starting points (map "sources") and given
 cost raster map "costs":
 cost raster map "costs":
 
 
 <div class="code"><pre>
 <div class="code"><pre>
-r.cost input=costs start_rast=sources output=costsurf nearest=costalloc
+r.cost input=costs start_raster=sources output=costsurf nearest=costalloc
 </pre></div>
 </pre></div>
 
 
 
 

+ 1 - 1
raster/r.walk/main.c

@@ -215,7 +215,7 @@ int main(int argc, char *argv[])
     opt8->guisection = _("Stop");
     opt8->guisection = _("Stop");
 
 
     opt9 = G_define_standard_option(G_OPT_R_INPUT);
     opt9 = G_define_standard_option(G_OPT_R_INPUT);
-    opt9->key = "start_rast";
+    opt9->key = "start_raster";
     opt9->required = NO;
     opt9->required = NO;
     opt9->description = _("Name of starting raster points map");
     opt9->description = _("Name of starting raster points map");
     opt9->guisection = _("Start");
     opt9->guisection = _("Start");