Просмотр исходного кода

v.edit: don't print warning when cat is not deleted
(merge from devbr6, https://trac.osgeo.org/grass/changeset/34675)


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

Martin Landa 16 лет назад
Родитель
Сommit
3fbd714565
2 измененных файлов с 3 добавлено и 6 удалено
  1. 2 6
      lib/vector/vedit/cats.c
  2. 1 0
      vector/v.edit/main.c

+ 2 - 6
lib/vector/vedit/cats.c

@@ -63,7 +63,7 @@ int Vedit_modify_cats(struct Map_info *Map, struct ilist *List,
 		/* add new category */
 		if (!del) {
 		    if (Vect_cat_set(Cats, layer, cat) < 1) {
-			G_warning(_("Unable to set category %d for line %d"),
+			G_warning(_("Unable to set category %d for (feature id %d)"),
 				  cat, line);
 		    }
 		    else {
@@ -71,11 +71,7 @@ int Vedit_modify_cats(struct Map_info *Map, struct ilist *List,
 		    }
 		}
 		else {		/* delete old category */
-		    if (Vect_field_cat_del(Cats, layer, cat) == 0) {
-			G_warning(_("Unable to delete layer/category %d/%d line %d"),
-				  layer, cat, line);
-		    }
-		    else {
+		    if (Vect_field_cat_del(Cats, layer, cat) == 1) {
 			rewrite = 1;
 		    }
 		}

+ 1 - 0
vector/v.edit/main.c

@@ -178,6 +178,7 @@ int main(int argc, char *argv[])
     if (action_mode != MODE_CREATE && action_mode != MODE_ADD) {
 	/* select lines */
 	List = Vect_new_list();
+	G_message(_("Selecting features..."));
 	if (action_mode == MODE_COPY && BgMap && BgMap[0]) {
 	    List = select_lines(BgMap[0], action_mode, &params, thresh, List);
 	}