[GRASS-SVN] r62662 - in grass/branches/releasebranch_7_0: . raster/r.shaded.relief

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-11-08 06:23:32 -0800 (Sat, 08 Nov 2014)
New Revision: 62662

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/raster/r.shaded.relief/main.c
Log:
r.shaded.relief: remove non-standard output handling (default answer)
                 more guisections
                 (merge r62628 from trunk)



Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:61096,62179-62180,62182,62403,62422,62424,62437,62466,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62570,62573,62575,62585,62588,62597,62603,62606,62609,62614,62618,62632,62642,62649,62652,62655-62657
   + /grass/trunk:61096,62179-62180,62182,62403,62422,62424,62437,62466,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62570,62573,62575,62585,62588,62597,62603,62606,62609,62614,62618,62628,62632,62642,62649,62652,62655-62657

Modified: grass/branches/releasebranch_7_0/raster/r.shaded.relief/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.shaded.relief/main.c	2014-11-08 14:17:18 UTC (rev 62661)
+++ grass/branches/releasebranch_7_0/raster/r.shaded.relief/main.c	2014-11-08 14:23:32 UTC (rev 62662)
@@ -112,9 +112,7 @@
     parm.elevation = G_define_standard_option(G_OPT_R_INPUT);
 
     parm.relief = G_define_standard_option(G_OPT_R_OUTPUT);
-    parm.relief->required = NO;
     parm.relief->label = _("Name for output shaded relief map");
-    parm.relief->description = _("Default: <input_map>.shade");
 
     parm.altitude = G_define_option();
     parm.altitude->key = "altitude";
@@ -123,6 +121,7 @@
     parm.altitude->answer = "30";
     parm.altitude->options = "0-90";
     parm.altitude->description = _("Altitude of the sun in degrees above the horizon");
+    parm.altitude->guisection = _("Sun position");
 
     parm.azimuth = G_define_option();
     parm.azimuth->key = "azimuth";
@@ -132,6 +131,7 @@
     parm.azimuth->options = "0-360";
     parm.azimuth->description =
 	_("Azimuth of the sun in degrees to the east of north");
+    parm.azimuth->guisection = _("Sun position");
 
     parm.zmult = G_define_option();
     parm.zmult->key = "zmult";