From: erg <devnull@localhost>
Date: Wed, 13 May 2009 20:59:17 +0000 (+0000)
Subject: Add new pack functions for setting pack_info, and simplify code in *gen directories.
X-Git-Tag: LAST_LIBGRAPH~32^2~2080
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=924942e8d97a96b2d778f332b9c28a2a1555cb15;p=graphviz

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 783f6bf3c..efce24c1e 100644
--- 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]);