X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fcanvas%2Fpoly_line.cc;h=99c3377874ada0463461c24bd341cba224031fff;hb=6ad4379b4d2d9751c1e36d01ed6871d63447043f;hp=7118e47555d1e74d0f03752e5855ffe8fbd2d8c5;hpb=c0e6f8e4c324c3f44613949b59acd9e864ab263d;p=ardour.git

diff --git a/libs/canvas/poly_line.cc b/libs/canvas/poly_line.cc
index 7118e47555..99c3377874 100644
--- a/libs/canvas/poly_line.cc
+++ b/libs/canvas/poly_line.cc
@@ -25,16 +25,69 @@
 
 using namespace ArdourCanvas;
 
-PolyLine::PolyLine (Group* parent)
-	: Item (parent)
-	, PolyItem (parent)
+PolyLine::PolyLine (Canvas* c)
+	: PolyItem (c)
+	, _threshold (1.0)
+	, _y1 (0)
 {
+}
+
+PolyLine::PolyLine (Item* parent)
+	: PolyItem (parent)
+	, _threshold (1.0)
+	, _y1 (0)
+{
+}
+
+void
+PolyLine::compute_bounding_box () const
+{
+	PolyItem::compute_bounding_box ();
+	if (_y1 > 0 && _bounding_box) {
+		_bounding_box.x0 = 0;
+		_bounding_box.x1 = COORD_MAX;
+		if (_y1 > _bounding_box.y1) {
+			_bounding_box.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);
@@ -42,13 +95,37 @@ PolyLine::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) cons
 	}
 }
 
+void
+PolyLine::set_steps (Points const & points, bool stepped)
+{
+	if (!stepped) {
+		PolyItem::set(points);
+		return;
+	}
+
+	Points copy;
+	for (Points::const_iterator p = points.begin(); p != points.end();) {
+		Points::const_iterator next = p;
+		++next;
+
+		copy.push_back(*p);
+		if (next != points.end() && next->x != p->x) {
+			copy.push_back(Duple(next->x, p->y));
+		}
+
+		p = next;
+	}
+
+	PolyItem::set(copy);
+}
+
 bool
 PolyLine::covers (Duple const & point) const
 {
-	Duple p = canvas_to_item (point);
+	Duple p = window_to_item (point);
 
 	const Points::size_type npoints = _points.size();
-	
+
 	if (npoints < 2) {
 		return false;
 	}
@@ -58,8 +135,7 @@ PolyLine::covers (Duple const & point) const
 
 	/* repeat for each line segment */
 
-	const Rect visible (_canvas->visible_area());
-	static const double threshold = 2.0;
+	const Rect visible (window_to_item (_canvas->visible_area()));
 
 	for (i = 1, j = 0; i < npoints; ++i, ++j) {
 
@@ -67,29 +143,35 @@ PolyLine::covers (Duple const & point) const
 		double t;
 		Duple a (_points[j]);
 		Duple b (_points[i]);
-		
+
 		/*
 		  Clamp the line endpoints to the visible area of the canvas. If we do
 		  not do this, we may have a line segment extending to COORD_MAX and our
 		  math goes wrong.
 		*/
-		
+
 		a.x = std::min (a.x, visible.x1);
 		a.y = std::min (a.y, visible.y1);
 		b.x = std::min (b.x, visible.x1);
 		b.y = std::min (b.y, visible.y1);
-		
+
 		double d = distance_to_segment_squared (p, a, b, t, at);
-		
+
 		if (t < 0.0 || t > 1.0) {
-			return false;
+			continue;
 		}
-		
-		if (d < threshold) {
+
+		if (d < _threshold + _outline_width) {
 			return true;
 		}
-		
+
 	}
-	
+
 	return false;
 }
+
+void
+PolyLine::set_covers_threshold (double t)
+{
+	_threshold = t;
+}