[GRASS-SVN] r62950 - in grass/branches/releasebranch_7_0: . display/d.vect.chart

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-11-25 07:16:35 -0800 (Tue, 25 Nov 2014)
New Revision: 62950

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/display/d.vect.chart/main.c
Log:
d.vect.chart: use standardized options (#2409)
              (merge r62949 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,62942,62944-62946
   + /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,62944-62946,62949

Modified: grass/branches/releasebranch_7_0/display/d.vect.chart/main.c
===================================================================
--- grass/branches/releasebranch_7_0/display/d.vect.chart/main.c	2014-11-25 15:15:36 UTC (rev 62949)
+++ grass/branches/releasebranch_7_0/display/d.vect.chart/main.c	2014-11-25 15:16:35 UTC (rev 62950)
@@ -77,7 +77,7 @@
     field_opt->guisection = _("Selection");
 
     ctype_opt = G_define_option();
-    ctype_opt->key = "ctype";
+    ctype_opt->key = "chart_type";
     ctype_opt->type = TYPE_STRING;
     ctype_opt->required = NO;
     ctype_opt->multiple = NO;
@@ -90,9 +90,8 @@
     columns_opt->required = YES;
     columns_opt->description = _("Attribute columns containing data");
 
-    sizecol_opt = G_define_option();
-    sizecol_opt->key = "sizecol";
-    sizecol_opt->type = TYPE_STRING;
+    sizecol_opt = G_define_standard_option(G_OPT_DB_COLUMN);
+    sizecol_opt->key = "size_column";
     sizecol_opt->required = NO;
     sizecol_opt->description = _("Column used for pie chart size");
     sizecol_opt->guisection = _("Chart properties");
@@ -112,20 +111,15 @@
     scale_opt->description = _("Scale for size (to get size in pixels)");
     scale_opt->guisection = _("Chart properties");
 
-    ocolor_opt = G_define_option();
-    ocolor_opt->key = "ocolor";
-    ocolor_opt->type = TYPE_STRING;
-    ocolor_opt->answer = DEFAULT_FG_COLOR;
-    ocolor_opt->description = _("Outline color");
-    ocolor_opt->gisprompt = "old_color,color,color";
+    ocolor_opt = G_define_standard_option(G_OPT_C_FG);
+    ocolor_opt->key = "outline_color";
+    ocolor_opt->label = _("Outline color");
     ocolor_opt->guisection = _("Chart properties");
 
-    colors_opt = G_define_option();
+    colors_opt = G_define_standard_option(G_OPT_C_FG);
     colors_opt->key = "colors";
-    colors_opt->type = TYPE_STRING;
-    colors_opt->required = NO;
     colors_opt->multiple = YES;
-    colors_opt->description = _("Colors used to fill charts");
+    colors_opt->label = _("Colors used to fill charts");
     colors_opt->gisprompt = "old_color,color,color";
     colors_opt->guisection = _("Chart properties");