return false;
}
- /* rectangle 10 pixels surrounding the clicked control point */
- nframes64_t const x1 = pixel_to_frame (clicked_control_point->get_x() - 10);
- nframes64_t const x2 = pixel_to_frame (clicked_control_point->get_x() + 10);
- double y1 = clicked_control_point->get_y() - 10;
- double y2 = clicked_control_point->get_y() + 10;
+ if (clicked_control_point->selected()) {
+ /* the clicked control point is already selected; others may be as well, so
+ don't change the selection.
+ */
+ return true;
+ }
+
+ /* We know the ControlPoint that was clicked, but (as discussed in automation_selectable.h)
+ * selected automation data are described by areas on the AutomationLine. A ControlPoint
+ * represents any model points in the space that it takes up, so the AutomationSelectable
+ * needs to be the size of the ControlPoint.
+ */
+
+ double const size = clicked_control_point->size ();
+
+ nframes64_t const x1 = pixel_to_frame (clicked_control_point->get_x() - size / 2);
+ nframes64_t const x2 = pixel_to_frame (clicked_control_point->get_x() + size / 2);
+ double y1 = clicked_control_point->get_y() - size / 2;
+ double y2 = clicked_control_point->get_y() + size / 2;
/* convert the y values to trackview space */
double dummy = 0;
_trackview_group->w2i (dummy, y1);
_trackview_group->w2i (dummy, y2);
- /* find any other points nearby */
- pair<list<Selectable*>, TrackViewList> const f = find_selectables_within (x1, x2, y1, y2, selection->tracks);
-
- PointSelection ps;
- for (list<Selectable*>::const_iterator i = f.first.begin(); i != f.first.end(); ++i) {
- AutomationSelectable* a = dynamic_cast<AutomationSelectable*> (*i);
- if (a) {
- ps.push_back (*a);
- }
- }
-
- list<ControlPoint*> const cp = clicked_control_point->line().point_selection_to_control_points (ps);
- list<ControlPoint*>::const_iterator i = cp.begin ();
- while (i != cp.end() && (*i)->selected() == false) {
- ++i;
- }
-
- if (i != cp.end()) {
- /* one of the control points that we just clicked on is already selected,
- so leave the selection alone.
- */
-
- for (list<Selectable*>::const_iterator i = f.first.begin(); i != f.first.end(); ++i) {
- delete *i;
- }
-
- return true;
- }
-
- return select_selectables_and_tracks (f.first, f.second, op);
+ /* and set up the selection */
+ return select_all_within (x1, x2, y1, y2, selection->tracks, Selection::Set);
}
void
*/
void
-Editor::mapover_tracks (sigc::slot<void, RouteTimeAxisView&, uint32_t> sl, TimeAxisView* basis, RouteGroup::Property prop) const
+Editor::mapover_tracks (sigc::slot<void, RouteTimeAxisView&, uint32_t> sl, TimeAxisView* basis, PBD::PropertyID prop) const
{
RouteTimeAxisView* route_basis = dynamic_cast<RouteTimeAxisView*> (basis);
if (route_basis == 0) {
tracks.insert (route_basis);
RouteGroup* group = route_basis->route()->route_group();
- if (group && group->active_property (prop)) {
+ if (group && group->enabled_property (prop)) {
/* the basis is a member of an active route group, with the appropriate
properties; find other members */
}
void
-Editor::get_equivalent_regions (RegionView* basis, vector<RegionView*>& equivalent_regions, RouteGroup::Property prop) const
+Editor::get_equivalent_regions (RegionView* basis, vector<RegionView*>& equivalent_regions, PBD::PropertyID property) const
{
- mapover_tracks (sigc::bind (sigc::mem_fun (*this, &Editor::mapped_get_equivalent_regions), basis, &equivalent_regions), &basis->get_trackview(), prop);
+ mapover_tracks (sigc::bind (sigc::mem_fun (*this, &Editor::mapped_get_equivalent_regions), basis, &equivalent_regions), &basis->get_trackview(), property);
/* add clicked regionview since we skipped all other regions in the same track as the one it was in */
}
RegionSelection
-Editor::get_equivalent_regions (RegionSelection & basis, RouteGroup::Property prop) const
+Editor::get_equivalent_regions (RegionSelection & basis, PBD::PropertyID prop) const
{
RegionSelection equivalent;
if (press) {
if (selection->selected (clicked_routeview)) {
- get_equivalent_regions (clicked_regionview, all_equivalent_regions, RouteGroup::Select);
+ get_equivalent_regions (clicked_regionview, all_equivalent_regions, ARDOUR::Properties::select.property_id);
} else {
all_equivalent_regions.push_back (clicked_regionview);
}
case Selection::Set:
if (!selection->selected (clicked_regionview)) {
- get_equivalent_regions (clicked_regionview, all_equivalent_regions, RouteGroup::Select);
+ get_equivalent_regions (clicked_regionview, all_equivalent_regions, ARDOUR::Properties::select.property_id);
selection->set (all_equivalent_regions);
commit = true;
} else {
_regions->unselect_all ();
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
-
(*i)->set_selected_regionviews (selection->regions);
- _regions->set_selected (selection->regions);
-
}
+ _regions->set_selected (selection->regions);
+
sensitize_the_right_region_actions (!selection->regions.empty());
_regions->block_change_connection (false);
selection->set (touched);
}
-/** Find Selectable things within an area.
- * @param start Start temporal position (session frames)
- * @param end End temporal position (session frames)
- * @param top Top (lower) y position (trackview coordinates)
- * @param bot Bottom (higher) y position (trackview coordinates)
- * @return Selectable things and tracks that they are on.
+/** @param top Top (lower) y limit in trackview coordinates.
+ * @param bottom Bottom (higher) y limit in trackview coordinates.
*/
-pair<list<Selectable*>, TrackViewList>
-Editor::find_selectables_within (nframes64_t start, nframes64_t end, double top, double bot, const TrackViewList& tracklist)
+bool
+Editor::select_all_within (
+ nframes64_t start, nframes64_t end, double top, double bot, const TrackViewList& tracklist, Selection::Operation op
+ )
{
list<Selectable*> found;
TrackViewList tracks;
tracks.push_back (*iter);
}
}
-
- return make_pair (found, tracks);
-}
-
-/** @param top Top (lower) y limit in trackview coordinates.
- * @param bottom Bottom (higher) y limit in trackview coordinates.
- */
-bool
-Editor::select_all_within (
- nframes64_t start, nframes64_t end, double top, double bot, const TrackViewList& tracklist, Selection::Operation op
- )
-{
- pair<list<Selectable*>, TrackViewList> const f = find_selectables_within (start, end, top, bot, tracklist);
- return select_selectables_and_tracks (f.first, f.second, op);
-}
-
-/** Select a list of Selectables and also a list of Tracks; nothing will be selected if there are no Selectables */
-bool
-Editor::select_selectables_and_tracks (list<Selectable*> const & s, TrackViewList const & t, Selection::Operation op)
-{
- if (s.empty()) {
+
+ if (found.empty()) {
return false;
}
- if (!t.empty()) {
+ if (!tracks.empty()) {
switch (op) {
case Selection::Add:
- selection->add (t);
+ selection->add (tracks);
break;
case Selection::Toggle:
- selection->toggle (t);
+ selection->toggle (tracks);
break;
case Selection::Set:
- selection->set (t);
+ selection->set (tracks);
break;
case Selection::Extend:
/* not defined yet */
begin_reversible_command (_("select all within"));
switch (op) {
case Selection::Add:
- selection->add (s);
+ selection->add (found);
break;
case Selection::Toggle:
- selection->toggle (s);
+ selection->toggle (found);
break;
case Selection::Set:
- selection->set (s);
+ selection->set (found);
break;
case Selection::Extend:
/* not defined yet */
commit_reversible_command ();
- return !s.empty();
+ return !found.empty();
}
void
selection->clear ();
}
-void
+long
Editor::select_range_around_region (RegionView* rv)
{
+ assert (rv);
+
selection->set (&rv->get_time_axis_view());
selection->time.clear ();
boost::shared_ptr<Region> r = rv->region ();
- selection->set (r->position(), r->position() + r->length());
+ return selection->set (r->position(), r->position() + r->length());
}
projects / ardour.git / blobdiff