X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fcanvas%2Flookup_table.cc;h=f88531537aebb0544d85a792f6c749e8e9199dad;hb=6d4c0baad3a09d43b5eacb37ea2a2e4c31afcec6;hp=be0e553ee7a44a644c3a55230b2d585613a46f1e;hpb=e1b0f1bd0b03c071d2b5987e4ab75ef059e32111;p=ardour.git

diff --git a/libs/canvas/lookup_table.cc b/libs/canvas/lookup_table.cc
index be0e553ee7..f88531537a 100644
--- a/libs/canvas/lookup_table.cc
+++ b/libs/canvas/lookup_table.cc
@@ -49,26 +49,49 @@ DumbLookupTable::get (Rect const &)
 	return vitems;
 }
 
-/* XXX: what coordinate system is the point in? parent of our group I think */
 vector<Item *>
-DumbLookupTable::items_at_point (Duple point) const
+DumbLookupTable::items_at_point (Duple const & point) const
 {
-	list<Item *> items = _group.items ();
+	/* Point is in canvas coordinate system */
+
+	list<Item *> const & items (_group.items ());
 	vector<Item *> vitems;
 
 	for (list<Item *>::const_iterator i = items.begin(); i != items.end(); ++i) {
-		boost::optional<Rect> item_bbox = (*i)->bounding_box ();
-		if (item_bbox) {
-			Rect parent_bbox = (*i)->item_to_parent (item_bbox.get ());
-			if (parent_bbox.contains (point)) {
-				vitems.push_back (*i);
-			}
+
+		if ((*i)->covers (point)) {
+			// std::cerr << "\t\t" << (*i)->whatami() << '/' << (*i)->name << " covers " << point << std::endl;
+			vitems.push_back (*i);
 		}
 	}
 
 	return vitems;
 }
 
+bool
+DumbLookupTable::has_item_at_point (Duple const & point) const
+{
+	/* Point is in canvas coordinate system */
+
+	list<Item *> const & items (_group.items ());
+	vector<Item *> vitems;
+
+	for (list<Item *>::const_iterator i = items.begin(); i != items.end(); ++i) {
+
+		if (!(*i)->visible()) {
+			continue;
+		}
+		
+		if ((*i)->covers (point)) {
+			// std::cerr << "\t\t" << (*i)->whatami() << '/' << (*i)->name << " covers " << point << std::endl;
+			return true;
+			
+		}
+	}
+
+	return false;
+}
+
 OptimizingLookupTable::OptimizingLookupTable (Group const & group, int items_per_cell)
 	: LookupTable (group)
 	, _items_per_cell (items_per_cell)
@@ -79,7 +102,7 @@ OptimizingLookupTable::OptimizingLookupTable (Group const & group, int items_per
 	/* number of cells */
 	int const cells = items.size() / _items_per_cell;
 	/* hence number down each side of the table's square */
-	_dimension = max (1, int (rint (sqrt (cells))));
+	_dimension = max (1, int (rint (sqrt ((double)cells))));
 
 	_cells = new Cell*[_dimension];
 	for (int i = 0; i < _dimension; ++i) {
@@ -188,7 +211,7 @@ OptimizingLookupTable::point_to_indices (Duple point, int& x, int& y) const
 }
 
 vector<Item*>
-OptimizingLookupTable::items_at_point (Duple point) const
+OptimizingLookupTable::items_at_point (Duple const & point) const
 {
 	int x;
 	int y;
@@ -223,6 +246,43 @@ OptimizingLookupTable::items_at_point (Duple point) const
 
 	return items;
 }
+
+bool
+OptimizingLookupTable::has_item_at_point (Duple const & point) const
+{
+	int x;
+	int y;
+	point_to_indices (point, x, y);
+
+	if (x >= _dimension) {
+		cout << "WARNING: x=" << x << ", dim=" << _dimension << ", px=" << point.x << " cellsize=" << _cell_size << "\n";
+	}
+
+	if (y >= _dimension) {
+		cout << "WARNING: y=" << y << ", dim=" << _dimension << ", py=" << point.y << " cellsize=" << _cell_size << "\n";
+	}
+	
+	/* XXX: hmm */
+	x = min (_dimension - 1, x);
+	y = min (_dimension - 1, y);
+
+	assert (x >= 0);
+	assert (y >= 0);
+
+	Cell const & cell = _cells[x][y];
+	vector<Item*> items;
+	for (Cell::const_iterator i = cell.begin(); i != cell.end(); ++i) {
+		boost::optional<Rect> const item_bbox = (*i)->bounding_box ();
+		if (item_bbox) {
+			Rect parent_bbox = (*i)->item_to_parent (item_bbox.get ());
+			if (parent_bbox.contains (point)) {
+				return true;
+			}
+		}
+	}
+
+	return false;
+}
 	
 /** @param area Area in our owning group's coordinates */
 vector<Item*>