break out agg-based glyph, line, and polygon symbolizers
This commit is contained in:
Dane Springmeyer
parent
fd17b14120
commit
1566b486fa
5 changed files with 347 additions and 207 deletions
|
|
@ -125,7 +125,10 @@ if env['JPEG']:
|
||||||
if True : # agg backend
|
if True : # agg backend
|
||||||
source += Split(
|
source += Split(
|
||||||
"""
|
"""
|
||||||
|
agg/process_glyph_symbolizer.cpp
|
||||||
|
agg/process_line_symbolizer.cpp
|
||||||
agg/process_point_symbolizer.cpp
|
agg/process_point_symbolizer.cpp
|
||||||
|
agg/process_polygon_symbolizer.cpp
|
||||||
agg/process_shield_symbolizer.cpp
|
agg/process_shield_symbolizer.cpp
|
||||||
agg/process_markers_symbolizer.cpp
|
agg/process_markers_symbolizer.cpp
|
||||||
svg_parser.cpp
|
svg_parser.cpp
|
||||||
|
|
|
||||||
101
src/agg/process_glyph_symbolizer.cpp
Normal file
101
src/agg/process_glyph_symbolizer.cpp
Normal file
|
|
@ -0,0 +1,101 @@
|
||||||
|
/*****************************************************************************
|
||||||
|
*
|
||||||
|
* This file is part of Mapnik (c++ mapping toolkit)
|
||||||
|
*
|
||||||
|
* Copyright (C) 2010 Artem Pavlenko
|
||||||
|
*
|
||||||
|
* This library is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU Lesser General Public
|
||||||
|
* License as published by the Free Software Foundation; either
|
||||||
|
* version 2.1 of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This library is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public
|
||||||
|
* License along with this library; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
|
*
|
||||||
|
*****************************************************************************/
|
||||||
|
//$Id$
|
||||||
|
|
||||||
|
// mapnik
|
||||||
|
#include <mapnik/agg_renderer.hpp>
|
||||||
|
|
||||||
|
// agg
|
||||||
|
#include "agg_basics.h"
|
||||||
|
#include "agg_rendering_buffer.h"
|
||||||
|
#include "agg_pixfmt_rgba.h"
|
||||||
|
#include "agg_rasterizer_scanline_aa.h"
|
||||||
|
#include "agg_scanline_u.h"
|
||||||
|
|
||||||
|
namespace mapnik {
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
void agg_renderer<T>::process(glyph_symbolizer const& sym,
|
||||||
|
Feature const& feature,
|
||||||
|
proj_transform const& prj_trans)
|
||||||
|
{
|
||||||
|
face_set_ptr faces = font_manager_.get_face_set(sym.get_face_name());
|
||||||
|
stroker_ptr strk = font_manager_.get_stroker();
|
||||||
|
if (faces->size() > 0 && strk)
|
||||||
|
{
|
||||||
|
// Get x and y from geometry and translate to pixmap coords.
|
||||||
|
double x, y, z=0.0;
|
||||||
|
feature.get_geometry(0).label_position(&x, &y);
|
||||||
|
prj_trans.backward(x,y,z);
|
||||||
|
t_.forward(&x, &y);
|
||||||
|
|
||||||
|
text_renderer<T> ren(pixmap_, faces, *strk);
|
||||||
|
|
||||||
|
// set fill and halo colors
|
||||||
|
color fill = sym.eval_color(feature);
|
||||||
|
ren.set_fill(fill);
|
||||||
|
if (fill != color("transparent")) {
|
||||||
|
ren.set_halo_fill(sym.get_halo_fill());
|
||||||
|
ren.set_halo_radius(sym.get_halo_radius() * scale_factor_);
|
||||||
|
}
|
||||||
|
|
||||||
|
// set font size
|
||||||
|
unsigned size = sym.eval_size(feature);
|
||||||
|
ren.set_pixel_size(size * scale_factor_);
|
||||||
|
faces->set_pixel_sizes(size * scale_factor_);
|
||||||
|
|
||||||
|
// Get and render text path
|
||||||
|
//
|
||||||
|
text_path_ptr path = sym.get_text_path(faces, feature);
|
||||||
|
// apply displacement
|
||||||
|
position pos = sym.get_displacement();
|
||||||
|
double dx = boost::get<0>(pos);
|
||||||
|
double dy = boost::get<1>(pos);
|
||||||
|
path->starting_x = x = x+dx;
|
||||||
|
path->starting_y = y = y+dy;
|
||||||
|
|
||||||
|
// Prepare glyphs to set internal state and calculate the marker's
|
||||||
|
// final box so we can check for a valid placement
|
||||||
|
box2d<double> dim = ren.prepare_glyphs(path.get());
|
||||||
|
double bsize = (dim.width()>dim.height()?dim.width():dim.height())/2;
|
||||||
|
box2d<double> ext(
|
||||||
|
floor(x-bsize), floor(y-bsize), ceil(x+bsize), ceil(y+bsize)
|
||||||
|
);
|
||||||
|
if ((sym.get_allow_overlap() || detector_.has_placement(ext)) &&
|
||||||
|
(!sym.get_avoid_edges() || detector_.extent().contains(ext)))
|
||||||
|
{
|
||||||
|
// Placement is valid, render glyph and update detector.
|
||||||
|
ren.render(x, y);
|
||||||
|
detector_.insert(ext);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
throw config_error(
|
||||||
|
"Unable to find specified font face in GlyphSymbolizer"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
template void agg_renderer<image_32>::process(glyph_symbolizer const&,
|
||||||
|
Feature const&,
|
||||||
|
proj_transform const&);
|
||||||
|
}
|
||||||
156
src/agg/process_line_symbolizer.cpp
Normal file
156
src/agg/process_line_symbolizer.cpp
Normal file
|
|
@ -0,0 +1,156 @@
|
||||||
|
/*****************************************************************************
|
||||||
|
*
|
||||||
|
* This file is part of Mapnik (c++ mapping toolkit)
|
||||||
|
*
|
||||||
|
* Copyright (C) 2010 Artem Pavlenko
|
||||||
|
*
|
||||||
|
* This library is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU Lesser General Public
|
||||||
|
* License as published by the Free Software Foundation; either
|
||||||
|
* version 2.1 of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This library is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public
|
||||||
|
* License along with this library; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
|
*
|
||||||
|
*****************************************************************************/
|
||||||
|
//$Id$
|
||||||
|
|
||||||
|
// mapnik
|
||||||
|
#include <mapnik/agg_renderer.hpp>
|
||||||
|
#include <mapnik/agg_rasterizer.hpp>
|
||||||
|
|
||||||
|
// agg
|
||||||
|
#include "agg_basics.h"
|
||||||
|
#include "agg_rendering_buffer.h"
|
||||||
|
#include "agg_pixfmt_rgba.h"
|
||||||
|
#include "agg_rasterizer_scanline_aa.h"
|
||||||
|
#include "agg_scanline_u.h"
|
||||||
|
// for line_symbolizer
|
||||||
|
#include "agg_renderer_scanline.h"
|
||||||
|
#include "agg_renderer_outline_aa.h"
|
||||||
|
#include "agg_rasterizer_outline_aa.h"
|
||||||
|
#include "agg_scanline_p.h"
|
||||||
|
#include "agg_conv_stroke.h"
|
||||||
|
#include "agg_conv_dash.h"
|
||||||
|
|
||||||
|
// stl
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
namespace mapnik {
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
void agg_renderer<T>::process(line_symbolizer const& sym,
|
||||||
|
Feature const& feature,
|
||||||
|
proj_transform const& prj_trans)
|
||||||
|
{
|
||||||
|
typedef agg::renderer_base<agg::pixfmt_rgba32_plain> ren_base;
|
||||||
|
typedef coord_transform2<CoordTransform,geometry2d> path_type;
|
||||||
|
typedef agg::renderer_outline_aa<ren_base> renderer_oaa;
|
||||||
|
typedef agg::rasterizer_outline_aa<renderer_oaa> rasterizer_outline_aa;
|
||||||
|
typedef agg::renderer_scanline_aa_solid<ren_base> renderer;
|
||||||
|
|
||||||
|
agg::rendering_buffer buf(pixmap_.raw_data(),width_,height_, width_ * 4);
|
||||||
|
agg::pixfmt_rgba32_plain pixf(buf);
|
||||||
|
|
||||||
|
ren_base renb(pixf);
|
||||||
|
stroke const& stroke_ = sym.get_stroke();
|
||||||
|
color const& col = stroke_.get_color();
|
||||||
|
unsigned r=col.red();
|
||||||
|
unsigned g=col.green();
|
||||||
|
unsigned b=col.blue();
|
||||||
|
unsigned a=col.alpha();
|
||||||
|
renderer ren(renb);
|
||||||
|
ras_ptr->reset();
|
||||||
|
ras_ptr->gamma(agg::gamma_linear());
|
||||||
|
|
||||||
|
agg::scanline_p8 sl;
|
||||||
|
|
||||||
|
for (unsigned i=0;i<feature.num_geometries();++i)
|
||||||
|
{
|
||||||
|
geometry2d const& geom = feature.get_geometry(i);
|
||||||
|
if (geom.num_points() > 1)
|
||||||
|
{
|
||||||
|
path_type path(t_,geom,prj_trans);
|
||||||
|
|
||||||
|
if (stroke_.has_dash())
|
||||||
|
{
|
||||||
|
agg::conv_dash<path_type> dash(path);
|
||||||
|
dash_array const& d = stroke_.get_dash_array();
|
||||||
|
dash_array::const_iterator itr = d.begin();
|
||||||
|
dash_array::const_iterator end = d.end();
|
||||||
|
for (;itr != end;++itr)
|
||||||
|
{
|
||||||
|
dash.add_dash(itr->first * scale_factor_,
|
||||||
|
itr->second * scale_factor_);
|
||||||
|
}
|
||||||
|
|
||||||
|
agg::conv_stroke<agg::conv_dash<path_type > > stroke(dash);
|
||||||
|
|
||||||
|
line_join_e join=stroke_.get_line_join();
|
||||||
|
if ( join == MITER_JOIN)
|
||||||
|
stroke.generator().line_join(agg::miter_join);
|
||||||
|
else if( join == MITER_REVERT_JOIN)
|
||||||
|
stroke.generator().line_join(agg::miter_join);
|
||||||
|
else if( join == ROUND_JOIN)
|
||||||
|
stroke.generator().line_join(agg::round_join);
|
||||||
|
else
|
||||||
|
stroke.generator().line_join(agg::bevel_join);
|
||||||
|
|
||||||
|
line_cap_e cap=stroke_.get_line_cap();
|
||||||
|
if (cap == BUTT_CAP)
|
||||||
|
stroke.generator().line_cap(agg::butt_cap);
|
||||||
|
else if (cap == SQUARE_CAP)
|
||||||
|
stroke.generator().line_cap(agg::square_cap);
|
||||||
|
else
|
||||||
|
stroke.generator().line_cap(agg::round_cap);
|
||||||
|
|
||||||
|
stroke.generator().miter_limit(4.0);
|
||||||
|
stroke.generator().width(stroke_.get_width() * scale_factor_);
|
||||||
|
|
||||||
|
ras_ptr->add_path(stroke);
|
||||||
|
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
agg::conv_stroke<path_type> stroke(path);
|
||||||
|
line_join_e join=stroke_.get_line_join();
|
||||||
|
if ( join == MITER_JOIN)
|
||||||
|
stroke.generator().line_join(agg::miter_join);
|
||||||
|
else if( join == MITER_REVERT_JOIN)
|
||||||
|
stroke.generator().line_join(agg::miter_join);
|
||||||
|
else if( join == ROUND_JOIN)
|
||||||
|
stroke.generator().line_join(agg::round_join);
|
||||||
|
else
|
||||||
|
stroke.generator().line_join(agg::bevel_join);
|
||||||
|
|
||||||
|
line_cap_e cap=stroke_.get_line_cap();
|
||||||
|
if (cap == BUTT_CAP)
|
||||||
|
stroke.generator().line_cap(agg::butt_cap);
|
||||||
|
else if (cap == SQUARE_CAP)
|
||||||
|
stroke.generator().line_cap(agg::square_cap);
|
||||||
|
else
|
||||||
|
stroke.generator().line_cap(agg::round_cap);
|
||||||
|
|
||||||
|
stroke.generator().miter_limit(4.0);
|
||||||
|
stroke.generator().width(stroke_.get_width() * scale_factor_);
|
||||||
|
ras_ptr->add_path(stroke);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
ren.color(agg::rgba8(r, g, b, int(a*stroke_.get_opacity())));
|
||||||
|
agg::render_scanlines(*ras_ptr, sl, ren);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
template void agg_renderer<image_32>::process(line_symbolizer const&,
|
||||||
|
Feature const&,
|
||||||
|
proj_transform const&);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
87
src/agg/process_polygon_symbolizer.cpp
Normal file
87
src/agg/process_polygon_symbolizer.cpp
Normal file
|
|
@ -0,0 +1,87 @@
|
||||||
|
/*****************************************************************************
|
||||||
|
*
|
||||||
|
* This file is part of Mapnik (c++ mapping toolkit)
|
||||||
|
*
|
||||||
|
* Copyright (C) 2010 Artem Pavlenko
|
||||||
|
*
|
||||||
|
* This library is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU Lesser General Public
|
||||||
|
* License as published by the Free Software Foundation; either
|
||||||
|
* version 2.1 of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This library is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public
|
||||||
|
* License along with this library; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
|
*
|
||||||
|
*****************************************************************************/
|
||||||
|
//$Id$
|
||||||
|
|
||||||
|
// mapnik
|
||||||
|
#include <mapnik/agg_renderer.hpp>
|
||||||
|
#include <mapnik/agg_rasterizer.hpp>
|
||||||
|
|
||||||
|
// agg
|
||||||
|
#include "agg_basics.h"
|
||||||
|
#include "agg_rendering_buffer.h"
|
||||||
|
#include "agg_pixfmt_rgba.h"
|
||||||
|
#include "agg_rasterizer_scanline_aa.h"
|
||||||
|
#include "agg_scanline_u.h"
|
||||||
|
// for polygon_symbolizer
|
||||||
|
#include "agg_renderer_scanline.h"
|
||||||
|
|
||||||
|
|
||||||
|
// stl
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
namespace mapnik {
|
||||||
|
|
||||||
|
template <typename T>
|
||||||
|
void agg_renderer<T>::process(polygon_symbolizer const& sym,
|
||||||
|
Feature const& feature,
|
||||||
|
proj_transform const& prj_trans)
|
||||||
|
{
|
||||||
|
typedef coord_transform2<CoordTransform,geometry2d> path_type;
|
||||||
|
typedef agg::renderer_base<agg::pixfmt_rgba32_plain> ren_base;
|
||||||
|
typedef agg::renderer_scanline_aa_solid<ren_base> renderer;
|
||||||
|
|
||||||
|
color const& fill_ = sym.get_fill();
|
||||||
|
agg::scanline_u8 sl;
|
||||||
|
|
||||||
|
agg::rendering_buffer buf(pixmap_.raw_data(),width_,height_, width_ * 4);
|
||||||
|
agg::pixfmt_rgba32_plain pixf(buf);
|
||||||
|
|
||||||
|
ren_base renb(pixf);
|
||||||
|
unsigned r=fill_.red();
|
||||||
|
unsigned g=fill_.green();
|
||||||
|
unsigned b=fill_.blue();
|
||||||
|
unsigned a=fill_.alpha();
|
||||||
|
renderer ren(renb);
|
||||||
|
|
||||||
|
ras_ptr->reset();
|
||||||
|
ras_ptr->gamma(agg::gamma_linear(0.0, sym.get_gamma()));
|
||||||
|
|
||||||
|
for (unsigned i=0;i<feature.num_geometries();++i)
|
||||||
|
{
|
||||||
|
geometry2d const& geom=feature.get_geometry(i);
|
||||||
|
if (geom.num_points() > 2)
|
||||||
|
{
|
||||||
|
path_type path(t_,geom,prj_trans);
|
||||||
|
ras_ptr->add_path(path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
ren.color(agg::rgba8(r, g, b, int(a * sym.get_opacity())));
|
||||||
|
agg::render_scanlines(*ras_ptr, sl, ren);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
template void agg_renderer<image_32>::process(polygon_symbolizer const&,
|
||||||
|
Feature const&,
|
||||||
|
proj_transform const&);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
@ -169,44 +169,6 @@ void agg_renderer<T>::end_layer_processing(layer const&)
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename T>
|
|
||||||
void agg_renderer<T>::process(polygon_symbolizer const& sym,
|
|
||||||
Feature const& feature,
|
|
||||||
proj_transform const& prj_trans)
|
|
||||||
{
|
|
||||||
typedef coord_transform2<CoordTransform,geometry2d> path_type;
|
|
||||||
typedef agg::renderer_base<agg::pixfmt_rgba32_plain> ren_base;
|
|
||||||
typedef agg::renderer_scanline_aa_solid<ren_base> renderer;
|
|
||||||
|
|
||||||
color const& fill_ = sym.get_fill();
|
|
||||||
agg::scanline_u8 sl;
|
|
||||||
|
|
||||||
agg::rendering_buffer buf(pixmap_.raw_data(),width_,height_, width_ * 4);
|
|
||||||
agg::pixfmt_rgba32_plain pixf(buf);
|
|
||||||
|
|
||||||
ren_base renb(pixf);
|
|
||||||
unsigned r=fill_.red();
|
|
||||||
unsigned g=fill_.green();
|
|
||||||
unsigned b=fill_.blue();
|
|
||||||
unsigned a=fill_.alpha();
|
|
||||||
renderer ren(renb);
|
|
||||||
|
|
||||||
ras_ptr->reset();
|
|
||||||
ras_ptr->gamma(agg::gamma_linear(0.0, sym.get_gamma()));
|
|
||||||
|
|
||||||
for (unsigned i=0;i<feature.num_geometries();++i)
|
|
||||||
{
|
|
||||||
geometry2d const& geom=feature.get_geometry(i);
|
|
||||||
if (geom.num_points() > 2)
|
|
||||||
{
|
|
||||||
path_type path(t_,geom,prj_trans);
|
|
||||||
ras_ptr->add_path(path);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
ren.color(agg::rgba8(r, g, b, int(a * sym.get_opacity())));
|
|
||||||
agg::render_scanlines(*ras_ptr, sl, ren);
|
|
||||||
}
|
|
||||||
|
|
||||||
typedef boost::tuple<double,double,double,double> segment_t;
|
typedef boost::tuple<double,double,double,double> segment_t;
|
||||||
bool y_order(segment_t const& first,segment_t const& second)
|
bool y_order(segment_t const& first,segment_t const& second)
|
||||||
{
|
{
|
||||||
|
|
@ -322,112 +284,6 @@ void agg_renderer<T>::process(building_symbolizer const& sym,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename T>
|
|
||||||
void agg_renderer<T>::process(line_symbolizer const& sym,
|
|
||||||
Feature const& feature,
|
|
||||||
proj_transform const& prj_trans)
|
|
||||||
{
|
|
||||||
typedef agg::renderer_base<agg::pixfmt_rgba32_plain> ren_base;
|
|
||||||
typedef coord_transform2<CoordTransform,geometry2d> path_type;
|
|
||||||
typedef agg::renderer_outline_aa<ren_base> renderer_oaa;
|
|
||||||
typedef agg::rasterizer_outline_aa<renderer_oaa> rasterizer_outline_aa;
|
|
||||||
typedef agg::renderer_scanline_aa_solid<ren_base> renderer;
|
|
||||||
|
|
||||||
agg::rendering_buffer buf(pixmap_.raw_data(),width_,height_, width_ * 4);
|
|
||||||
agg::pixfmt_rgba32_plain pixf(buf);
|
|
||||||
|
|
||||||
ren_base renb(pixf);
|
|
||||||
stroke const& stroke_ = sym.get_stroke();
|
|
||||||
color const& col = stroke_.get_color();
|
|
||||||
unsigned r=col.red();
|
|
||||||
unsigned g=col.green();
|
|
||||||
unsigned b=col.blue();
|
|
||||||
unsigned a=col.alpha();
|
|
||||||
renderer ren(renb);
|
|
||||||
ras_ptr->reset();
|
|
||||||
ras_ptr->gamma(agg::gamma_linear());
|
|
||||||
|
|
||||||
agg::scanline_p8 sl;
|
|
||||||
|
|
||||||
for (unsigned i=0;i<feature.num_geometries();++i)
|
|
||||||
{
|
|
||||||
geometry2d const& geom = feature.get_geometry(i);
|
|
||||||
if (geom.num_points() > 1)
|
|
||||||
{
|
|
||||||
path_type path(t_,geom,prj_trans);
|
|
||||||
|
|
||||||
if (stroke_.has_dash())
|
|
||||||
{
|
|
||||||
agg::conv_dash<path_type> dash(path);
|
|
||||||
dash_array const& d = stroke_.get_dash_array();
|
|
||||||
dash_array::const_iterator itr = d.begin();
|
|
||||||
dash_array::const_iterator end = d.end();
|
|
||||||
for (;itr != end;++itr)
|
|
||||||
{
|
|
||||||
dash.add_dash(itr->first * scale_factor_,
|
|
||||||
itr->second * scale_factor_);
|
|
||||||
}
|
|
||||||
|
|
||||||
agg::conv_stroke<agg::conv_dash<path_type > > stroke(dash);
|
|
||||||
|
|
||||||
line_join_e join=stroke_.get_line_join();
|
|
||||||
if ( join == MITER_JOIN)
|
|
||||||
stroke.generator().line_join(agg::miter_join);
|
|
||||||
else if( join == MITER_REVERT_JOIN)
|
|
||||||
stroke.generator().line_join(agg::miter_join);
|
|
||||||
else if( join == ROUND_JOIN)
|
|
||||||
stroke.generator().line_join(agg::round_join);
|
|
||||||
else
|
|
||||||
stroke.generator().line_join(agg::bevel_join);
|
|
||||||
|
|
||||||
line_cap_e cap=stroke_.get_line_cap();
|
|
||||||
if (cap == BUTT_CAP)
|
|
||||||
stroke.generator().line_cap(agg::butt_cap);
|
|
||||||
else if (cap == SQUARE_CAP)
|
|
||||||
stroke.generator().line_cap(agg::square_cap);
|
|
||||||
else
|
|
||||||
stroke.generator().line_cap(agg::round_cap);
|
|
||||||
|
|
||||||
stroke.generator().miter_limit(4.0);
|
|
||||||
stroke.generator().width(stroke_.get_width() * scale_factor_);
|
|
||||||
|
|
||||||
ras_ptr->add_path(stroke);
|
|
||||||
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
agg::conv_stroke<path_type> stroke(path);
|
|
||||||
line_join_e join=stroke_.get_line_join();
|
|
||||||
if ( join == MITER_JOIN)
|
|
||||||
stroke.generator().line_join(agg::miter_join);
|
|
||||||
else if( join == MITER_REVERT_JOIN)
|
|
||||||
stroke.generator().line_join(agg::miter_join);
|
|
||||||
else if( join == ROUND_JOIN)
|
|
||||||
stroke.generator().line_join(agg::round_join);
|
|
||||||
else
|
|
||||||
stroke.generator().line_join(agg::bevel_join);
|
|
||||||
|
|
||||||
line_cap_e cap=stroke_.get_line_cap();
|
|
||||||
if (cap == BUTT_CAP)
|
|
||||||
stroke.generator().line_cap(agg::butt_cap);
|
|
||||||
else if (cap == SQUARE_CAP)
|
|
||||||
stroke.generator().line_cap(agg::square_cap);
|
|
||||||
else
|
|
||||||
stroke.generator().line_cap(agg::round_cap);
|
|
||||||
|
|
||||||
stroke.generator().miter_limit(4.0);
|
|
||||||
stroke.generator().width(stroke_.get_width() * scale_factor_);
|
|
||||||
ras_ptr->add_path(stroke);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
ren.color(agg::rgba8(r, g, b, int(a*stroke_.get_opacity())));
|
|
||||||
agg::render_scanlines(*ras_ptr, sl, ren);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
template <typename T>
|
template <typename T>
|
||||||
void agg_renderer<T>::process(line_pattern_symbolizer const& sym,
|
void agg_renderer<T>::process(line_pattern_symbolizer const& sym,
|
||||||
|
|
@ -709,68 +565,5 @@ void agg_renderer<T>::process(text_symbolizer const& sym,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename T>
|
|
||||||
void agg_renderer<T>::process(glyph_symbolizer const& sym,
|
|
||||||
Feature const& feature,
|
|
||||||
proj_transform const& prj_trans)
|
|
||||||
{
|
|
||||||
face_set_ptr faces = font_manager_.get_face_set(sym.get_face_name());
|
|
||||||
stroker_ptr strk = font_manager_.get_stroker();
|
|
||||||
if (faces->size() > 0 && strk)
|
|
||||||
{
|
|
||||||
// Get x and y from geometry and translate to pixmap coords.
|
|
||||||
double x, y, z=0.0;
|
|
||||||
feature.get_geometry(0).label_position(&x, &y);
|
|
||||||
prj_trans.backward(x,y,z);
|
|
||||||
t_.forward(&x, &y);
|
|
||||||
|
|
||||||
text_renderer<T> ren(pixmap_, faces, *strk);
|
|
||||||
|
|
||||||
// set fill and halo colors
|
|
||||||
color fill = sym.eval_color(feature);
|
|
||||||
ren.set_fill(fill);
|
|
||||||
if (fill != color("transparent")) {
|
|
||||||
ren.set_halo_fill(sym.get_halo_fill());
|
|
||||||
ren.set_halo_radius(sym.get_halo_radius() * scale_factor_);
|
|
||||||
}
|
|
||||||
|
|
||||||
// set font size
|
|
||||||
unsigned size = sym.eval_size(feature);
|
|
||||||
ren.set_pixel_size(size * scale_factor_);
|
|
||||||
faces->set_pixel_sizes(size * scale_factor_);
|
|
||||||
|
|
||||||
// Get and render text path
|
|
||||||
//
|
|
||||||
text_path_ptr path = sym.get_text_path(faces, feature);
|
|
||||||
// apply displacement
|
|
||||||
position pos = sym.get_displacement();
|
|
||||||
double dx = boost::get<0>(pos);
|
|
||||||
double dy = boost::get<1>(pos);
|
|
||||||
path->starting_x = x = x+dx;
|
|
||||||
path->starting_y = y = y+dy;
|
|
||||||
|
|
||||||
// Prepare glyphs to set internal state and calculate the marker's
|
|
||||||
// final box so we can check for a valid placement
|
|
||||||
box2d<double> dim = ren.prepare_glyphs(path.get());
|
|
||||||
double bsize = (dim.width()>dim.height()?dim.width():dim.height())/2;
|
|
||||||
box2d<double> ext(
|
|
||||||
floor(x-bsize), floor(y-bsize), ceil(x+bsize), ceil(y+bsize)
|
|
||||||
);
|
|
||||||
if ((sym.get_allow_overlap() || detector_.has_placement(ext)) &&
|
|
||||||
(!sym.get_avoid_edges() || detector_.extent().contains(ext)))
|
|
||||||
{
|
|
||||||
// Placement is valid, render glyph and update detector.
|
|
||||||
ren.render(x, y);
|
|
||||||
detector_.insert(ext);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
throw config_error(
|
|
||||||
"Unable to find specified font face in GlyphSymbolizer"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
template class agg_renderer<image_32>;
|
template class agg_renderer<image_32>;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue