diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-11-04 11:56:10 -0500 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-11-04 11:56:10 -0500 |
commit | 6473cc7cb431abe71721341c550130e61cf64aa1 (patch) | |
tree | 1f0a2c5783e883d817d4667269abd73d0fdb5afb /libs/canvas/arc.cc | |
parent | 08b485db75082a21c3814b0a4517f2b2fc994b77 (diff) |
drop use of bounding box to determine whether an item covers a point; add Item::covers(Duple const&)
Default implementation for Item still uses bounding box, but specializations for Arc (Circle), Polygon, Line and PolyLine have been added
Diffstat (limited to 'libs/canvas/arc.cc')
-rw-r--r-- | libs/canvas/arc.cc | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/libs/canvas/arc.cc b/libs/canvas/arc.cc index eeecd3204a..e95fbe0ad5 100644 --- a/libs/canvas/arc.cc +++ b/libs/canvas/arc.cc @@ -16,8 +16,11 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include <cmath> #include <algorithm> + #include <cairomm/context.h> + #include "pbd/compose.h" #include "canvas/circle.h" #include "canvas/types.h" @@ -97,7 +100,6 @@ Arc::set_radius (Coord r) end_change (); } - void Arc::set_arc (double deg) { @@ -121,3 +123,15 @@ Arc::set_start (double deg) end_change (); } +bool +Arc::covers (Duple const & point) const +{ + Duple p = canvas_to_item (point); + + double angle_degs = atan (p.y/p.x) * 2.0 * M_PI; + double radius = sqrt (p.x * p.x + p.y * p.y); + + return (angle_degs >= _start_degrees) && + (angle_degs <= (_start_degrees + _arc_degrees)) && + (radius < _radius); +} |