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

Metawriter for Cairo.

Browse source
This commit is contained in:
Hermann Kraus 2010-08-11 11:45:56 +00:00
parent 5867aadb66
commit 7dea58b625
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/cairo_renderer.cpp
View file

@ -827,6 +827,8 @@ void cairo_renderer_base::process(shield_symbolizer const& sym,
int w = (*data)->width(); int w = (*data)->width();
int h = (*data)->height(); int h = (*data)->height();
metawriter_with_properties writer = sym.get_metawriter();
for (unsigned i = 0; i < feature.num_geometries(); ++i) for (unsigned i = 0; i < feature.num_geometries(); ++i)
{ {
geometry2d const& geom = feature.get_geometry(i); geometry2d const& geom = feature.get_geometry(i);
@ -871,6 +873,10 @@ void cairo_renderer_base::process(shield_symbolizer const& sym,
sym.get_halo_radius(), sym.get_halo_radius(),
sym.get_halo_fill() sym.get_halo_fill()
); );
if (writer.first) {
writer.first->add_box(box2d<double>(px,py,px+w,py+h), feature, t_, writer.second);
writer.first->add_text(text_placement, faces, feature, t_, writer.second); //Only 1 placement
}
detector_.insert(label_ext); detector_.insert(label_ext);
} }
} }
@ -900,9 +906,10 @@ void cairo_renderer_base::process(shield_symbolizer const& sym,
sym.get_halo_radius(), sym.get_halo_radius(),
sym.get_halo_fill() sym.get_halo_fill()
); );
if (writer.first) writer.first->add_box(box2d<double>(px,py,px+w,py+h), feature, t_, writer.second);
} }
finder.update_detector(text_placement); finder.update_detector(text_placement);
if (writer.first) writer.first->add_text(text_placement, faces, feature, t_, writer.second); //More than one placement
} }
} }
} }
@ -1140,6 +1147,8 @@ void cairo_renderer_base::process(glyph_symbolizer const& sym,
halo_fill halo_fill
); );
detector_.insert(glyph_ext); detector_.insert(glyph_ext);
metawriter_with_properties writer = sym.get_metawriter();
if (writer.first) writer.first->add_box(glyph_ext, feature, t_, writer.second);
} }
} }
else else
@ -1227,6 +1236,9 @@ void cairo_renderer_base::process(text_symbolizer const& sym,
sym.get_halo_fill() sym.get_halo_fill()
); );
} }
metawriter_with_properties writer = sym.get_metawriter();
if (writer.first) writer.first->add_text(text_placement, faces, feature, t_, writer.second);
} }
} }
} }