Fix putGraphs to use user sort information in packing graphs

diff --git a/lib/pack/pack.c b/lib/pack/pack.c
index ea530d7e32ab77831ed878051d0e9355a1833fa7..2fbf8a640073a6cc5ccc6e6508e050409575655d 100644 (file)
--- a/lib/pack/pack.c
+++ b/lib/pack/pack.c
@@ -907,10 +907,11 @@ polyGraphs(int ng, Agraph_t ** gs, Agraph_t * root, pack_info * pinfo)
 point *putGraphs(int ng, Agraph_t ** gs, Agraph_t * root,
                 pack_info * pinfo)
 {
-    int i;
+    int i, v;
     boxf* bbs;
     Agraph_t* g;
     point* pts;
+    char* s;
 
     if (ng <= 0) return NULL;
 
@@ -925,8 +926,20 @@ point *putGraphs(int ng, Agraph_t ** gs, Agraph_t * root,
        bbs[i] = GD_bb(g);
     }
 
-    if (pinfo->mode == l_array)
+    if (pinfo->mode == l_array) {
+       if (pinfo->flags & PK_USER_VALS) {
+           pinfo->vals = N_NEW(ng, unsigned char);
+           for (i = 0; i < ng; i++) {
+               s = agget (gs[i], "sortv");
+               if (s && (sscanf (s, "%d", &v) > 0) && (v >= 0))
+                   pinfo->vals[i] = v;
+           }
+
+       }
        pts = arrayRects (ng, bbs, pinfo);
+       if (pinfo->flags & PK_USER_VALS)
+           free (pinfo->vals);
+    }
 
     free (bbs);