Implement label-position-tolerance.

This commit is contained in:
Hermann Kraus 2012-08-13 02:31:08 +02:00
parent 75f250934f
commit 79ad6b395e
4 changed files with 21 additions and 2 deletions

View file

@ -258,6 +258,7 @@ bool placement_finder_ng::find_line_placements(T & path)
{ {
if (!layout_.size()) return true; if (!layout_.size()) return true;
vertex_cache pp(path); vertex_cache pp(path);
bool success = false; bool success = false;
while (pp.next_subpath()) while (pp.next_subpath())
{ {
@ -266,13 +267,31 @@ bool placement_finder_ng::find_line_placements(T & path)
(pp.length() < layout_.width())) continue; (pp.length() < layout_.width())) continue;
double spacing = get_spacing(pp.length(), layout_.width()); double spacing = get_spacing(pp.length(), layout_.width());
double tolerance = info_->properties.label_position_tolerance > 0 ?
info_->properties.label_position_tolerance : spacing/2.0;
double tolerance_delta = std::max(1.0, tolerance/100.0);
// first label should be placed at half the spacing // first label should be placed at half the spacing
pp.forward(spacing/2); pp.forward(spacing/2);
path_move_dx(pp); path_move_dx(pp);
//TODO: label_position_tolerance
do do
{ {
success = single_line_placement(pp, info_->properties.upright) || success; vertex_cache::state state = pp.save_state();
for (double diff = 0; diff < tolerance; diff += tolerance_delta)
{
for(int dir = -1; dir < 2; dir+=2) //-1, +1
{
if (pp.move(dir * diff) && single_line_placement(pp, info_->properties.upright))
{
success = true;
diff = tolerance; // Break out of outer loop
break;
}
pp.restore_state(state);
if (diff == 0) continue;
}
}
} while (pp.forward(spacing)); } while (pp.forward(spacing));
} }
return success; return success;

Binary file not shown.

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 35 KiB