smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-11 07:56:27 +01:00
Code Issues Projects Releases Wiki Activity

add fill-area feature to poly-line

Browse source
This commit is contained in:
Robin Gareus 2016-07-05 00:39:39 +02:00
parent b6ccf0e223
commit 17b162c5da
3 changed files with 55 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/canvas/canvas/poly_item.h
View file

@ -32,7 +32,7 @@ public:
PolyItem (Canvas*);
PolyItem (Item*);
void compute_bounding_box () const;
virtual void compute_bounding_box () const;
virtual void set (Points const &);
Points const & get () const;

10
libs/canvas/canvas/poly_line.h
View file

@ -28,15 +28,16 @@ namespace ArdourCanvas {
class LIBCANVAS_API PolyLine : public PolyItem
{
public:
public:
PolyLine (Canvas*);
PolyLine (Item*);
void render (Rect const & area, Cairo::RefPtr<Cairo::Context>) const;
virtual void set_steps (Points const &, bool stepped);
virtual void compute_bounding_box () const;
bool covers (Duple const &) const;
bool covers (Duple const &) const;
/**
* Set the distance at which a point will be considered to be covered
* by the line. For the definition of "distance" see
@ -44,8 +45,11 @@ class LIBCANVAS_API PolyLine : public PolyItem
*/
void set_covers_threshold (double);
private:
void set_fill_y1 (double);
private:
double _threshold;
double _y1;
};
}

47
libs/canvas/poly_line.cc
View file

@ -28,6 +28,7 @@ using namespace ArdourCanvas;
PolyLine::PolyLine (Canvas* c)
: PolyItem (c)
, _threshold (1.0)
, _y1 (0)
{
}
@ -37,9 +38,55 @@ PolyLine::PolyLine (Item* parent)
{
}
void
PolyLine::compute_bounding_box () const
{
PolyItem::compute_bounding_box ();
if (_y1 > 0 && _bounding_box) {
_bounding_box.get().x0 = 0;
_bounding_box.get().x1 = COORD_MAX;
if (_y1 > _bounding_box.get().y1) {
_bounding_box.get().y1 = _y1;
}
}
}
void
PolyLine::set_fill_y1 (double y1) {
begin_change ();
_bounding_box_dirty = true;
_y1 = y1;
end_change ();
}
void
PolyLine::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
{
if (_fill && _y1 > 0 && _points.size() > 0) {
const ArdourCanvas::Rect& vp (_canvas->visible_area());
setup_fill_context (context);
Duple y (0, _y1);
float y1 = item_to_window (y).y;
render_path (area, context);
Duple c0 (item_to_window (_points.back()));
Duple c1 (item_to_window (_points.front()));
if (c0.x < vp.x1) {
context->line_to (vp.x1, c0.y);
context->line_to (vp.x1, y1);
} else {
context->line_to (vp.x1, y1);
}
if (c1.x > vp.x0) {
context->line_to (vp.x0, y1);
context->line_to (vp.x0, c1.y);
} else {
context->line_to (vp.x0, y1);
}
context->close_path ();
context->fill ();
}
if (_outline) {
setup_outline_context (context);
render_path (area, context);