[GRASS-SVN] r62943 - in grass/branches/releasebranch_7_0: . display/d.thematic.area

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-11-25 06:56:06 -0800 (Tue, 25 Nov 2014)
New Revision: 62943

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/display/d.thematic.area/main.c
Log:
d.thematic.area: use standardized options (#2409)
                 (merge r62942 from trunk)



Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:60817,61096,61141,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,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,62831,62838,62847,62856,62879,62881,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940
   + /grass/trunk:60817,61096,61141,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,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,62831,62838,62847,62856,62879,62881,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942

Modified: grass/branches/releasebranch_7_0/display/d.thematic.area/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.thematic.area/main.c	2014-11-25 14:54:55 UTC (rev 62942)
+++ grass/branches/releasebranch_7_0/display/d.thematic.area/main.c	2014-11-25 14:56:06 UTC (rev 62943)
@@ -83,12 +83,10 @@
 
     map_opt = G_define_standard_option(G_OPT_V_MAP);
 
-    column_opt = G_define_option();
-    column_opt->key = "column";
-    column_opt->type = TYPE_STRING;
+    column_opt = G_define_standard_option(G_OPT_DB_COLUMN);
     column_opt->required = YES;
     column_opt->description =
-	_("Data to be classified: column name or expression");
+	_("Name of attribute column to be classified");
 
     breaks_opt = G_define_option();
     breaks_opt->key = "breaks";
@@ -126,7 +124,7 @@
     colors_opt->type = TYPE_STRING;
     colors_opt->required = YES;
     colors_opt->multiple = YES;
-    colors_opt->description = _("Colors (one per class).");
+    colors_opt->description = _("Colors (one per class)");
     colors_opt->gisprompt = "old_color,color,color";
 
     field_opt = G_define_standard_option(G_OPT_V_FIELD);
@@ -138,19 +136,16 @@
     where_opt->guisection = _("Selection");
 
     bwidth_opt = G_define_option();
-    bwidth_opt->key = "bwidth";
+    bwidth_opt->key = "boundary_width";
     bwidth_opt->type = TYPE_INTEGER;
     bwidth_opt->answer = "0";
     bwidth_opt->guisection = _("Boundaries");
     bwidth_opt->description = _("Boundary width");
 
-    bcolor_opt = G_define_option();
-    bcolor_opt->key = "bcolor";
-    bcolor_opt->type = TYPE_STRING;
-    bcolor_opt->answer = DEFAULT_FG_COLOR;
-    bcolor_opt->description = _("Boundary color");
+    bcolor_opt = G_define_standard_option(G_OPT_C_FG);
+    bcolor_opt->key = "boundary_color";
+    bcolor_opt->label = _("Boundary color");
     bcolor_opt->guisection = _("Boundaries");
-    bcolor_opt->gisprompt = "old_color,color,color";
 
     legend_file_opt = G_define_standard_option(G_OPT_F_OUTPUT);
     legend_file_opt->key = "legendfile";