remove debug output and get logic correct to cause first render to always use the...

[ardour.git] / libs / canvas / poly_line.cc

diff --git a/libs/canvas/poly_line.cc b/libs/canvas/poly_line.cc
index 7118e47555d1e74d0f03752e5855ffe8fbd2d8c5..3150907db6f17aec5fec9f16e362444bac54ff99 100644 (file)
--- a/libs/canvas/poly_line.cc
+++ b/libs/canvas/poly_line.cc
@@ -25,11 +25,16 @@
 
 using namespace ArdourCanvas;
 
-PolyLine::PolyLine (Group* parent)
-       : Item (parent)
-       , PolyItem (parent)
+PolyLine::PolyLine (Canvas* c)
+       : PolyItem (c)
+       , _threshold (1.0)
 {
+}
 
+PolyLine::PolyLine (Item* parent)
+       : PolyItem (parent)
+       , _threshold (1.0)
+{
 }
 
 void
@@ -42,10 +47,34 @@ 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();
        
@@ -58,8 +87,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) {
 
@@ -82,10 +110,10 @@ PolyLine::covers (Duple const & point) const
                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;
                }
                
@@ -93,3 +121,9 @@ PolyLine::covers (Duple const & point) const
        
        return false;
 }
+
+void
+PolyLine::set_covers_threshold (double t)
+{
+       _threshold = t;
+}