From df54f710bc0e7406fe722b798cb23791f212e5b2 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Mon, 5 Mar 2012 18:00:15 -0800 Subject: [PATCH] minor formatting --- src/placement_finder.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/placement_finder.cpp b/src/placement_finder.cpp index c9c2c6e1d..b055a9308 100644 --- a/src/placement_finder.cpp +++ b/src/placement_finder.cpp @@ -439,7 +439,9 @@ void placement_finder::find_point_placement(double label_x, // if there is an overlap with existing envelopes, then exit - no placement if (!detector_.extent().intersects(e) || - (!p.allow_overlap && !detector_.has_point_placement(e, pi.get_actual_minimum_distance())) + (!p.allow_overlap && + !detector_.has_point_placement(e, pi.get_actual_minimum_distance()) + ) ) { return; @@ -907,7 +909,10 @@ bool placement_finder::test_placement(std::auto_ptr const& y - (cwidth*sina + ci.height()*cosa)); if (!detector_.extent().intersects(e) || - !detector_.has_placement(e, info_.get_string(), pi.get_actual_minimum_distance())) + (!p.allow_overlap && + !detector_.has_placement(e, info_.get_string(), pi.get_actual_minimum_distance()) + ) + ) { //std::clog << "No Intersects:" << !dimensions_.intersects(e) << ": " << e << " @ " << dimensions_ << std::endl; //std::clog << "No Placements:" << !detector_.has_placement(e, info.get_string(), p.minimum_distance) << std::endl;