r.sunmask: description cosmetics

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@41706 15284696-431f-4ddb-bdfa-cd5b030d7da7

raster/r.sunmask/main.c

@@ -124,35 +124,22 @@ int main(int argc, char *argv[])
 
     module = G_define_module();
     G_add_keyword(_("raster"));
-    module->description =
-	_("Calculates cast shadow areas from sun position and DEM. Either "
-	  "A: exact sun position is specified, or B: date/time to calculate "
+    module->label = _("Calculates cast shadow areas from sun position and elevation raster map.");
+    module->description = _("Either exact sun position is specified, or date/time to calculate "
 	  "the sun position by r.sunmask itself.");
+    
+    parm.opt1 = G_define_standard_option(G_OPT_R_ELEV);
 
-    parm.opt1 = G_define_option();
-    parm.opt1->key = "elev";
-    parm.opt1->type = TYPE_STRING;
-    parm.opt1->required = YES;
-    parm.opt1->multiple = NO;
-    parm.opt1->gisprompt = "old,cell,raster";
-    parm.opt1->description = _("Name of elevation raster map");
-
-    parm.opt2 = G_define_option();
-    parm.opt2->key = "output";
-    parm.opt2->type = TYPE_STRING;
-    parm.opt2->required = YES;
-    parm.opt2->multiple = NO;
-    parm.opt2->gisprompt = "new,cell,raster";
-    parm.opt2->description = _("Output raster map having shadows");
-
+    parm.opt2 = G_define_standard_option(G_OPT_R_OUTPUT);
+    
     parm.opt3 = G_define_option();
     parm.opt3->key = "altitude";
     parm.opt3->type = TYPE_DOUBLE;
     parm.opt3->required = NO;
     parm.opt3->options = "0-89.999";
     parm.opt3->description =
-	_("A: altitude of the sun above horizon, degrees");
-    parm.opt3->guisection = _("By_position");
+	_("Altitude of the sun above horizon, degrees");
+    parm.opt3->guisection = _("Position");
 
     parm.opt4 = G_define_option();
     parm.opt4->key = "azimuth";
@@ -160,83 +147,89 @@ int main(int argc, char *argv[])
     parm.opt4->required = NO;
     parm.opt4->options = "0-360";
     parm.opt4->description =
-	_("A: azimuth of the sun from the north, degrees");
-    parm.opt4->guisection = _("By_position");
+	_("Azimuth of the sun from the north, degrees");
+    parm.opt4->guisection = _("Position");
 
     parm.year = G_define_option();
     parm.year->key = "year";
     parm.year->type = TYPE_INTEGER;
     parm.year->required = NO;
-    parm.year->description = _("B: year (1950..2050)");
-    parm.year->guisection = _("By_time");
+    parm.year->description = _("Year");
+    parm.year->options = "1950-2050";
+    parm.year->guisection = _("Time");
 
     parm.month = G_define_option();
     parm.month->key = "month";
     parm.month->type = TYPE_INTEGER;
     parm.month->required = NO;
-    parm.month->description = _("B: month (0..12)");
-    parm.month->guisection = _("By_time");
+    parm.month->description = _("Month");
+    parm.month->options = "0-12";
+    parm.month->guisection = _("Time");
 
     parm.day = G_define_option();
     parm.day->key = "day";
     parm.day->type = TYPE_INTEGER;
     parm.day->required = NO;
-    parm.day->description = _("B: day (0..31)");
-    parm.day->guisection = _("By_time");
+    parm.day->description = _("Day");
+    parm.day->options = "0-31";
+    parm.day->guisection = _("Time");
 
     parm.hour = G_define_option();
     parm.hour->key = "hour";
     parm.hour->type = TYPE_INTEGER;
     parm.hour->required = NO;
-    parm.hour->description = _("B: hour (0..24)");
-    parm.hour->guisection = _("By_time");
+    parm.hour->description = _("Hour");
+    parm.hour->options = "0-24";
+    parm.hour->guisection = _("Time");
 
     parm.minutes = G_define_option();
     parm.minutes->key = "minute";
     parm.minutes->type = TYPE_INTEGER;
     parm.minutes->required = NO;
-    parm.minutes->description = _("B: minutes (0..60)");
-    parm.minutes->guisection = _("By_time");
+    parm.minutes->description = _("Minutes");
+    parm.minutes->options = "0-60";
+    parm.minutes->guisection = _("Time");
 
     parm.seconds = G_define_option();
     parm.seconds->key = "second";
     parm.seconds->type = TYPE_INTEGER;
     parm.seconds->required = NO;
-    parm.seconds->description = _("B: seconds (0..60)");
-    parm.seconds->guisection = _("By_time");
+    parm.seconds->description = _("Seconds");
+    parm.seconds->options = "0-60";
+    parm.seconds->guisection = _("Time");
 
     parm.timezone = G_define_option();
     parm.timezone->key = "timezone";
     parm.timezone->type = TYPE_INTEGER;
     parm.timezone->required = NO;
-    parm.timezone->description =
-	_("B: timezone (east positive, offset from GMT, also use to adjust daylight savings)");
-    parm.timezone->guisection = _("By_time");
+    parm.timezone->label =
+	_("Timezone");
+    parm.timezone->description = _("East positive, offset from GMT, also use to adjust daylight savings");
+    parm.timezone->guisection = _("Time");
 
     parm.east = G_define_option();
     parm.east->key = "east";
     parm.east->key_desc = "value";
     parm.east->type = TYPE_STRING;
     parm.east->required = NO;
-    parm.east->description =
-	_("East coordinate (point of interest, default: map center)");
+    parm.east->label =
+	_("Easting coordinate (point of interest)");
+    parm.east->description = _("Default: map center");
+    parm.east->guisection = _("Position");
 
     parm.north = G_define_option();
     parm.north->key = "north";
     parm.north->key_desc = "value";
     parm.north->type = TYPE_STRING;
     parm.north->required = NO;
-    parm.north->description =
-	_("North coordinate (point of interest, default: map center)");
+    parm.north->label =
+	_("Northing coordinate (point of interest)");
+    parm.north->description = _("Default: map center");
+    parm.north->guisection = _("Position");
 
     flag1 = G_define_flag();
     flag1->key = 'z';
-    flag1->description = _("Zero is a real elevation");
-
-    flag2 = G_define_flag();
-    flag2->key = 'v';
-    flag2->description =
-	_("Verbose output (also print out sun position etc.)");
+    flag1->description = _("Don't ignore zero elevation");
 
     flag3 = G_define_flag();
     flag3->key = 's';