Changeset 1254 for trunk/src/placement_finder.cpp

Timestamp:

07/20/09 11:30:19 (12 months ago)

Author:

artem

Message:

+ applied patch from Jochen Topf :

* text_convert="none|toupper|tolower"

Convert all text to upper/lower case before rendering. "none" doesn't do
anything with the text and is the default. Works for labels along lines
or at points.

* line_spacing="<number>"

Add this many pixels space between two lines in text labels that have
been broken into several lines. Default is 0. Doesn't do anything for
labels along lines.

* character_spacing="<number>"

Add this many pixels space between two characters in a text. Default is 0.
Currently only works for text labels on point geometries. This should
also be implemented for labels along lines, but I'll leave that for
another day.

* wrap_character="<character>"

Instead of breaking text into lines on spaces, use this character. This
is useful, when you want to make sure that labels are broken at the right
spot. Note that you'll probably want to make wrap_width small so that
your lines are actually broken, otherwise you'll see the wrap_character
in the output. Default is ' ' (space). Doesn't do anything for labels
along lines.

Files:

• trunk/src/placement_finder.cpp (modified) (7 diffs)

trunk/src/placement_finder.cpp

@@ -76 +76 @@
         label_placement(sym.get_label_placement()), 
         wrap_width(sym.get_wrap_width()), 
+        wrap_char(sym.get_wrap_char()),
         text_ratio(sym.get_text_ratio()), 
         label_spacing(sym.get_label_spacing()), 
@@ -215 +216 @@
                                                           double label_x, 
                                                           double label_y,
-                                                          vertical_alignment_e valign)
+                                                          vertical_alignment_e valign,
+                                                          unsigned line_spacing,
+                                                          unsigned character_spacing)
    {
       double x, y;
@@ -240 +243 @@
       if (wrap_at < string_width && p.info.num_characters() > 0)
       {
-         int last_space = 0;
+         int last_wrap_char = 0;
          string_width = 0;
          string_height = 0;
@@ -251 +254 @@
             character_info ci;
             ci = p.info.at(ii);
+
+            unsigned cwidth = ci.width + character_spacing;
                 
             unsigned c = ci.character;
-            word_width += ci.width;
-            word_height = word_height > ci.height ? word_height : ci.height;
+            word_width += cwidth;
+            word_height = word_height > (ci.height + line_spacing) ? word_height : (ci.height + line_spacing);
         
-            if (c == ' ')
+            if (c == p.wrap_char)
             {
-               last_space = ii;
+               last_wrap_char = ii;
                line_width += word_width;
                line_height = line_height > word_height ? line_height : word_height;
@@ -267 +272 @@
             {
                // Remove width of breaking space character since it is not rendered
-               line_width -= ci.width;
+               line_width -= cwidth;
                string_width = string_width > line_width ? string_width : line_width;
                string_height += line_height;
-               line_breaks.push_back(last_space);
+               line_breaks.push_back(last_wrap_char);
                line_widths.push_back(line_width);
                line_heights.push_back(line_height);
-               ii = last_space;
+               ii = last_wrap_char;
                line_width = 0;
                line_height = 0;
@@ -327 +332 @@
          ci = p.info.at(i);
             
+         unsigned cwidth = ci.width + character_spacing;
+
          unsigned c = ci.character;
          if (i == index_to_wrap_at)
@@ -368 +375 @@
             p.envelopes.push(e);
          }
-         x += ci.width;
+         x += cwidth;
       }
       p.placements.push_back(current_placement.release());