Better fix for 6183.

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

diff --git a/libs/canvas/canvas/line_set.h b/libs/canvas/canvas/line_set.h
index ec27e6a72e3aef11fbca4a613cbcb3252ab8c3d7..fad100fdf9dd58521978418e6dbf184be8e90b33 100644 (file)
--- a/libs/canvas/canvas/line_set.h
+++ b/libs/canvas/canvas/line_set.h
@@ -1,8 +1,33 @@
+/*
+    Copyright (C) 2011-2013 Paul Davis
+    Author: Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __CANVAS_LINESET_H__
+#define __CANVAS_LINESET_H__
+
+#include <vector>
+
+#include "canvas/visibility.h"
 #include "canvas/item.h"
 
 namespace ArdourCanvas {
 
-class LineSet : public Item
+class LIBCANVAS_API LineSet : public Item
 {
 public:
        enum Orientation {
@@ -10,29 +35,34 @@ public:
                Horizontal
        };
 
-       LineSet (Group *);
+       LineSet (Canvas*, Orientation o = Vertical);
+       LineSet (Item*, Orientation o = Vertical);
 
        void compute_bounding_box () const;
        void render (Rect const & area, Cairo::RefPtr<Cairo::Context>) const;
-       XMLNode* get_state () const;
-       void set_state (XMLNode const *) {}
 
-       void set_height (Distance);
+        bool covers (Duple const &) const;
+
+       void set_extent (Distance);
+       Distance extent() const { return _extent; }
 
        void add (Coord, Distance, Color);
        void clear ();
 
        struct Line {
-               Line (Coord y_, Distance width_, Color color_) : y (y_), width (width_), color (color_) {}
+               Line (Coord p, Distance width_, Color color_) : pos (p), width (width_), color (color_) {}
                
-               Coord y;
+               Coord pos;
                Distance width;
                Color color;
        };
 
 private:
-       std::list<Line> _lines;
-       Distance _height;
+       std::vector<Line> _lines;
+       Distance          _extent;
+       Orientation       _orientation;
 };
 
 }
+
+#endif /* __CANVAS_LINESET_H__ */