Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

set clipping off by default for markers, shields, and text #1608

Closed
wants to merge 2 commits into from
Closed

set clipping off by default for markers, shields, and text #1608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7138812
set clipping off by default for markers, shields, and text (point/bui…
Nov 29, 2012
106ce42
merge with master updates
May 20, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/markers_symbolizer.cpp
View file
Open in desktop
Expand Up @@ -59,7 +59,10 @@ markers_symbolizer::markers_symbolizer()
marker_p_(MARKER_POINT_PLACEMENT),
// TODO: consider defaulting to MARKER_WHOLE_MULTI,
// for backward compatibility with 2.0.0
marker_mp_(MARKER_EACH_MULTI) { }
marker_mp_(MARKER_EACH_MULTI)
{
this->set_clip(false);
}

markers_symbolizer::markers_symbolizer(path_expression_ptr const& filename)
: symbolizer_with_image(filename),
Expand All @@ -73,7 +76,10 @@ markers_symbolizer::markers_symbolizer(path_expression_ptr const& filename)
marker_p_(MARKER_POINT_PLACEMENT),
// TODO: consider defaulting to MARKER_WHOLE_MULTI,
// for backward compatibility with 2.0.0
marker_mp_(MARKER_EACH_MULTI) { }
marker_mp_(MARKER_EACH_MULTI)
{
this->set_clip(false);
}

markers_symbolizer::markers_symbolizer(markers_symbolizer const& rhs)
: symbolizer_with_image(rhs),
Expand Down
3 changes: 3 additions & 0 deletions src/shield_symbolizer.cpp
View file
Open in desktop
Expand Up @@ -37,6 +37,7 @@ shield_symbolizer::shield_symbolizer(text_placements_ptr placements)
unlock_image_(false),
shield_displacement_(0,0)
{
this->set_clip(false);
}

shield_symbolizer::shield_symbolizer(
Expand All @@ -50,6 +51,7 @@ shield_symbolizer::shield_symbolizer(
unlock_image_(false),
shield_displacement_(0, 0)
{
this->set_clip(false);
}

shield_symbolizer::shield_symbolizer(
Expand All @@ -62,6 +64,7 @@ shield_symbolizer::shield_symbolizer(
unlock_image_(false),
shield_displacement_(0, 0)
{
this->set_clip(false);
}

void shield_symbolizer::set_unlock_image(bool unlock_image)
Expand Down
4 changes: 3 additions & 1 deletion src/text_symbolizer.cpp
View file
Open in desktop
Expand Up @@ -104,7 +104,7 @@ text_symbolizer::text_symbolizer(text_placements_ptr placements)
placement_options_(placements),
halo_rasterizer_(HALO_RASTERIZER_FULL)
{

this->set_clip(false);
}

text_symbolizer::text_symbolizer(expression_ptr name, std::string const& face_name,
Expand All @@ -118,6 +118,7 @@ text_symbolizer::text_symbolizer(expression_ptr name, std::string const& face_na
set_face_name(face_name);
set_text_size(size);
set_fill(fill);
this->set_clip(false);
}

text_symbolizer::text_symbolizer(expression_ptr name, float size, color const& fill,
Expand All @@ -129,6 +130,7 @@ text_symbolizer::text_symbolizer(expression_ptr name, float size, color const& f
set_name(name);
set_text_size(size);
set_fill(fill);
this->set_clip(false);
}

text_symbolizer::text_symbolizer(text_symbolizer const& rhs)
Expand Down