X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fcanvas%2Fcanvas%2Flookup_table.h;h=29452365cdb2db38bd50617042a3949e07cfba55;hb=8671e109fcc5089226da1e539bc8b7327b2cb5bf;hp=4ab69b6167f212e60c391861048023625d656939;hpb=ce8731b32d5e91f56396cb5f6ca0798bc7fed48a;p=ardour.git

diff --git a/libs/canvas/canvas/lookup_table.h b/libs/canvas/canvas/lookup_table.h
index 4ab69b6167..29452365cd 100644
--- a/libs/canvas/canvas/lookup_table.h
+++ b/libs/canvas/canvas/lookup_table.h
@@ -22,6 +22,8 @@
 
 #include <vector>
 #include <boost/multi_array.hpp>
+
+#include "canvas/visibility.h"
 #include "canvas/types.h"
 
 class OptimizingLookupTableTest;
@@ -29,55 +31,57 @@ class OptimizingLookupTableTest;
 namespace ArdourCanvas {
 
 class Item;
-class Group;
 
-class LookupTable
+class LIBCANVAS_API LookupTable
 {
 public:
-	LookupTable (Group const &);
-	virtual ~LookupTable ();
-
-	virtual std::vector<Item*> get (Rect const &) = 0;
-	virtual std::vector<Item*> items_at_point (Duple) const = 0;
+    LookupTable (Item const &);
+    virtual ~LookupTable ();
+    
+    virtual std::vector<Item*> get (Rect const &) = 0;
+    virtual std::vector<Item*> items_at_point (Duple const &) const = 0;
+    virtual bool has_item_at_point (Duple const & point) const = 0;
 
 protected:
 	
-	Group const & _group;
+    Item const & _item;
 };
 
-class DumbLookupTable : public LookupTable
+class LIBCANVAS_API DumbLookupTable : public LookupTable
 {
 public:
-	DumbLookupTable (Group const &);
-
-	std::vector<Item*> get (Rect const &);
-	std::vector<Item*> items_at_point (Duple) const;
+	DumbLookupTable (Item const &);
+    
+    std::vector<Item*> get (Rect const &);
+    std::vector<Item*> items_at_point (Duple const &) const;
+    bool has_item_at_point (Duple const & point) const;
 };
 
-class OptimizingLookupTable : public LookupTable
+class LIBCANVAS_API OptimizingLookupTable : public LookupTable
 {
 public:
-	OptimizingLookupTable (Group const &, int);
-	~OptimizingLookupTable ();
-	std::vector<Item*> get (Rect const &);
-	std::vector<Item*> items_at_point (Duple) const;
-
-	static int default_items_per_cell;
-
-private:
-
-	void area_to_indices (Rect const &, int &, int &, int &, int &) const;
-	void point_to_indices (Duple, int &, int &) const;
-
-	friend class ::OptimizingLookupTableTest;
-
-	typedef std::vector<Item*> Cell;
-	int _items_per_cell;
-	int _dimension;
-	Duple _cell_size;
-	Duple _offset;
-	Cell** _cells;
-	bool _added;
+    OptimizingLookupTable (Item const &, int);
+    ~OptimizingLookupTable ();
+    std::vector<Item*> get (Rect const &);
+    std::vector<Item*> items_at_point (Duple const &) const;
+    bool has_item_at_point (Duple const & point) const;
+    
+    static int default_items_per_cell;
+    
+  private:
+    
+    void area_to_indices (Rect const &, int &, int &, int &, int &) const;
+    void point_to_indices (Duple, int &, int &) const;
+    
+    friend class ::OptimizingLookupTableTest;
+    
+    typedef std::vector<Item*> Cell;
+    int _items_per_cell;
+    int _dimension;
+    Duple _cell_size;
+    Duple _offset;
+    Cell** _cells;
+    bool _added;
 };
 
 }