diff options
author | Carl Hetherington <carl@carlh.net> | 2007-05-17 10:41:14 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2007-05-17 10:41:14 +0000 |
commit | ef65fd251023378699c3ef3842fc55e93a92d04a (patch) | |
tree | 0b8c18d48355c9e5048a3ab6ea303b7268d9d1c5 /gtk2_ardour/automation_line.cc | |
parent | 06fd14b0850c8d043ae568c3d1f34460218d879f (diff) |
Add stacked lanes mode which displays regions on different layers at different positions in the view.
git-svn-id: svn://localhost/ardour2/trunk@1855 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/automation_line.cc')
-rw-r--r-- | gtk2_ardour/automation_line.cc | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc index 67f91e1ed4..a729161911 100644 --- a/gtk2_ardour/automation_line.cc +++ b/gtk2_ardour/automation_line.cc @@ -232,6 +232,7 @@ AutomationLine::AutomationLine (const string & name, TimeAxisView& tv, ArdourCan no_draw = false; _visible = true; terminal_points_can_slide = true; + _y_position = 0; _height = 0; group = new ArdourCanvas::Group (parent); @@ -307,17 +308,27 @@ AutomationLine::control_point_box_size () } void -AutomationLine::set_height (guint32 h) +AutomationLine::set_y_position_and_height (guint32 y, guint32 h) { + bool changed = false; + + if (y != _y_position) { + _y_position = y; + changed = true; + } + if (h != _height) { _height = h; - double bsz = control_point_box_size(); + double const bsz = control_point_box_size(); for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) { (*i)->set_size (bsz); } + changed = true; + } + if (changed) { reset (); } } @@ -365,7 +376,7 @@ AutomationLine::modify_view_point (ControlPoint& cp, double x, double y, bool wi y = max (0.0, y); y = min (1.0, y); - y = _height - (y * _height); + y = _y_position + _height - (y * _height); if (cp.can_slide) { @@ -494,7 +505,7 @@ AutomationLine::model_representation (ControlPoint& cp, ModelRepresentation& mr) */ mr.xval = (nframes_t) floor (cp.get_x()); - mr.yval = 1.0 - (cp.get_y() / _height); + mr.yval = 1.0 - ( (cp.get_y() - _y_position) / _height); /* if xval has not changed, set it directly from the model to avoid rounding errors */ @@ -831,7 +842,7 @@ AutomationLine::point_drag (ControlPoint& cp, nframes_t x, float fraction, bool void AutomationLine::line_drag (uint32_t i1, uint32_t i2, float fraction, bool with_push) { - double ydelta = fraction - last_drag_fraction; + double const ydelta = fraction - last_drag_fraction; did_push = with_push; @@ -844,7 +855,7 @@ AutomationLine::line_drag (uint32_t i1, uint32_t i2, float fraction, bool with_p for (uint32_t i = i1 ; i <= i2; i++) { cp = nth (i); - modify_view_point (*cp, trackview.editor.unit_to_frame (cp->get_x()), ((_height - cp->get_y()) /_height) + ydelta, with_push); + modify_view_point (*cp, trackview.editor.unit_to_frame (cp->get_x()), ((_height - cp->get_y() + _y_position) /_height) + ydelta, with_push); } if (line_points.size() > 1) { @@ -1041,8 +1052,8 @@ AutomationLine::get_selectables (nframes_t& start, nframes_t& end, /* Curse X11 and its inverted coordinate system! */ - bot = (1.0 - topfrac) * _height; - top = (1.0 - botfrac) * _height; + bot = _y_position + (1.0 - topfrac) * _height; + top = _y_position + (1.0 - botfrac) * _height; nstart = max_frames; nend = 0; @@ -1108,8 +1119,8 @@ AutomationLine::set_selected_points (PointSelection& points) /* Curse X11 and its inverted coordinate system! */ - bot = (1.0 - (*r).high_fract) * _height; - top = (1.0 - (*r).low_fract) * _height; + bot = _y_position + (1.0 - (*r).high_fract) * _height; + top = _y_position + (1.0 - (*r).low_fract) * _height; for (vector<ControlPoint*>::iterator i = control_points.begin(); i != control_points.end(); ++i) { @@ -1203,7 +1214,7 @@ AutomationLine::reset_callback (const AutomationList& events) model_to_view_y (translated_y); tmp_points.push_back (ALPoint (trackview.editor.frame_to_unit ((*ai)->when), - _height - (translated_y * _height))); + _y_position + _height - (translated_y * _height))); } determine_visible_control_points (tmp_points); |