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

Implement max-angle-char-delta.

Browse source
This commit is contained in:
Hermann Kraus 2012-08-05 16:29:43 +02:00
parent e380a20b6c
commit 1965845771
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/text/placement_finder_ng.cpp
View file

@ -316,8 +316,7 @@ bool placement_finder_ng::single_line_placement(vertex_cache &pp, text_upright_e
text_upright_e real_orientation = orientation; text_upright_e real_orientation = orientation;
if (orientation == UPRIGHT_AUTO) if (orientation == UPRIGHT_AUTO)
{ {
double angle = normalize_angle(pp.angle()); real_orientation = (fabs(normalize_angle(pp.angle())) > 0.5*M_PI) ? UPRIGHT_LEFT : UPRIGHT_RIGHT;
real_orientation = (angle > 0.5*M_PI && angle < 1.5*M_PI) ? UPRIGHT_LEFT : UPRIGHT_RIGHT;
} }
double sign = 1; double sign = 1;
if (real_orientation == UPRIGHT_LEFT) if (real_orientation == UPRIGHT_LEFT)
@ -339,6 +338,8 @@ bool placement_finder_ng::single_line_placement(vertex_cache &pp, text_upright_e
offset -= (*line_itr)->height(); offset -= (*line_itr)->height();
pp.set_offset(offset); pp.set_offset(offset);
double last_glyph_angle = 999;
text_line::const_iterator glyph_itr = (*line_itr)->begin(), glyph_end = (*line_itr)->end(); text_line::const_iterator glyph_itr = (*line_itr)->begin(), glyph_end = (*line_itr)->end();
for (; glyph_itr != glyph_end; glyph_itr++) for (; glyph_itr != glyph_end; glyph_itr++)
{ {
@ -350,8 +351,15 @@ bool placement_finder_ng::single_line_placement(vertex_cache &pp, text_upright_e
pos.y = -pos.y - char_height/2.0*cosa; pos.y = -pos.y - char_height/2.0*cosa;
pos.x = pos.x + char_height/2.0*sina; pos.x = pos.x + char_height/2.0*sina;
if (angle > M_PI/2. && angle < 1.5*M_PI) if (abs(angle) > M_PI/2) upside_down_glyph_count++;
upside_down_glyph_count++;
if ((info_->properties.max_char_angle_delta > 0) && (last_glyph_angle != 999) &&
fabs(normalize_angle(angle-last_glyph_angle)) > info_->properties.max_char_angle_delta)
{
pp.restore_state(s);
return false;
}
last_glyph_angle = angle;
glyphs->push_back(*glyph_itr, pos, angle); //TODO: Store cosa, sina instead glyphs->push_back(*glyph_itr, pos, angle); //TODO: Store cosa, sina instead
if (glyph_itr->width) if (glyph_itr->width)
@ -373,9 +381,9 @@ bool placement_finder_ng::single_line_placement(vertex_cache &pp, text_upright_e
double placement_finder_ng::normalize_angle(double angle) double placement_finder_ng::normalize_angle(double angle)
{ {
while (angle >= 2*M_PI) while (angle >= M_PI)
angle -= 2*M_PI; angle -= 2*M_PI;
while (angle < 0) while (angle < -M_PI)
angle += 2*M_PI; angle += 2*M_PI;
return angle; return angle;
} }