add a guess at appropriate color management for note velocity display

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

diff --git a/libs/canvas/line_set.cc b/libs/canvas/line_set.cc
index dc9f54e10b7adad5aff5949d28cdac95d77789ca..d58cb900b62f57acc297bdb95545c90778e0f940 100644 (file)
--- a/libs/canvas/line_set.cc
+++ b/libs/canvas/line_set.cc
@@ -18,47 +18,69 @@
 */
 
 #include "canvas/line_set.h"
-#include "canvas/utils.h"
 
 using namespace std;
 using namespace ArdourCanvas;
 
-/* XXX: hard-wired to horizontal only */
-
 class LineSorter {
 public:
-       bool operator() (LineSet::Line& a, LineSet::Line& b) {
-               return a.y < b.y;
+       bool operator() (LineSet::Line const & a, LineSet::Line const & b) {
+               return a.pos < b.pos;
        }
 };
 
-LineSet::LineSet (Group* parent)
-       : Item (parent)
-       , _height (0)
+LineSet::LineSet (Canvas* c, Orientation o)
+       : Item (c)
+       , _extent (0)
+       , _orientation (o)
 {
 
 }
 
+LineSet::LineSet (Item* parent, Orientation o)
+       : Item (parent)
+       , _extent (0)
+       , _orientation (o)
+{
+
+}
 
 void
 LineSet::compute_bounding_box () const
 {
        if (_lines.empty ()) {
-               _bounding_box = boost::optional<Rect> ();
+               _bounding_box = Rect ();
        } else {
-               _bounding_box = Rect (0, _lines.front().y - (_lines.front().width/2.0), COORD_MAX, min (_height, _lines.back().y - (_lines.back().width/2.0)));
+
+               if (_orientation == Horizontal) {
+
+                       _bounding_box = Rect (0, /* x0 */
+                                             _lines.front().pos - (_lines.front().width/2.0), /* y0 */
+                                             _extent, /* x1 */
+                                             _lines.back().pos - (_lines.back().width/2.0) /* y1 */
+                               );
+
+               } else {
+
+                       _bounding_box = Rect (_lines.front().pos - _lines.front().width/2.0, /* x0 */
+                                             0, /* y0 */
+                                             _lines.back().pos + _lines.back().width/2.0, /* x1 */
+                                             _extent /* y1 */
+                               );
+               }
        }
+
        _bounding_box_dirty = false;
 }
 
 void
-LineSet::set_height (Distance height)
+LineSet::set_extent (Distance e)
 {
        begin_change ();
 
-       _height = height;
-
+       _extent = e;
        _bounding_box_dirty = true;
+
        end_change ();
 }
 
@@ -67,30 +89,53 @@ LineSet::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
 {
        /* area is in window coordinates */
 
-       for (list<Line>::const_iterator i = _lines.begin(); i != _lines.end(); ++i) {
+       for (vector<Line>::const_iterator i = _lines.begin(); i != _lines.end(); ++i) {
 
-               Rect self = item_to_window (Rect (0, i->y - (i->width/2.0), COORD_MAX, i->y + (i->width/2.0)));
-               boost::optional<Rect> intersect = self.intersection (area);
-                       
-               if (!intersect) {
-                       continue;       
+               Rect self;
+
+               if (_orientation == Horizontal) {
+                       self = item_to_window (Rect (0, i->pos - (i->width/2.0), _extent, i->pos + (i->width/2.0)));
+               } else {
+                       self = item_to_window (Rect (i->pos - (i->width/2.0), 0, i->pos + (i->width/2.0), _extent));
+               }
+
+               Rect isect = self.intersection (area);
+
+               if (!isect) {
+                       continue;
                }
 
-               set_source_rgba (context, i->color);
+               Rect intersection (isect);
+
+               Gtkmm2ext::set_source_rgba (context, i->color);
                context->set_line_width (i->width);
-               context->move_to (intersect->x0, self.y0 + ((self.y1 - self.y0)/2.0));
-               context->line_to (intersect->x1, self.y0 + ((self.y1 - self.y0)/2.0));
+
+               /* Not 100% sure that the computation of the invariant
+                * positions (y and x) below work correctly if the line width
+                * is not 1.0, but visual inspection suggests it is OK.
+                */
+
+               if (_orientation == Horizontal) {
+                       double y = self.y0 + ((self.y1 - self.y0)/2.0);
+                       context->move_to (intersection.x0, y);
+                       context->line_to (intersection.x1, y);
+               } else {
+                       double x = self.x0 + ((self.x1 - self.x0)/2.0);
+                       context->move_to (x, intersection.y0);
+                       context->line_to (x, intersection.y1);
+               }
+
                context->stroke ();
        }
 }
 
 void
-LineSet::add (Coord y, Distance width, Color color)
+LineSet::add (Coord y, Distance width, Gtkmm2ext::Color color)
 {
        begin_change ();
-       
+
        _lines.push_back (Line (y, width, color));
-       _lines.sort (LineSorter ());
+       sort (_lines.begin(), _lines.end(), LineSorter());
 
        _bounding_box_dirty = true;
        end_change ();
@@ -104,3 +149,15 @@ LineSet::clear ()
        _bounding_box_dirty = true;
        end_change ();
 }
+
+bool
+LineSet::covers (Duple const & /*point*/) const
+{
+       /* lines are ordered by position along primary axis, so binary search
+        * to find the place to start looking.
+        *
+        * XXX but not yet.
+        */
+
+       return false;
+}