d.vect: remove `display=attr` attributes are display when `attrcol` is given

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@58357 15284696-431f-4ddb-bdfa-cd5b030d7da7

display/d.vect/main.c

@@ -86,17 +86,16 @@ int main(int argc, char **argv)
     display_opt->required = YES;
     display_opt->multiple = YES;
     display_opt->answer = "shape";
-    display_opt->options = "shape,cat,topo,vert,dir,attr,zcoor";
+    display_opt->options = "shape,cat,topo,vert,dir,zcoor";
     display_opt->description = _("Display");
     desc = NULL;
     G_asprintf(&desc,
-	       "shape;%s;cat;%s;topo;%s;vert;%s;dir;%s;attr;%s;zcoor;%s",
+	       "shape;%s;cat;%s;topo;%s;vert;%s;dir;%s;zcoor;%s",
 	       _("Display geometry of features"),
 	       _("Display category numbers of features"),
 	       _("Display topology information (nodes, edges)"),
                _("Display verteces of features"),
 	       _("Display direction of linear features"),
-	       _("Display selected attribute based on 'attrcolumn'"),
 	       _("Display z-coordinate of features (only for 3D vector maps)"));
     display_opt->descriptions = desc;
     
@@ -469,7 +468,7 @@ int main(int argc, char **argv)
 	if (display & DISP_CAT)
 	    stat += display_label(&Map, type, Clist, &lattr, chcat);
 
-	if (display & DISP_ATTR)
+	if (attrcol_opt->answer)
 	    stat += display_attr(&Map, type, attrcol_opt->answer, Clist, &lattr, chcat);
 
 	if (display & DISP_ZCOOR)

display/d.vect/opt.c

@@ -28,9 +28,6 @@ int option_to_display(const struct Option *opt)
 	case 'd':
 	    display |= DISP_DIR;
 	    break;
-	case 'a':
-	    display |= DISP_ATTR;
-	    break;
 	case 'z':
 	    display |= DISP_ZCOOR;
 	    break;

display/d.vect/plot.h

@@ -36,8 +36,7 @@ typedef struct
 #define DISP_TOPO  0x04
 #define DISP_VERT  0x08
 #define DISP_DIR   0x10
-#define DISP_ATTR  0x20
-#define DISP_ZCOOR 0x40
+#define DISP_ZCOOR 0x20
 
 #define RENDER_DP	2
 #define RENDER_DPC	3