+ add dash_offset
This commit is contained in:
Artem Pavlenko
parent
ca20f80ea8
commit
f776f8cd1e
1 changed files with 129 additions and 115 deletions
244
src/stroke.cpp
244
src/stroke.cpp
|
|
@ -25,21 +25,21 @@
|
|||
namespace mapnik
|
||||
{
|
||||
|
||||
static const char * line_cap_strings[] = {
|
||||
"butt",
|
||||
"square",
|
||||
"round",
|
||||
""
|
||||
};
|
||||
static const char * line_cap_strings[] = {
|
||||
"butt",
|
||||
"square",
|
||||
"round",
|
||||
""
|
||||
};
|
||||
|
||||
|
||||
static const char * line_join_strings[] = {
|
||||
"miter",
|
||||
"miter_revert",
|
||||
"round",
|
||||
"bevel",
|
||||
""
|
||||
};
|
||||
static const char * line_join_strings[] = {
|
||||
"miter",
|
||||
"miter_revert",
|
||||
"round",
|
||||
"bevel",
|
||||
""
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -49,109 +49,123 @@ IMPLEMENT_ENUM( mapnik::line_join_e, line_join_strings );
|
|||
|
||||
namespace mapnik
|
||||
{
|
||||
stroke::stroke()
|
||||
: c_(0,0,0),
|
||||
width_(1.0),
|
||||
opacity_(1.0),
|
||||
line_cap_(BUTT_CAP),
|
||||
line_join_(MITER_JOIN),
|
||||
dash_() {}
|
||||
stroke::stroke()
|
||||
: c_(0,0,0),
|
||||
width_(1.0),
|
||||
opacity_(1.0),
|
||||
line_cap_(BUTT_CAP),
|
||||
line_join_(MITER_JOIN),
|
||||
dash_(),
|
||||
dash_offset_(0) {}
|
||||
|
||||
stroke::stroke(color const& c, float width)
|
||||
: c_(c),
|
||||
width_(width),
|
||||
opacity_(1.0),
|
||||
line_cap_(BUTT_CAP),
|
||||
line_join_(MITER_JOIN),
|
||||
dash_() {}
|
||||
stroke::stroke(color const& c, double width)
|
||||
: c_(c),
|
||||
width_(width),
|
||||
opacity_(1.0),
|
||||
line_cap_(BUTT_CAP),
|
||||
line_join_(MITER_JOIN),
|
||||
dash_(),
|
||||
dash_offset_(0.0) {}
|
||||
|
||||
stroke::stroke(stroke const& other)
|
||||
: c_(other.c_),
|
||||
width_(other.width_),
|
||||
opacity_(other.opacity_),
|
||||
line_cap_(other.line_cap_),
|
||||
line_join_(other.line_join_),
|
||||
dash_(other.dash_) {}
|
||||
stroke::stroke(stroke const& other)
|
||||
: c_(other.c_),
|
||||
width_(other.width_),
|
||||
opacity_(other.opacity_),
|
||||
line_cap_(other.line_cap_),
|
||||
line_join_(other.line_join_),
|
||||
dash_(other.dash_),
|
||||
dash_offset_(other.dash_offset_) {}
|
||||
|
||||
stroke & stroke::operator=(const stroke& rhs)
|
||||
{
|
||||
stroke tmp(rhs);
|
||||
swap(tmp);
|
||||
return *this;
|
||||
}
|
||||
|
||||
void stroke::set_color(const color& c)
|
||||
{
|
||||
c_=c;
|
||||
}
|
||||
|
||||
color const& stroke::get_color() const
|
||||
{
|
||||
return c_;
|
||||
}
|
||||
|
||||
float stroke::get_width() const
|
||||
{
|
||||
return width_;
|
||||
}
|
||||
void stroke::set_width(float w)
|
||||
{
|
||||
width_=w;
|
||||
}
|
||||
|
||||
void stroke::set_opacity(float opacity)
|
||||
{
|
||||
if (opacity > 1.0) opacity_=1.0;
|
||||
else if (opacity < 0.0) opacity_=0.0;
|
||||
else opacity_=opacity;
|
||||
}
|
||||
|
||||
float stroke::get_opacity() const
|
||||
{
|
||||
return opacity_;
|
||||
}
|
||||
|
||||
void stroke::set_line_cap(line_cap_e line_cap)
|
||||
{
|
||||
line_cap_=line_cap;
|
||||
}
|
||||
|
||||
line_cap_e stroke::get_line_cap() const
|
||||
{
|
||||
return line_cap_;
|
||||
}
|
||||
|
||||
void stroke::set_line_join(line_join_e line_join)
|
||||
{
|
||||
line_join_=line_join;
|
||||
}
|
||||
|
||||
line_join_e stroke::get_line_join() const
|
||||
{
|
||||
return line_join_;
|
||||
}
|
||||
|
||||
void stroke::add_dash(float dash,float gap)
|
||||
{
|
||||
dash_.push_back(std::make_pair(dash,gap));
|
||||
}
|
||||
bool stroke::has_dash() const
|
||||
{
|
||||
return ! dash_.empty();
|
||||
}
|
||||
|
||||
dash_array const& stroke::get_dash_array() const
|
||||
{
|
||||
return dash_;
|
||||
}
|
||||
|
||||
void stroke::swap(const stroke& other) throw()
|
||||
{
|
||||
c_=other.c_;
|
||||
width_=other.width_;
|
||||
opacity_=other.opacity_;
|
||||
line_cap_=other.line_cap_;
|
||||
line_join_=other.line_join_;
|
||||
dash_ = other.dash_;
|
||||
}
|
||||
stroke & stroke::operator=(const stroke& rhs)
|
||||
{
|
||||
stroke tmp(rhs);
|
||||
swap(tmp);
|
||||
return *this;
|
||||
}
|
||||
|
||||
void stroke::set_color(const color& c)
|
||||
{
|
||||
c_=c;
|
||||
}
|
||||
|
||||
color const& stroke::get_color() const
|
||||
{
|
||||
return c_;
|
||||
}
|
||||
|
||||
double stroke::get_width() const
|
||||
{
|
||||
return width_;
|
||||
}
|
||||
void stroke::set_width(double w)
|
||||
{
|
||||
width_=w;
|
||||
}
|
||||
|
||||
void stroke::set_opacity(double opacity)
|
||||
{
|
||||
if (opacity > 1.0) opacity_=1.0;
|
||||
else if (opacity < 0.0) opacity_=0.0;
|
||||
else opacity_=opacity;
|
||||
}
|
||||
|
||||
double stroke::get_opacity() const
|
||||
{
|
||||
return opacity_;
|
||||
}
|
||||
|
||||
void stroke::set_line_cap(line_cap_e line_cap)
|
||||
{
|
||||
line_cap_=line_cap;
|
||||
}
|
||||
|
||||
line_cap_e stroke::get_line_cap() const
|
||||
{
|
||||
return line_cap_;
|
||||
}
|
||||
|
||||
void stroke::set_line_join(line_join_e line_join)
|
||||
{
|
||||
line_join_=line_join;
|
||||
}
|
||||
|
||||
line_join_e stroke::get_line_join() const
|
||||
{
|
||||
return line_join_;
|
||||
}
|
||||
|
||||
void stroke::add_dash(double dash, double gap)
|
||||
{
|
||||
dash_.push_back(std::make_pair(dash,gap));
|
||||
}
|
||||
|
||||
bool stroke::has_dash() const
|
||||
{
|
||||
return ! dash_.empty();
|
||||
}
|
||||
|
||||
void stroke::set_dash_offset(double offset)
|
||||
{
|
||||
dash_offset_ = offset;
|
||||
}
|
||||
|
||||
double stroke::dash_offset() const
|
||||
{
|
||||
return dash_offset_;
|
||||
}
|
||||
|
||||
dash_array const& stroke::get_dash_array() const
|
||||
{
|
||||
return dash_;
|
||||
}
|
||||
|
||||
void stroke::swap(const stroke& other) throw()
|
||||
{
|
||||
c_=other.c_;
|
||||
width_=other.width_;
|
||||
opacity_=other.opacity_;
|
||||
line_cap_=other.line_cap_;
|
||||
line_join_=other.line_join_;
|
||||
dash_ = other.dash_;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue