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

[svn_grass at osgeo.org]

Author: annakrat
Date: 2016-08-14 19:04:01 -0700 (Sun, 14 Aug 2016)
New Revision: 69133

Modified:
   grass/trunk/display/d.vect/legend.c
   grass/trunk/display/d.vect/local_proto.h
   grass/trunk/display/d.vect/main.c
Log:
d.vect: if size_column is used, write -1 to legend; symbol_size will be then used for point legend, see #3125

Modified: grass/trunk/display/d.vect/legend.c
===================================================================
--- grass/trunk/display/d.vect/legend.c	2016-08-13 13:48:18 UTC (rev 69132)
+++ grass/trunk/display/d.vect/legend.c	2016-08-15 02:04:01 UTC (rev 69133)
@@ -4,7 +4,7 @@
 
 void write_into_legfile(struct Map_info *Map, int type, const char *leglab, const char *name_map, const char *icon,
                        const char *size, const char *color, const char *fcolor, const char *width, const char *icon_area,
-                       const char *icon_line)
+                       const char *icon_line, const char *size_column)
 {
     int nfeatures;
     FILE *fd;
@@ -14,6 +14,9 @@
     strcpy(map, name_map);
     strtok_r(map, "@", &ptr);
 
+    if (size_column)
+        size = "-1";
+
     /* Write into legend file */
     leg_file = getenv("GRASS_LEGEND_FILE");
     if (leg_file) {

Modified: grass/trunk/display/d.vect/local_proto.h
===================================================================
--- grass/trunk/display/d.vect/local_proto.h	2016-08-13 13:48:18 UTC (rev 69132)
+++ grass/trunk/display/d.vect/local_proto.h	2016-08-15 02:04:01 UTC (rev 69133)
@@ -69,4 +69,4 @@
 /* legend.c */
 void write_into_legfile(struct Map_info *, int, const char *, const char *,
 			const char *, const char *, const char *, const char *,
-			const char *, const char *, const char *);
+			const char *, const char *, const char *, const char *);

Modified: grass/trunk/display/d.vect/main.c
===================================================================
--- grass/trunk/display/d.vect/main.c	2016-08-13 13:48:18 UTC (rev 69132)
+++ grass/trunk/display/d.vect/main.c	2016-08-15 02:04:01 UTC (rev 69133)
@@ -463,7 +463,7 @@
 			   icon_opt->answer, size_opt->answer, 
 			   color_opt->answer, fcolor_opt->answer, 
 			   width_opt->answer, icon_area_opt->answer,
-			   icon_line_opt->answer);
+			   icon_line_opt->answer, sizecolumn_opt->answer);
 	}
 
 	/* reset line width: Do we need to get line width from display