[GRASS-SVN] r70520 - grass/trunk/display/d.vect

[svn_grass at osgeo.org]

Author: martinl
Date: 2017-02-10 01:09:00 -0800 (Fri, 10 Feb 2017)
New Revision: 70520

Modified:
   grass/trunk/display/d.vect/main.c
   grass/trunk/display/d.vect/shape.c
Log:
d.vect: zcolor, rgb_column, and -c mutually exclusive


Modified: grass/trunk/display/d.vect/main.c
===================================================================
--- grass/trunk/display/d.vect/main.c	2017-02-09 20:27:06 UTC (rev 70519)
+++ grass/trunk/display/d.vect/main.c	2017-02-10 09:09:00 UTC (rev 70520)
@@ -329,6 +329,8 @@
     legend_flag->label = _("Do not show this layer in vector legend");
     legend_flag->guisection = _("Legend");
 
+    G_option_exclusive(zcol_opt, rgbcol_opt, cats_acolors_flag, NULL);
+    
     /* Check command line */
     if (G_parser(argc, argv))
 	exit(EXIT_FAILURE);

Modified: grass/trunk/display/d.vect/shape.c
===================================================================
--- grass/trunk/display/d.vect/shape.c	2017-02-09 20:27:06 UTC (rev 70519)
+++ grass/trunk/display/d.vect/shape.c	2017-02-10 09:09:00 UTC (rev 70520)
@@ -183,8 +183,7 @@
 	    z_style = NULL;
 	}
         else if (rgb_column) {
-            G_warning(_("%s= and %s= are mutually exclusive. "
-                        "%s= will be ignored."), "zcolor", "rgb_column", "zcolor");
+            /* this should not happend, zcolor and rgb_columns are mutually exclusive */
 	    z_style = NULL;
         }
 	else {