[GRASS-SVN] r63983 - in grass/trunk: display/d.vect.thematic lib/gis

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-01-07 02:52:01 -0800 (Wed, 07 Jan 2015)
New Revision: 63983

Modified:
   grass/trunk/display/d.vect.thematic/main.c
   grass/trunk/lib/gis/renamed_options
Log:
d.vect.thematic: rename nbclasses to nclasses (#2409)


Modified: grass/trunk/display/d.vect.thematic/main.c
===================================================================
--- grass/trunk/display/d.vect.thematic/main.c	2015-01-07 10:48:05 UTC (rev 63982)
+++ grass/trunk/display/d.vect.thematic/main.c	2015-01-07 10:52:01 UTC (rev 63983)
@@ -84,6 +84,11 @@
 
     map_opt = G_define_standard_option(G_OPT_V_MAP);
 
+    field_opt = G_define_standard_option(G_OPT_V_FIELD);
+    field_opt->description =
+	_("Layer number. If -1, all layers are displayed.");
+    field_opt->guisection = _("Selection");
+
     column_opt = G_define_standard_option(G_OPT_DB_COLUMN);
     column_opt->required = YES;
     column_opt->description =
@@ -116,7 +121,7 @@
     algo_opt->guisection = _("Classes");
 
     nbclass_opt = G_define_option();
-    nbclass_opt->key = "nbclasses";
+    nbclass_opt->key = "nclasses";
     nbclass_opt->type = TYPE_INTEGER;
     nbclass_opt->required = NO;
     nbclass_opt->multiple = NO;
@@ -131,11 +136,6 @@
     colors_opt->description = _("Colors (one per class)");
     colors_opt->gisprompt = "old_color,color,color";
 
-    field_opt = G_define_standard_option(G_OPT_V_FIELD);
-    field_opt->description =
-	_("Layer number. If -1, all layers are displayed.");
-    field_opt->guisection = _("Selection");
-
     where_opt = G_define_standard_option(G_OPT_DB_WHERE);
     where_opt->guisection = _("Selection");
 

Modified: grass/trunk/lib/gis/renamed_options
===================================================================
--- grass/trunk/lib/gis/renamed_options	2015-01-07 10:48:05 UTC (rev 63982)
+++ grass/trunk/lib/gis/renamed_options	2015-01-07 10:52:01 UTC (rev 63983)
@@ -69,6 +69,78 @@
 # d.vect.thematic
 d.vect.thematic|bcolor:boundary_color
 d.vect.thematic|bwidth:boundary_width
+### Renamed options in GRASS 7.0
+################################
+### Global
+#########################
+fs:separator
+nv:null_value
+dt:dtime
+dp:precision
+##########################
+### Display module changes
+##########################
+# d.barscale
+d.barscale|background_color:bgcolor
+# d.correlate
+d.correlate|layers:map
+# d.erase
+d.erase|background:bgcolor
+# d.legend
+d.legend|map:rast
+# d.his
+d.his|h_map:hue
+d.his|i_map:intensity
+d.his|s_map:saturation
+# d.rast
+d.rast|catlist:values
+d.rast|vallist:values
+# d.rast.leg
+d.rast.leg|rast:raster
+# d.vect
+d.vect|wcolumn:width_column
+d.vect|wscale:width_scale
+d.vect|rot_column:rotation_column
+d.vect|attrcolumn:attribute_column
+# d.colortable
+d.colortable|cols:columns
+# d.geodesic
+d.geodesic|lcolor:line_color
+d.geodesic|tcolor:text_color
+# d.grid
+d.grid|bordercolor:border_color
+d.grid|textcolor:text_color
+# d.path
+d.path|hcolor:highlight_color
+d.path|type:arc_type
+d.path|alayer:arc_layer
+d.path|nlayer:node_layer
+d.path|afcolumn:arc_column
+d.path|abcolumn:arc_backward_column
+d.path|ncolumn:node_column
+# d.polar
+d.polar|eps:output
+# d.profile
+d.profile|input:map
+d.profile|profile:coordinates
+# d.rast.arrow
+d.rast.arrow|arrow_color:color
+d.rast.arrow|x_color:null_color
+# d.rhumbline
+d.rhumbline|coord:coordinates
+d.rhumbline|lcolor:line_color
+d.rhumbline|tcolor:text_color
+# d.vect
+d.vect|fcolor:fill_color
+d.vect|llayer:label_layer
+d.vect|lcolor:label_color
+d.vect|bgcolor:label_bgcolor
+d.vect|bcolor:label_boundary_color
+d.vect|lsize:label_size
+# d.vect.thematic
+d.vect.thematic|bcolor:boundary_color
+d.vect.thematic|bwidth:boundary_width
+d.vect.thematic|nbclasses:nclasses
 # d.vect.chart
 d.vect.chart|ctype:chart_type
 d.vect.chart|ocolor:outline_color