From a12110482d18f105beb3e5b39743223506869efc Mon Sep 17 00:00:00 2001 From: Tim Dwyer Date: Tue, 18 Jul 2006 01:58:44 +0000 Subject: We now use connector spacing to determine the minimum space required between shape bounding boxes when graph layout with avoid overlap constraints is applied. This means that there should always be enough room for connectors to route between shapes. Also changed the default connector spacing to a less extreme 3. (bzr r1435) --- src/graphlayout/graphlayout.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'src/graphlayout/graphlayout.cpp') diff --git a/src/graphlayout/graphlayout.cpp b/src/graphlayout/graphlayout.cpp index dc9dc3ea9..132db2db6 100644 --- a/src/graphlayout/graphlayout.cpp +++ b/src/graphlayout/graphlayout.cpp @@ -3,7 +3,7 @@ */ /* * Authors: -* Tim Dwyer +* Tim Dwyer * * Copyright (C) 2005 Authors * @@ -16,6 +16,9 @@ #include #include +#include "desktop.h" +#include "inkscape.h" +#include "sp-namedview.h" #include "util/glib-list-iterators.h" #include "graphlayout/graphlayout.h" #include "sp-path.h" @@ -76,6 +79,12 @@ void graphlayout(GSList const *const items) { //Check 2 or more selected objects if (n < 2) return; + // add the connector spacing to the size of node bounding boxes + // so that connectors can always be routed between shapes + SPDesktop* desktop = inkscape_active_desktop(); + double spacing = 0; + if(desktop) spacing = desktop->namedview->connector_spacing+0.1; + map nodelookup; vector rs; vector es; @@ -88,7 +97,8 @@ void graphlayout(GSList const *const items) { NR::Point ll(item_box.min()); NR::Point ur(item_box.max()); nodelookup[u->id]=rs.size(); - rs.push_back(new Rectangle(ll[0],ur[0],ll[1],ur[1])); + rs.push_back(new Rectangle(ll[0]-spacing,ur[0]+spacing, + ll[1]-spacing,ur[1]+spacing)); } SimpleConstraints scx,scy; -- cgit v1.2.3