#include <vector>
#include <fstream>
-#include "pbd/stl_delete.h"
+#include "boost/shared_ptr.hpp"
+
+#include "pbd/floating.h"
#include "pbd/memento_command.h"
+#include "pbd/stl_delete.h"
#include "pbd/stacktrace.h"
#include "ardour/automation_list.h"
#include "evoral/Curve.hpp"
-#include "simplerect.h"
#include "automation_line.h"
#include "control_point.h"
#include "gui_thread.h"
using namespace ARDOUR;
using namespace PBD;
using namespace Editing;
-using namespace Gnome; // for Canvas
/** @param converter A TimeConverter whose origin_b is the start time of the AutomationList in session frames.
* This will not be deleted by AutomationLine.
terminal_points_can_slide = true;
_height = 0;
- group = new ArdourCanvas::Group (parent);
- group->property_x() = 0.0;
- group->property_y() = 0.0;
+ group = new ArdourCanvas::Group (&parent);
- line = new ArdourCanvas::Line (*group);
- line->property_width_pixels() = (guint)1;
+ line = new ArdourCanvas::Curve (group);
line->set_data ("line", this);
+ line->set_outline_width (2.0);
- line->signal_event().connect (sigc::mem_fun (*this, &AutomationLine::event_handler));
+ line->Event.connect (sigc::mem_fun (*this, &AutomationLine::event_handler));
trackview.session()->register_with_memento_command_factory(alist->id(), this);
AutomationLine::set_line_color (uint32_t color)
{
_line_color = color;
- line->property_fill_color_rgba() = color;
+ line->set_outline_color (color);
}
void
y = min (1.0, y);
y = _height - (y * _height);
- double const x = trackview.editor().frame_to_unit_unrounded (_time_converter->to((*cp.model())->when) - _offset);
+ double const x = trackview.editor().sample_to_pixel_unrounded (_time_converter->to((*cp.model())->when) - _offset);
trackview.editor().session()->begin_reversible_command (_("automation event move"));
trackview.editor().session()->add_command (
reset_line_coords (cp);
if (line_points.size() > 1) {
- line->property_points() = line_points;
+ line->set (line_points);
}
alist->freeze ();
AutomationLine::reset_line_coords (ControlPoint& cp)
{
if (cp.view_index() < line_points.size()) {
- line_points[cp.view_index()].set_x (cp.get_x());
- line_points[cp.view_index()].set_y (cp.get_y());
+ line_points[cp.view_index()].x = cp.get_x ();
+ line_points[cp.view_index()].y = cp.get_y ();
}
}
);
_drag_points.clear ();
+
for (uint32_t i = i1; i <= i2; i++) {
_drag_points.push_back (nth (i));
}
start_drag_common (0, fraction);
}
-
struct ControlPointSorter
{
- bool operator() (ControlPoint const * a, ControlPoint const * b) {
+ bool operator() (ControlPoint const * a, ControlPoint const * b) const {
+ if (floateq (a->get_x(), b->get_x(), 1)) {
+ return a->view_index() < b->view_index();
+ }
return a->get_x() < b->get_x();
}
};
+AutomationLine::ContiguousControlPoints::ContiguousControlPoints (AutomationLine& al)
+ : line (al), before_x (0), after_x (DBL_MAX)
+{
+}
+
+void
+AutomationLine::ContiguousControlPoints::compute_x_bounds ()
+{
+ uint32_t sz = size();
+
+ if (sz > 0 && sz < line.npoints()) {
+
+ /* determine the limits on x-axis motion for this
+ contiguous range of control points
+ */
+
+ if (front()->view_index() > 0) {
+ before_x = line.nth (front()->view_index() - 1)->get_x();
+ }
+
+ /* if our last point has a point after it in the line,
+ we have an "after" bound
+ */
+
+ if (back()->view_index() < (line.npoints() - 2)) {
+ after_x = line.nth (back()->view_index() + 1)->get_x();
+ }
+ }
+}
+
+double
+AutomationLine::ContiguousControlPoints::clamp_dx (double dx)
+{
+ if (empty()) {
+ return dx;
+ }
+
+ /* get the maximum distance we can move any of these points along the x-axis
+ */
+
+ double tx; /* possible position a point would move to, given dx */
+ ControlPoint* cp;
+
+ if (dx > 0) {
+ /* check the last point, since we're moving later in time */
+ cp = back();
+ } else {
+ /* check the first point, since we're moving earlier in time */
+ cp = front();
+ }
+
+ tx = cp->get_x() + dx; // new possible position if we just add the motion
+ tx = max (tx, before_x); // can't move later than following point
+ tx = min (tx, after_x); // can't move earlier than preceeding point
+ return tx - cp->get_x ();
+}
+
+void
+AutomationLine::ContiguousControlPoints::move (double dx, double dy)
+{
+ for (std::list<ControlPoint*>::iterator i = begin(); i != end(); ++i) {
+ (*i)->move_to ((*i)->get_x() + dx, (*i)->get_y() - line.height() * dy, ControlPoint::Full);
+ line.reset_line_coords (**i);
+ }
+}
+
/** Common parts of starting a drag.
* @param x Starting x position in units, or 0 if x is being ignored.
* @param fraction Starting y position (as a fraction of the track height, where 0 is the bottom and 1 the top)
_drag_had_movement = false;
did_push = false;
- _drag_points.sort (ControlPointSorter ());
+ /* they are probably ordered already, but we have to make sure */
- /* find the additional points that will be dragged when the user is holding
- the "push" modifier
- */
-
- uint32_t i = _drag_points.back()->view_index () + 1;
- ControlPoint* p = 0;
- _push_points.clear ();
- while ((p = nth (i)) != 0 && p->can_slide()) {
- _push_points.push_back (p);
- ++i;
- }
+ _drag_points.sort (ControlPointSorter());
}
+
/** Should be called to indicate motion during a drag.
* @param x New x position of the drag in canvas units, or undefined if ignore_x == true.
* @param fraction New y fraction.
* @return x position and y fraction that were actually used (once clamped).
*/
pair<double, float>
-AutomationLine::drag_motion (double const x, float fraction, bool ignore_x, bool with_push)
+AutomationLine::drag_motion (double const x, float fraction, bool ignore_x, bool with_push, uint32_t& final_index)
{
- /* setup the points that are to be moved this time round */
- list<ControlPoint*> points = _drag_points;
- if (with_push) {
- copy (_push_points.begin(), _push_points.end(), back_inserter (points));
- points.sort (ControlPointSorter ());
+ if (_drag_points.empty()) {
+ return pair<double,float> (x,fraction);
}
double dx = ignore_x ? 0 : (x - _drag_x);
double dy = fraction - _last_drag_fraction;
- for (list<ControlPoint*>::iterator i = points.begin(); i != points.end(); ++i) {
- /* Find the points that aren't being moved before and after
- this one on the control_points list
- */
+ if (!_drag_had_movement) {
- ControlPoint* before = 0;
- ControlPoint* after = 0;
-
- ControlPoint* last = 0;
- for (vector<ControlPoint*>::iterator j = control_points.begin(); j != control_points.end(); ++j) {
-
- if (*j == *i) {
-
- before = last;
-
- vector<ControlPoint*>::iterator k = j;
-
- /* Next point */
- ++k;
-
- /* Now move past any points that are being moved this time */
- while (find (points.begin(), points.end(), *k) != points.end() && k != control_points.end ()) {
- ++k;
- }
-
- if (k != control_points.end()) {
- after = *k;
- }
- break;
+ /* "first move" ... do some stuff that we don't want to do if
+ no motion ever took place, but need to do before we handle
+ motion.
+ */
+
+ /* partition the points we are dragging into (potentially several)
+ * set(s) of contiguous points. this will not happen with a normal
+ * drag, but if the user does a discontiguous selection, it can.
+ */
+
+ uint32_t expected_view_index = 0;
+ CCP contig;
+
+ for (list<ControlPoint*>::iterator i = _drag_points.begin(); i != _drag_points.end(); ++i) {
+ if (i == _drag_points.begin() || (*i)->view_index() != expected_view_index) {
+ contig.reset (new ContiguousControlPoints (*this));
+ contiguous_points.push_back (contig);
}
+ contig->push_back (*i);
+ expected_view_index = (*i)->view_index() + 1;
+ }
- if (find (points.begin(), points.end(), *j) == points.end ()) {
- /* This point isn't being moved, so it's the `last' point we've seen */
- last = *j;
- }
+ if (contiguous_points.back()->empty()) {
+ contiguous_points.pop_back ();
}
- /* Clamp dx for this point */
- double const before_x = before ? before->get_x() : 0;
- double const after_x = after ? after->get_x() : DBL_MAX;
+ for (vector<CCP>::iterator ccp = contiguous_points.begin(); ccp != contiguous_points.end(); ++ccp) {
+ (*ccp)->compute_x_bounds ();
+ }
+ }
+
+ /* OK, now on to the stuff related to *this* motion event. First, for
+ * each contiguous range, figure out the maximum x-axis motion we are
+ * allowed (because of neighbouring points that are not moving.
+ *
+ * if we are moving forwards with push, we don't need to do this,
+ * since all later points will move too.
+ */
- double tx = (*i)->get_x() + dx;
- tx = max (tx, before_x);
- tx = min (tx, after_x);
- dx = tx - (*i)->get_x ();
+ if (dx < 0 || ((dx > 0) && !with_push)) {
+ for (vector<CCP>::iterator ccp = contiguous_points.begin(); ccp != contiguous_points.end(); ++ccp) {
+ double dxt = (*ccp)->clamp_dx (dx);
+ if (fabs (dxt) < fabs (dx)) {
+ dx = dxt;
+ }
+ }
}
/* clamp y */
- for (list<ControlPoint*>::iterator i = points.begin(); i != points.end(); ++i) {
+
+ for (list<ControlPoint*>::iterator i = _drag_points.begin(); i != _drag_points.end(); ++i) {
double const y = ((_height - (*i)->get_y()) / _height) + dy;
if (y < 0) {
dy -= y;
}
}
- pair<double, float> const clamped (_drag_x + dx, _last_drag_fraction + dy);
- _drag_distance += dx;
- _drag_x += dx;
- _last_drag_fraction = fraction;
-
- for (list<ControlPoint*>::iterator i = _drag_points.begin(); i != _drag_points.end(); ++i) {
- (*i)->move_to ((*i)->get_x() + dx, (*i)->get_y() - _height * dy, ControlPoint::Full);
- reset_line_coords (**i);
- }
+ if (dx || dy) {
- if (with_push) {
- /* move push points, preserving their y */
- for (list<ControlPoint*>::iterator i = _push_points.begin(); i != _push_points.end(); ++i) {
- (*i)->move_to ((*i)->get_x() + dx, (*i)->get_y(), ControlPoint::Full);
- reset_line_coords (**i);
+ /* and now move each section */
+
+ for (vector<CCP>::iterator ccp = contiguous_points.begin(); ccp != contiguous_points.end(); ++ccp) {
+ (*ccp)->move (dx, dy);
+ }
+ if (with_push) {
+ final_index = contiguous_points.back()->back()->view_index () + 1;
+ ControlPoint* p;
+ uint32_t i = final_index;
+ while ((p = nth (i)) != 0 && p->can_slide()) {
+ p->move_to (p->get_x() + dx, p->get_y(), ControlPoint::Full);
+ reset_line_coords (*p);
+ ++i;
+ }
}
- }
- if (line_points.size() > 1) {
- line->property_points() = line_points;
- }
+ /* update actual line coordinates (will queue a redraw)
+ */
- _drag_had_movement = true;
- if (with_push) {
- did_push = with_push;
+ if (line_points.size() > 1) {
+ line->set (line_points);
+ }
}
+
+ _drag_distance += dx;
+ _drag_x += dx;
+ _last_drag_fraction = fraction;
+ _drag_had_movement = true;
+ did_push = with_push;
- return clamped;
+ return pair<double, float> (_drag_x + dx, _last_drag_fraction + dy);
}
/** Should be called to indicate the end of a drag */
void
-AutomationLine::end_drag ()
+AutomationLine::end_drag (bool with_push, uint32_t final_index)
{
if (!_drag_had_movement) {
return;
}
alist->freeze ();
+ sync_model_with_view_points (_drag_points);
- /* set up the points that were moved this time round */
- list<ControlPoint*> points = _drag_points;
- if (did_push) {
- copy (_push_points.begin(), _push_points.end(), back_inserter (points));
- points.sort (ControlPointSorter ());
+ if (with_push) {
+ ControlPoint* p;
+ uint32_t i = final_index;
+ while ((p = nth (i)) != 0 && p->can_slide()) {
+ sync_model_with_view_point (*p);
+ ++i;
+ }
}
- sync_model_with_view_points (points);
-
alist->thaw ();
update_pending = false;
trackview.editor().session()->set_dirty ();
did_push = false;
+
+ contiguous_points.clear ();
}
void
/* if xval has not changed, set it directly from the model to avoid rounding errors */
- if (view_x == trackview.editor().frame_to_unit_unrounded (_time_converter->to ((*cp.model())->when)) - _offset) {
+ if (view_x == trackview.editor().sample_to_pixel_unrounded (_time_converter->to ((*cp.model())->when)) - _offset) {
view_x = (*cp.model())->when - _offset;
} else {
- view_x = trackview.editor().unit_to_frame (view_x);
+ view_x = trackview.editor().pixel_to_sample (view_x);
view_x = _time_converter->from (view_x + _offset);
}
ControlPoint *acp = 0;
double unit_xval;
- unit_xval = trackview.editor().frame_to_unit_unrounded (xval);
+ unit_xval = trackview.editor().sample_to_pixel_unrounded (xval);
for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
* @param result Filled in with selectable things; in this case, ControlPoints.
*/
void
-AutomationLine::get_selectables (
- framepos_t start, framepos_t end, double botfrac, double topfrac, list<Selectable*>& results
- )
+AutomationLine::get_selectables (framepos_t start, framepos_t end, double botfrac, double topfrac, list<Selectable*>& results)
{
/* convert fractions to display coordinates with 0 at the top of the track */
double const bot_track = (1 - topfrac) * trackview.current_height ();
void AutomationLine::set_colors ()
{
- set_line_color (ARDOUR_UI::config()->canvasvar_AutomationLine.get());
+ set_line_color (ARDOUR_UI::config()->get_canvasvar_AutomationLine());
for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) {
(*i)->set_color ();
}
* zoom and scroll into account).
*/
- tx = trackview.editor().frame_to_unit_unrounded (tx);
+ tx = trackview.editor().sample_to_pixel_unrounded (tx);
/* convert from canonical view height (0..1.0) to actual
* height coordinates (using X11's top-left rooted system)
/* reset the line coordinates given to the CanvasLine */
while (line_points.size() < vp) {
- line_points.push_back (Art::Point (0,0));
+ line_points.push_back (ArdourCanvas::Duple (0,0));
}
while (line_points.size() > vp) {
}
for (uint32_t n = 0; n < vp; ++n) {
- line_points[n].set_x (control_points[n]->get_x());
- line_points[n].set_y (control_points[n]->get_y());
+ line_points[n].x = control_points[n]->get_x();
+ line_points[n].y = control_points[n]->get_y();
}
- line->property_points() = line_points;
+ line->set (line_points);
if (_visible && alist->interpolation() != AutomationList::Discrete) {
line->show();
projects / ardour.git / blobdiff