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

naïvely replace ci.width with ci.width + ci.format->character_spacing

Browse source
This commit is contained in:
Konstantin Käfer 2012-02-16 23:46:44 +01:00
parent 63735982ee
commit 9ad113d724
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/placement_finder.cpp
View file

@ -713,6 +713,7 @@ std::auto_ptr<text_path> placement_finder<DetectorT>::get_placement_offset(const
{ {
// grab the next character according to the orientation // grab the next character according to the orientation
char_info const &ci = orientation > 0 ? info_.at(i) : info_.at(info_.num_characters() - i - 1); char_info const &ci = orientation > 0 ? info_.at(i) : info_.at(info_.num_characters() - i - 1);
double cwidth = ci.width + ci.format->character_spacing;
unsigned c = ci.c; unsigned c = ci.c;
double last_character_angle = angle; double last_character_angle = angle;
@ -728,10 +729,10 @@ std::auto_ptr<text_path> placement_finder<DetectorT>::get_placement_offset(const
double end_x = 0; double end_x = 0;
double end_y = 0; double end_y = 0;
if (segment_length - distance >= ci.width) if (segment_length - distance >= cwidth)
{ {
//if the distance remaining in this segment is enough, we just go further along the segment //if the distance remaining in this segment is enough, we just go further along the segment
distance += ci.width; distance += cwidth;
end_x = old_x + dx*distance/segment_length; end_x = old_x + dx*distance/segment_length;
end_y = old_y + dy*distance/segment_length; end_y = old_y + dy*distance/segment_length;
@ -757,11 +758,11 @@ std::auto_ptr<text_path> placement_finder<DetectorT>::get_placement_offset(const
segment_length = path_distances[index]; segment_length = path_distances[index];
} }
while (std::sqrt(std::pow(start_x - new_x, 2) + std::pow(start_y - new_y, 2)) < ci.width); //Distance from start_ to new_ while (std::sqrt(std::pow(start_x - new_x, 2) + std::pow(start_y - new_y, 2)) < cwidth); //Distance from start_ to new_
//Calculate the position to place the end of the character on //Calculate the position to place the end of the character on
find_line_circle_intersection( find_line_circle_intersection(
start_x, start_y, ci.width, start_x, start_y, cwidth,
old_x, old_y, new_x, new_y, old_x, old_y, new_x, new_y,
end_x, end_y); //results are stored in end_x, end_y end_x, end_y); //results are stored in end_x, end_y
@ -803,8 +804,8 @@ std::auto_ptr<text_path> placement_finder<DetectorT>::get_placement_offset(const
if (orientation < 0) if (orientation < 0)
{ {
// rotate in place // rotate in place
render_x += ci.width*cosa - (char_height-2)*sina; render_x += cwidth*cosa - (char_height-2)*sina;
render_y -= ci.width*sina + (char_height-2)*cosa; render_y -= cwidth*sina + (char_height-2)*cosa;
render_angle += M_PI; render_angle += M_PI;
} }
current_placement->add_node(c,render_x - current_placement->starting_x, current_placement->add_node(c,render_x - current_placement->starting_x,
@ -850,6 +851,7 @@ bool placement_finder<DetectorT>::test_placement(const std::auto_ptr<text_path>
{ {
// grab the next character according to the orientation // grab the next character according to the orientation
char_info const& ci = orientation > 0 ? info_.at(i) : info_.at(info_.num_characters() - i - 1); char_info const& ci = orientation > 0 ? info_.at(i) : info_.at(info_.num_characters() - i - 1);
double cwidth = ci.width + ci.format->character_spacing;
int c; int c;
double x, y, angle; double x, y, angle;
char_properties *properties; char_properties *properties;
@ -863,8 +865,8 @@ bool placement_finder<DetectorT>::test_placement(const std::auto_ptr<text_path>
{ {
// rotate in place // rotate in place
/* TODO: What's the meaning of -2? */ /* TODO: What's the meaning of -2? */
x += ci.width*cosa - (string_height_-2)*sina; x += cwidth*cosa - (string_height_-2)*sina;
y -= ci.width*sina + (string_height_-2)*cosa; y -= cwidth*sina + (string_height_-2)*cosa;
angle += M_PI; angle += M_PI;
//sin(x+PI) = -sin(x) //sin(x+PI) = -sin(x)
sina = -sina; sina = -sina;
@ -879,12 +881,12 @@ bool placement_finder<DetectorT>::test_placement(const std::auto_ptr<text_path>
else else
{ {
// put four corners of the letter into envelope // put four corners of the letter into envelope
e.init(x, y, x + ci.width*cosa, e.init(x, y, x + cwidth*cosa,
y - ci.width*sina); y - cwidth*sina);
e.expand_to_include(x - ci.height()*sina, e.expand_to_include(x - ci.height()*sina,
y - ci.height()*cosa); y - ci.height()*cosa);
e.expand_to_include(x + (ci.width*cosa - ci.height()*sina), e.expand_to_include(x + (cwidth*cosa - ci.height()*sina),
y - (ci.width*sina + ci.height()*cosa)); y - (cwidth*sina + ci.height()*cosa));
} }
if (!detector_.extent().intersects(e) || if (!detector_.extent().intersects(e) ||