Add new pack functions for setting pack_info, and simplify code in *gen directories.

Add new packing features: array bounds, column vs. row major, user-based sorting

diff --git a/lib/circogen/circularinit.c b/lib/circogen/circularinit.c
index 783f6bf3c8719332de32364a9254947d8b7fc2ad..efce24c1e56db89a3194bccd5f6e2b45b67b587a 100644 (file)
--- a/lib/circogen/circularinit.c
+++ b/lib/circogen/circularinit.c
@@ -279,21 +279,17 @@ void circoLayout(Agraph_t * g)
        } else {
            Agraph_t *dg = ccs[0]->root;
            pack_info pinfo;
-           pack_mode pmode = getPackMode(g, l_node);
+           getPackInfo(g, l_node, CL_OFFSET, &pinfo);
 
            for (i = 0; i < ncc; i++) {
                sg = ccs[i];
                circularLayout(sg);
                adjustNodes(sg);
            }
-           pinfo.margin = getPack(g, CL_OFFSET, CL_OFFSET);
            /* FIX: splines have not been calculated for dg
             * To use, either do splines in dg and copy to g, or
             * construct components of g from ccs and use that in packing.
             */
-           pinfo.doSplines = 1;
-           pinfo.mode = pmode;
-           pinfo.fixed = 0;
            packSubgraphs(ncc, ccs, dg, &pinfo);
            for (i = 0; i < ncc; i++)
                copyPosns(ccs[i]);