Changeset 50501

Timestamp:

Jan 27, 2012, 10:10:35 AM (13 years ago)

Author:

huhabla

Message:

Enabled multi-layer transfer

Location:

grass/trunk/vector/v.category

Files:

• main.c (modified) (4 diffs)
• v.category.html (modified) (1 diff)

grass/trunk/vector/v.category/main.c

@@ -103 +103 @@
                                  "chlayer;change layer number (e.g. layer=3,1 changes layer 3 to layer 1);"
                                  "sum;add the value specified by cat option to the current category value;"
-                                 "transfer;copy values from one layer to another (e.g. layer=1,2 copies values from layer 1 to layer 2);"
+                                 "transfer;copy values from one layer to another (e.g. layer=1,2,3 copies values from layer 1 to layer 2 and 3);"
                                  "report;print report (statistics), in shell style: layer type count min max;"
                                  "print;print category values, more cats in the same layer are separated by '/'");
@@ -234 +234 @@
 
     if (option == O_TRANS && open_level > 1) {
-        /* check if field[1] already exists */
+        /* check if field[>0] already exists */
         if (nfields > 1) {
-            if (Vect_cidx_get_field_index(&In, fields[1]) != -1)
-                G_warning(_("Categories already exist in layer %d"), fields[1]);
+            for(i = 1; i < nfields; i++) {
+                if (Vect_cidx_get_field_index(&In, fields[i]) != -1)
+                    G_warning(_("Categories already exist in layer %d"), fields[i]);
+            }
         }
         /* find next free layer number */
@@ -340 +342 @@
                     if (Cats->field[i] == fields[0]) {
                         scat = Cats->cat[i];
-                        if (Vect_cat_set(Cats, fields[1], scat) > 0) {
-                            nmodified++;
-                        }
-                    }
-                }
+                        break;
+                    }
+                }
+                for (i = 1; i < nfields; i++) {
+                    if (Vect_cat_set(Cats, fields[i], scat) > 0) {
+                        G_debug(4, "Copy cat %i of field %i to into field %i", scat, fields[0], fields[i]);
+                    }
+                }
+                nmodified++;
             }
             Vect_write_line(&Out, type, Points, Cats);
@@ -704 +710 @@
 
         if (option == O_TRANS && nmodified > 0)
-            G_important_message(_("Categories copied from layer %d to layer %d"),
-                                fields[0], fields[1]);
+            for(i = 0; i < nfields; i++)
+                G_important_message(_("Categories copied from layer %d to layer %d"),
+                                fields[0], fields[i]);
         G_done_msg(_("%d features modified."), nmodified);
     }

grass/trunk/vector/v.category/v.category.html

@@ -103 +103 @@
 using <em><a href="d.what.vect.html">d.what.vect</a></em>.
 
+<h3>Copy categories from layer 1 to layer 2,3,4,5,6,7 and 8</h3>
+Existing layer will be overwritten, non-existing will be created.
+<div class="code"><pre>
+v.category input=observer output=observer_new option=transfer layer=1,2,3,4,5,6,7,8
+</pre></div>
+
 <h3>Print vector categories of given layer</h3>