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

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-03-14 07:20:03 -0400 (Fri, 14 Mar 2008)
New Revision: 30561

Modified:
   grass/trunk/display/d.vect/main.c
Log:
d.vect: disp=cat or attr draws area shapes (trac #71)


Modified: grass/trunk/display/d.vect/main.c
===================================================================
--- grass/trunk/display/d.vect/main.c	2008-03-14 10:53:44 UTC (rev 30560)
+++ grass/trunk/display/d.vect/main.c	2008-03-14 11:20:03 UTC (rev 30561)
@@ -635,12 +635,14 @@
 	        D_line_width(default_width);
 
 	    if ( area ) {
-		if ( level >= 2 ) {
-		    stat = darea ( &Map, Clist,
-			has_color ? &color : NULL, has_fcolor ? &fcolor : NULL, chcat,
-			(int) id_flag->answer, table_acolors_flag->answer,
-			cats_acolors_flag->answer, &window, rgbcol_opt->answer,
-			default_width, wcolumn_opt->answer, width_scale );
+		if ( level >= 2) {
+		    if ( display & DISP_SHAPE ) {
+			stat = darea ( &Map, Clist,
+				       has_color ? &color : NULL, has_fcolor ? &fcolor : NULL, chcat,
+				       (int) id_flag->answer, table_acolors_flag->answer,
+				       cats_acolors_flag->answer, &window, rgbcol_opt->answer,
+				       default_width, wcolumn_opt->answer, width_scale );
+		    }
 	            if ( wcolumn_opt->answer )
 	                D_line_width(default_width);
 		} else
@@ -701,7 +703,7 @@
 	R_close_driver();
 
 	if(verbose)
-	    G_done_msg ("");
+	    G_done_msg (" ");
 	
 	Vect_close (&Map);
 	Vect_destroy_cat_list (Clist);