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

debug_symbolizer - update to use mapnik-geometry

Browse source
This commit is contained in:
artemp 2015-03-19 12:30:21 +01:00
parent 8de2621b99
commit 3bbb9a24f1
2 changed files with 79 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
src/agg/process_debug_symbolizer.cpp
View file

@ -27,9 +27,11 @@
#include <mapnik/symbolizer.hpp>
#include <mapnik/label_collision_detector.hpp>
#include <mapnik/image_util.hpp>
#include <mapnik/vertex_processor.hpp>
namespace mapnik {
namespace {
template <typename T>
void draw_rect(T &pixmap, box2d<double> const& box)
{
@ -50,6 +52,42 @@ void draw_rect(T &pixmap, box2d<double> const& box)
}
}
template <typename Pixmap>
struct apply_vertex_mode
{
apply_vertex_mode(Pixmap & pixmap, view_transform const& t, proj_transform const& prj_trans)
: pixmap_(pixmap),
t_(t),
prj_trans_(prj_trans) {}
template <typename Adapter>
void operator() (Adapter const& va) const
{
double x;
double y;
double z = 0;
va.rewind(0);
unsigned cmd = SEG_END;
while ((cmd = va.vertex(&x, &y)) != mapnik::SEG_END)
{
if (cmd == SEG_CLOSE) continue;
prj_trans_.backward(x,y,z);
t_.forward(&x,&y);
mapnik::set_pixel(pixmap_,x,y,0xff0000ff);
mapnik::set_pixel(pixmap_,x-1,y-1,0xff0000ff);
mapnik::set_pixel(pixmap_,x+1,y+1,0xff0000ff);
mapnik::set_pixel(pixmap_,x-1,y+1,0xff0000ff);
mapnik::set_pixel(pixmap_,x+1,y-1,0xff0000ff);
}
}
Pixmap & pixmap_;
view_transform const& t_;
proj_transform const& prj_trans_;
};
} // anonymous namespace
template <typename T0, typename T1>
void agg_renderer<T0,T1>::process(debug_symbolizer const& sym,
mapnik::feature_impl & feature,
@ -69,29 +107,9 @@ void agg_renderer<T0,T1>::process(debug_symbolizer const& sym,
}
else if (mode == DEBUG_SYM_MODE_VERTEX)
{
// FIXME
/*
for (auto const& geom : feature.paths())
{
double x;
double y;
double z = 0;
vertex_adapter va(geom);
va.rewind(0);
unsigned cmd = 1;
while ((cmd = va.vertex(&x, &y)) != mapnik::SEG_END)
{
if (cmd == SEG_CLOSE) continue;
prj_trans.backward(x,y,z);
common_.t_.forward(&x,&y);
mapnik::set_pixel(pixmap_,x,y,0xff0000ff);
mapnik::set_pixel(pixmap_,x-1,y-1,0xff0000ff);
mapnik::set_pixel(pixmap_,x+1,y+1,0xff0000ff);
mapnik::set_pixel(pixmap_,x-1,y+1,0xff0000ff);
mapnik::set_pixel(pixmap_,x+1,y-1,0xff0000ff);
}
}
*/
using apply_vertex_mode = apply_vertex_mode<buffer_type>;
apply_vertex_mode apply(pixmap_, common_.t_, prj_trans);
util::apply_visitor(new_geometry::vertex_processor<apply_vertex_mode>(apply), feature.get_geometry());
}
}

61
src/cairo/process_debug_symbolizer.cpp
View file

@ -25,6 +25,7 @@
// mapnik
#include <mapnik/feature.hpp>
#include <mapnik/symbolizer.hpp>
#include <mapnik/vertex_processor.hpp>
#include <mapnik/proj_transform.hpp>
#include <mapnik/cairo/cairo_renderer.hpp>
#include <mapnik/label_collision_detector.hpp>
@ -50,6 +51,40 @@ inline void render_debug_box(cairo_context &context, box2d<double> const& b)
context.stroke();
}
template <typename Context>
struct apply_vertex_mode
{
apply_vertex_mode(Context & context, view_transform const& t, proj_transform const& prj_trans)
: context_(context),
t_(t),
prj_trans_(prj_trans) {}
template <typename Adapter>
void operator() (Adapter const& va) const
{
double x;
double y;
double z = 0;
va.rewind(0);
unsigned cmd = SEG_END;
while ((cmd = va.vertex(&x, &y)) != mapnik::SEG_END)
{
if (cmd == SEG_CLOSE) continue;
prj_trans_.backward(x,y,z);
t_.forward(&x,&y);
context_.move_to(std::floor(x) - 0.5, std::floor(y) + 0.5);
context_.line_to(std::floor(x) + 1.5, std::floor(y) + 0.5);
context_.move_to(std::floor(x) + 0.5, std::floor(y) - 0.5);
context_.line_to(std::floor(x) + 0.5, std::floor(y) + 1.5);
context_.stroke();
}
}
Context & context_;
view_transform const& t_;
proj_transform const& prj_trans_;
};
} // anonymous namespace
template <typename T>
@ -80,29 +115,9 @@ void cairo_renderer<T>::process(debug_symbolizer const& sym,
}
else if (mode == DEBUG_SYM_MODE_VERTEX)
{
// FIXME
#if 0
for (auto const& geom : feature.paths())
{
double x;
double y;
double z = 0;
vertex_adapter va(geom);
va.rewind(0);
unsigned cmd = 1;
while ((cmd = va.vertex(&x, &y)) != mapnik::SEG_END)
{
if (cmd == SEG_CLOSE) continue;
prj_trans.backward(x,y,z);
common_.t_.forward(&x,&y);
context_.move_to(std::floor(x) - 0.5, std::floor(y) + 0.5);
context_.line_to(std::floor(x) + 1.5, std::floor(y) + 0.5);
context_.move_to(std::floor(x) + 0.5, std::floor(y) - 0.5);
context_.line_to(std::floor(x) + 0.5, std::floor(y) + 1.5);
context_.stroke();
}
}
#endif
using apply_vertex_mode = apply_vertex_mode<cairo_context>;
apply_vertex_mode apply(context_, common_.t_, prj_trans);
util::apply_visitor(new_geometry::vertex_processor<apply_vertex_mode>(apply), feature.get_geometry());
}
}