From: erg <devnull@localhost>
Date: Tue, 19 May 2009 15:05:42 +0000 (+0000)
Subject: Enable overlap_scaling in generic overlap removal
X-Git-Tag: LAST_LIBGRAPH~32^2~2051
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dd83abb510be39d1d5b2501a961ccc0c0d7134b3;p=graphviz

Enable overlap_scaling in generic overlap removal
---

diff --git a/lib/neatogen/adjust.c b/lib/neatogen/adjust.c
index 334b54bd2..c89658513 100644
--- a/lib/neatogen/adjust.c
+++ b/lib/neatogen/adjust.c
@@ -749,6 +749,7 @@ fdpAdjust (graph_t* g)
     int flag, i;
     expand_t sep = sepFactor(g);
     pointf pad;
+    double initial_scaling;
 
     if (sep.doAdd) {
 	pad.x = PS2INCH(sep.x);
@@ -773,7 +774,8 @@ fdpAdjust (graph_t* g)
 	A = SparseMatrix_remove_diagonal(A);
     }
 
-    remove_overlap(Ndim, A, A->m, pos, sizes, 1000, -4, &flag);
+    initial_scaling = late_double(g, agfindgraphattr(g, "overlap_scaling"), -4.0, -1.e10);
+    remove_overlap(Ndim, A, A->m, pos, sizes, 1000, initial_scaling, &flag);
 
     for (n = agfstnode(g); n; n = agnxtnode(g, n)) {
 	real *npos = pos + (Ndim * ND_id(n));