projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refactor Canvas so that all Items have children; add Container abstract base class...
[ardour.git]
/
libs
/
canvas
/
lookup_table.cc
diff --git
a/libs/canvas/lookup_table.cc
b/libs/canvas/lookup_table.cc
index f88531537aebb0544d85a792f6c749e8e9199dad..2396f596354504798f0cdbc625da9c3c8bccd0b5 100644
(file)
--- a/
libs/canvas/lookup_table.cc
+++ b/
libs/canvas/lookup_table.cc
@@
-17,14
+17,14
@@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include "canvas/item.h"
#include "canvas/lookup_table.h"
#include "canvas/lookup_table.h"
-#include "canvas/group.h"
using namespace std;
using namespace ArdourCanvas;
using namespace std;
using namespace ArdourCanvas;
-LookupTable::LookupTable (
Group const & group
)
- : _
group (group
)
+LookupTable::LookupTable (
Item const & item
)
+ : _
item (item
)
{
}
{
}
@@
-34,8
+34,8
@@
LookupTable::~LookupTable ()
}
}
-DumbLookupTable::DumbLookupTable (
Group const & group
)
- : LookupTable (
group
)
+DumbLookupTable::DumbLookupTable (
Item const & item
)
+ : LookupTable (
item
)
{
}
{
}
@@
-43,7
+43,7
@@
DumbLookupTable::DumbLookupTable (Group const & group)
vector<Item *>
DumbLookupTable::get (Rect const &)
{
vector<Item *>
DumbLookupTable::get (Rect const &)
{
- list<Item *> const & items = _
group
.items ();
+ list<Item *> const & items = _
item
.items ();
vector<Item *> vitems;
copy (items.begin(), items.end(), back_inserter (vitems));
return vitems;
vector<Item *> vitems;
copy (items.begin(), items.end(), back_inserter (vitems));
return vitems;
@@
-52,9
+52,9
@@
DumbLookupTable::get (Rect const &)
vector<Item *>
DumbLookupTable::items_at_point (Duple const & point) const
{
vector<Item *>
DumbLookupTable::items_at_point (Duple const & point) const
{
- /* Point is in
canvas
coordinate system */
+ /* Point is in
window
coordinate system */
- list<Item *> const & items (_
group
.items ());
+ list<Item *> const & items (_
item
.items ());
vector<Item *> vitems;
for (list<Item *>::const_iterator i = items.begin(); i != items.end(); ++i) {
vector<Item *> vitems;
for (list<Item *>::const_iterator i = items.begin(); i != items.end(); ++i) {
@@
-71,9
+71,9
@@
DumbLookupTable::items_at_point (Duple const & point) const
bool
DumbLookupTable::has_item_at_point (Duple const & point) const
{
bool
DumbLookupTable::has_item_at_point (Duple const & point) const
{
- /* Point is in
canvas
coordinate system */
+ /* Point is in
window
coordinate system */
- list<Item *> const & items (_
group
.items ());
+ list<Item *> const & items (_
item
.items ());
vector<Item *> vitems;
for (list<Item *>::const_iterator i = items.begin(); i != items.end(); ++i) {
vector<Item *> vitems;
for (list<Item *>::const_iterator i = items.begin(); i != items.end(); ++i) {
@@
-92,12
+92,12
@@
DumbLookupTable::has_item_at_point (Duple const & point) const
return false;
}
return false;
}
-OptimizingLookupTable::OptimizingLookupTable (
Group const & group
, int items_per_cell)
- : LookupTable (
group
)
+OptimizingLookupTable::OptimizingLookupTable (
Item const & item
, int items_per_cell)
+ : LookupTable (
item
)
, _items_per_cell (items_per_cell)
, _added (false)
{
, _items_per_cell (items_per_cell)
, _added (false)
{
- list<Item*> const & items = _
group
.items ();
+ list<Item*> const & items = _
item
.items ();
/* number of cells */
int const cells = items.size() / _items_per_cell;
/* number of cells */
int const cells = items.size() / _items_per_cell;
@@
-109,8
+109,8
@@
OptimizingLookupTable::OptimizingLookupTable (Group const & group, int items_per
_cells[i] = new Cell[_dimension];
}
_cells[i] = new Cell[_dimension];
}
- /* our
group
's bounding box in its coordinates */
- boost::optional<Rect> bbox = _
group
.bounding_box ();
+ /* our
item
's bounding box in its coordinates */
+ boost::optional<Rect> bbox = _
item
.bounding_box ();
if (!bbox) {
return;
}
if (!bbox) {
return;
}
@@
-130,11
+130,11
@@
OptimizingLookupTable::OptimizingLookupTable (Group const & group, int items_per
continue;
}
continue;
}
- /* and in the
group
's coordinates */
- Rect const item_bbox_in_
group
= (*i)->item_to_parent (item_bbox.get ());
+ /* and in the
item
's coordinates */
+ Rect const item_bbox_in_
item
= (*i)->item_to_parent (item_bbox.get ());
int x0, y0, x1, y1;
int x0, y0, x1, y1;
- area_to_indices (item_bbox_in_
group
, x0, y0, x1, y1);
+ area_to_indices (item_bbox_in_
item
, x0, y0, x1, y1);
/* XXX */
assert (x0 >= 0);
/* XXX */
assert (x0 >= 0);
@@
-147,19
+147,19
@@
OptimizingLookupTable::OptimizingLookupTable (Group const & group, int items_per
//assert (y1 <= _dimension);
if (x0 > _dimension) {
//assert (y1 <= _dimension);
if (x0 > _dimension) {
- cout << "WARNING: item outside bbox by " << (item_bbox_in_
group
.x0 - bbox.get().x0) << "\n";
+ cout << "WARNING: item outside bbox by " << (item_bbox_in_
item
.x0 - bbox.get().x0) << "\n";
x0 = _dimension;
}
if (x1 > _dimension) {
x0 = _dimension;
}
if (x1 > _dimension) {
- cout << "WARNING: item outside bbox by " << (item_bbox_in_
group
.x1 - bbox.get().x1) << "\n";
+ cout << "WARNING: item outside bbox by " << (item_bbox_in_
item
.x1 - bbox.get().x1) << "\n";
x1 = _dimension;
}
if (y0 > _dimension) {
x1 = _dimension;
}
if (y0 > _dimension) {
- cout << "WARNING: item outside bbox by " << (item_bbox_in_
group
.y0 - bbox.get().y0) << "\n";
+ cout << "WARNING: item outside bbox by " << (item_bbox_in_
item
.y0 - bbox.get().y0) << "\n";
y0 = _dimension;
}
if (y1 > _dimension) {
y0 = _dimension;
}
if (y1 > _dimension) {
- cout << "WARNING: item outside bbox by " << (item_bbox_in_
group
.y1 - bbox.get().y1) << "\n";
+ cout << "WARNING: item outside bbox by " << (item_bbox_in_
item
.y1 - bbox.get().y1) << "\n";
y1 = _dimension;
}
y1 = _dimension;
}
@@
-284,7
+284,7
@@
OptimizingLookupTable::has_item_at_point (Duple const & point) const
return false;
}
return false;
}
-/** @param area Area in our owning
group
's coordinates */
+/** @param area Area in our owning
item
's coordinates */
vector<Item*>
OptimizingLookupTable::get (Rect const & area)
{
vector<Item*>
OptimizingLookupTable::get (Rect const & area)
{