Explorar o código

display area labels also when not displaying centroids, i.e. type=area only

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@42206 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Metz %!s(int64=15) %!d(string=hai) anos
pai
achega
8d77b61c30
Modificáronse 1 ficheiros con 8 adicións e 2 borrados
  1. 8 2
      display/d.vect/main.c

+ 8 - 2
display/d.vect/main.c

@@ -672,9 +672,15 @@ int main(int argc, char **argv)
 	if (display & DISP_CAT)
 	    stat = label(&Map, type, area, Clist, &lattr, chcat);
 
-	if (display & DISP_ATTR)
+	if (display & DISP_ATTR) {
+	    int attr_type = type;
+
+	    if (area && !(attr_type & GV_CENTROID))
+		attr_type |= GV_CENTROID;
+		
 	    stat =
-		attr(&Map, type, attrcol_opt->answer, Clist, &lattr, chcat);
+		attr(&Map, attr_type, attrcol_opt->answer, Clist, &lattr, chcat);
+	    }
 
 	if (display & DISP_ZCOOR)
 	    stat = zcoor(&Map, type, &lattr);