From 2f5eb047d9e05be5e68549ef6b75070d2faa7d2f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Sat, 11 Oct 2008 11:16:23 -0400 Subject: Merging from trunk (bzr r6884) --- src/graphlayout/graphlayout.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/graphlayout') diff --git a/src/graphlayout/graphlayout.cpp b/src/graphlayout/graphlayout.cpp index 2fb641316..d0ba2d20e 100644 --- a/src/graphlayout/graphlayout.cpp +++ b/src/graphlayout/graphlayout.cpp @@ -68,7 +68,7 @@ struct CheckProgress : TestConvergence { NR::Rect const item_box(sp_item_bbox_desktop(u)); NR::Point const curr(item_box.midpoint()); NR::Point const dest(r->getCentreX(),r->getCentreY()); - sp_item_move_rel(u, NR::translate(dest - curr)); + sp_item_move_rel(u, Geom::Translate(dest - curr)); } } */ @@ -124,10 +124,10 @@ void graphlayout(GSList const *const items) { ++i) { SPItem *u=*i; - boost::optional const item_box(sp_item_bbox_desktop(u)); + boost::optional const item_box(sp_item_bbox_desktop(u)); if(item_box) { - NR::Point ll(item_box->min()); - NR::Point ur(item_box->max()); + Geom::Point ll(item_box->min()); + Geom::Point ur(item_box->max()); nodelookup[u->id]=rs.size(); rs.push_back(new Rectangle(ll[0]-spacing,ur[0]+spacing, ll[1]-spacing,ur[1]+spacing)); @@ -226,10 +226,10 @@ void graphlayout(GSList const *const items) { map::iterator i=nodelookup.find(u->id); if(i!=nodelookup.end()) { Rectangle* r=rs[i->second]; - boost::optional item_box(sp_item_bbox_desktop(u)); + boost::optional item_box(sp_item_bbox_desktop(u)); if(item_box) { - NR::Point const curr(item_box->midpoint()); - NR::Point const dest(r->getCentreX(),r->getCentreY()); + Geom::Point const curr(item_box->midpoint()); + Geom::Point const dest(r->getCentreX(),r->getCentreY()); sp_item_move_rel(u, Geom::Translate(dest - curr)); } } -- cgit v1.2.3