sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

minor formatting

Browse source 
Conflicts:

	src/placement_finder.cpp
This commit is contained in:
Dane Springmeyer 2012-03-05 18:00:15 -08:00 • committed by Artem Pavlenko
parent 99a181e196
commit 86ac497584
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/placement_finder.cpp
View file

@ -432,7 +432,11 @@ void placement_finder<DetectorT>::find_point_placement(double label_x, double la
current_placement->center.y - dy - ci.ymax); current_placement->center.y - dy - ci.ymax);
// if there is an overlap with existing envelopes, then exit - no placement // 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()))) {
if (!detector_.extent().intersects(e) ||
(!p.allow_overlap &&
!detector_.has_point_placement(e, pi.get_actual_minimum_distance())))
{
return; return;
} }
@ -886,7 +890,10 @@ bool placement_finder<DetectorT>::test_placement(const std::auto_ptr<text_path>
y - (cwidth*sina + ci.height()*cosa)); y - (cwidth*sina + ci.height()*cosa));
if (!detector_.extent().intersects(e) || 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 Intersects:" << !dimensions_.intersects(e) << ": " << e << " @ " << dimensions_ << std::endl;
//std::clog << "No Placements:" << !detector_.has_placement(e, info.get_string(), p.minimum_distance) << std::endl; //std::clog << "No Placements:" << !detector_.has_placement(e, info.get_string(), p.minimum_distance) << std::endl;