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

svn_grass at osgeo.org svn_grass at osgeo.org
Sun Aug 7 14:59:05 EDT 2011


Author: martinl
Date: 2011-08-07 11:59:05 -0700 (Sun, 07 Aug 2011)
New Revision: 47490

Modified:
   grass/trunk/display/d.vect/area.c
   grass/trunk/display/d.vect/lines.c
Log:
d.vect: rename variable (cosmetics)


Modified: grass/trunk/display/d.vect/area.c
===================================================================
--- grass/trunk/display/d.vect/area.c	2011-08-07 18:54:29 UTC (rev 47489)
+++ grass/trunk/display/d.vect/area.c	2011-08-07 18:59:05 UTC (rev 47490)
@@ -17,7 +17,7 @@
 		 const struct color_rgb *bcolor, const struct color_rgb *fcolor, int chcat, int id_flag, 
 		 int table_colors_flag, int cats_color_flag, const char *rgb_column,
 		 int default_width, const char *width_column, double width_scale,
-		 int z_color_flag, const char *z_column,
+		 int z_color_flag, const char *z_style,
 		 dbCatValArray *cvarr_rgb, dbCatValArray *cvarr_width, int nrec_width)
 {
     int num, area, isle, n_isles, n_points;
@@ -185,7 +185,7 @@
 		    area, centroid, cat, Points->x[0], Points->y[0],
 		    Points->z[0]);
 	    rgb = 1;
-	    Rast_make_fp_colors(&colors, z_column, box.B, box.T);
+	    Rast_make_fp_colors(&colors, z_style, box.B, box.T);
 	    Rast_get_color(&zval, &red, &grn, &blu, &colors, DCELL_TYPE);
 	    G_debug(3, "b %d, g: %d, r %d", blu, grn, red);
 	}

Modified: grass/trunk/display/d.vect/lines.c
===================================================================
--- grass/trunk/display/d.vect/lines.c	2011-08-07 18:54:29 UTC (rev 47489)
+++ grass/trunk/display/d.vect/lines.c	2011-08-07 18:59:05 UTC (rev 47490)
@@ -41,7 +41,7 @@
 		  const char *symbol_name,  double size, const char *size_column, int sqrt_flag, const char *rot_column,
 		  int id_flag, int table_colors_flag, int cats_color_flag, const char *rgb_column,
 		  int default_width, const char *width_column, double width_scale,
-		  int z_color_flag, const char *z_column,
+		  int z_color_flag, const char *z_style,
 		  dbCatValArray *cvarr_rgb, dbCatValArray *cvarr_width, int nrec_width,
 		  dbCatValArray *cvarr_size, int nrec_size,
 		  dbCatValArray *cvarr_rot, int nrec_rot)
@@ -201,7 +201,7 @@
 	    G_debug(3, "display line %d, cat %d, x: %f, y: %f, z: %f", line,
 		    cat, Points->x[0], Points->y[0], Points->z[0]);
 	    custom_rgb = TRUE;
-	    Rast_make_fp_colors(&colors, z_column, box.B, box.T);
+	    Rast_make_fp_colors(&colors, z_style, box.B, box.T);
 	    Rast_get_color(&zval, &red, &grn, &blu, &colors, DCELL_TYPE);
 	    G_debug(3, "b %d, g: %d, r %d", blu, grn, red);
 	}



More information about the grass-commit mailing list