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

grid_renderer: rename step->resolution

Browse source
This commit is contained in:
Dane Springmeyer 2011-06-04 00:16:16 +00:00
parent ef6af65f17
commit 7da40e3700
4 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/grid/process_markers_symbolizer.cpp
View file

@ -70,7 +70,7 @@ void grid_renderer<T>::process(markers_symbolizer const& sym,
agg::trans_affine tr;
boost::array<double,6> const& m = sym.get_transform();
tr.load_from(&m[0]);
tr = agg::trans_affine_scaling(scale_factor_*(1.0/pixmap_.get_step())) * tr;
tr = agg::trans_affine_scaling(scale_factor_*(1.0/pixmap_.get_resolution())) * tr;
std::string filename = path_processor_type::evaluate(*sym.get_filename(), feature);
marker_placement_e placement_method = sym.get_marker_placement();
marker_type_e marker_type = sym.get_marker_type();
@ -133,9 +133,9 @@ void grid_renderer<T>::process(markers_symbolizer const& sym,
double strk_width = stroke_.get_width();
// clamp to at least 4 px otherwise interactive pixels can be too small
double min = static_cast<double>(4/pixmap_.get_step());
double w = std::max(sym.get_width()/pixmap_.get_step(),min);
double h = std::max(sym.get_height()/pixmap_.get_step(),min);
double min = static_cast<double>(4/pixmap_.get_resolution());
double w = std::max(sym.get_width()/pixmap_.get_resolution(),min);
double h = std::max(sym.get_height()/pixmap_.get_resolution(),min);
arrow arrow_;
box2d<double> extent;

6
src/grid/process_point_symbolizer.cpp
View file

@ -68,8 +68,8 @@ void grid_renderer<T>::process(point_symbolizer const& sym,
prj_trans.backward(x,y,z);
t_.forward(&x,&y);
int w = (*marker)->width() * (1.0/pixmap_.get_step());
int h = (*marker)->height() * (1.0/pixmap_.get_step());
int w = (*marker)->width() * (1.0/pixmap_.get_resolution());
int h = (*marker)->height() * (1.0/pixmap_.get_resolution());
int px = int(floor(x - 0.5 * w));
int py = int(floor(y - 0.5 * h));
@ -81,7 +81,7 @@ void grid_renderer<T>::process(point_symbolizer const& sym,
boost::array<double,6> const& m = sym.get_transform();
tr.load_from(&m[0]);
render_marker(feature,pixmap_.get_step(),px,py,**marker,tr, sym.get_opacity());
render_marker(feature,pixmap_.get_resolution(),px,py,**marker,tr, sym.get_opacity());
if (!sym.get_ignore_placement())
detector_.insert(label_ext);

10
src/grid/process_shield_symbolizer.cpp
View file

@ -109,7 +109,7 @@ void grid_renderer<T>::process(shield_symbolizer const& sym,
{
text_renderer<T> ren(pixmap_, faces, *strk);
ren.set_pixel_size(sym.get_text_size() * scale_factor_ * (1.0/pixmap_.get_step()));
ren.set_pixel_size(sym.get_text_size() * scale_factor_ * (1.0/pixmap_.get_resolution()));
ren.set_fill(sym.get_fill());
ren.set_halo_fill(sym.get_halo_fill());
ren.set_halo_radius(sym.get_halo_radius() * scale_factor_);
@ -122,8 +122,8 @@ void grid_renderer<T>::process(shield_symbolizer const& sym,
faces->get_string_info(info);
// TODO- clamp to at least 4 px otherwise interactivity is too small
int w = (*marker)->width()/pixmap_.get_step();
int h = (*marker)->height()/pixmap_.get_step();
int w = (*marker)->width()/pixmap_.get_resolution();
int h = (*marker)->height()/pixmap_.get_resolution();
for (unsigned i = 0; i < feature.num_geometries(); ++i)
{
@ -193,7 +193,7 @@ void grid_renderer<T>::process(shield_symbolizer const& sym,
if ( sym.get_allow_overlap() || detector_.has_placement(label_ext) )
{
render_marker(feature,pixmap_.get_step(),px,py,**marker,tr,sym.get_opacity());
render_marker(feature,pixmap_.get_resolution(),px,py,**marker,tr,sym.get_opacity());
box2d<double> dim = ren.prepare_glyphs(&text_placement.placements[0]);
ren.render_id(feature.id(),x,y,2);
@ -223,7 +223,7 @@ void grid_renderer<T>::process(shield_symbolizer const& sym,
int px=int(floor(lx - (0.5*w)));
int py=int(floor(ly - (0.5*h)));
render_marker(feature,pixmap_.get_step(),px,py,**marker,tr,sym.get_opacity());
render_marker(feature,pixmap_.get_resolution(),px,py,**marker,tr,sym.get_opacity());
box2d<double> dim = ren.prepare_glyphs(&text_placement.placements[ii]);
ren.render_id(feature.id(),x,y,2);

4
src/grid/process_text_symbolizer.cpp
View file

@ -76,13 +76,13 @@ void grid_renderer<T>::process(text_symbolizer const& sym,
throw config_error("Unable to find specified font face '" + sym.get_face_name() + "'");
}
text_renderer<T> ren(pixmap_, faces, *strk);
ren.set_pixel_size(placement_options->text_size * (scale_factor_ * (1.0/pixmap_.get_step())));
ren.set_pixel_size(placement_options->text_size * (scale_factor_ * (1.0/pixmap_.get_resolution())));
ren.set_fill(fill);
ren.set_halo_fill(sym.get_halo_fill());
ren.set_halo_radius(sym.get_halo_radius() * scale_factor_);
ren.set_opacity(sym.get_text_opacity());
// /pixmap_.get_step() ?
// /pixmap_.get_resolution() ?
box2d<double> dims(0,0,width_,height_);
placement_finder<label_collision_detector4> finder(detector_,dims);