using boost::weak_ptr;
using boost::dynamic_pointer_cast;
using boost::bind;
+using boost::optional;
+/** Parent class for components of the timeline (e.g. a piece of content or an axis) */
class View : public boost::noncopyable
{
public:
{
}
+
+ virtual ~View () {}
void paint (wxGraphicsContext* g)
{
dcpomatic::Rect<int> _last_paint_bbox;
};
+
+/** Parent class for views of pieces of content */
class ContentView : public View
{
public:
}
return dcpomatic::Rect<int> (
- time_x (content->start ()) - 8,
+ time_x (content->position ()) - 8,
y_pos (_track) - 8,
- content->length () * _timeline.pixels_per_time_unit() + 16,
+ content->length_after_trim () * _timeline.pixels_per_time_unit() + 16,
_timeline.track_height() + 16
);
}
return;
}
- Time const start = cont->start ();
- Time const len = cont->length ();
+ Time const position = cont->position ();
+ Time const len = cont->length_after_trim ();
wxColour selected (colour().Red() / 2, colour().Green() / 2, colour().Blue() / 2);
}
wxGraphicsPath path = gc->CreatePath ();
- path.MoveToPoint (time_x (start), y_pos (_track) + 4);
- path.AddLineToPoint (time_x (start + len), y_pos (_track) + 4);
- path.AddLineToPoint (time_x (start + len), y_pos (_track + 1) - 4);
- path.AddLineToPoint (time_x (start), y_pos (_track + 1) - 4);
- path.AddLineToPoint (time_x (start), y_pos (_track) + 4);
+ path.MoveToPoint (time_x (position), y_pos (_track) + 4);
+ path.AddLineToPoint (time_x (position + len), y_pos (_track) + 4);
+ path.AddLineToPoint (time_x (position + len), y_pos (_track + 1) - 4);
+ path.AddLineToPoint (time_x (position), y_pos (_track + 1) - 4);
+ path.AddLineToPoint (time_x (position), y_pos (_track) + 4);
gc->StrokePath (path);
gc->FillPath (path);
- wxString name = wxString::Format (wxT ("%s [%s]"), std_to_wx (cont->path().filename().string()).data(), type().data());
+ wxString name = wxString::Format (wxT ("%s [%s]"), std_to_wx (cont->path_summary()).data(), type().data());
wxDouble name_width;
wxDouble name_height;
wxDouble name_descent;
wxDouble name_leading;
gc->GetTextExtent (name, &name_width, &name_height, &name_descent, &name_leading);
- gc->Clip (wxRegion (time_x (start), y_pos (_track), len * _timeline.pixels_per_time_unit(), _timeline.track_height()));
- gc->DrawText (name, time_x (start) + 12, y_pos (_track + 1) - name_height - 4);
+ gc->Clip (wxRegion (time_x (position), y_pos (_track), len * _timeline.pixels_per_time_unit(), _timeline.track_height()));
+ gc->DrawText (name, time_x (position) + 12, y_pos (_track + 1) - name_height - 4);
gc->ResetClip ();
}
{
ensure_ui_thread ();
- if (p == ContentProperty::START || p == ContentProperty::LENGTH) {
+ if (p == ContentProperty::POSITION || p == ContentProperty::LENGTH) {
force_redraw ();
}
int _y;
};
+
Timeline::Timeline (wxWindow* parent, FilmEditor* ed, shared_ptr<Film> film)
: wxPanel (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE)
, _film_editor (ed)
, _tracks (0)
, _pixels_per_time_unit (0)
, _left_down (false)
- , _down_view_start (0)
+ , _down_view_position (0)
, _first_move (false)
- , _menu (film, this)
+ , _menu (this)
+ , _snap (true)
{
#ifndef __WXOSX__
SetDoubleBuffered (true);
#endif
- Connect (wxID_ANY, wxEVT_PAINT, wxPaintEventHandler (Timeline::paint), 0, this);
- Connect (wxID_ANY, wxEVT_LEFT_DOWN, wxMouseEventHandler (Timeline::left_down), 0, this);
- Connect (wxID_ANY, wxEVT_LEFT_UP, wxMouseEventHandler (Timeline::left_up), 0, this);
- Connect (wxID_ANY, wxEVT_RIGHT_DOWN, wxMouseEventHandler (Timeline::right_down), 0, this);
- Connect (wxID_ANY, wxEVT_MOTION, wxMouseEventHandler (Timeline::mouse_moved), 0, this);
- Connect (wxID_ANY, wxEVT_SIZE, wxSizeEventHandler (Timeline::resized), 0, this);
+ Bind (wxEVT_PAINT, boost::bind (&Timeline::paint, this));
+ Bind (wxEVT_LEFT_DOWN, boost::bind (&Timeline::left_down, this, _1));
+ Bind (wxEVT_LEFT_UP, boost::bind (&Timeline::left_up, this, _1));
+ Bind (wxEVT_RIGHT_DOWN, boost::bind (&Timeline::right_down, this, _1));
+ Bind (wxEVT_MOTION, boost::bind (&Timeline::mouse_moved, this, _1));
+ Bind (wxEVT_SIZE, boost::bind (&Timeline::resized, this));
playlist_changed ();
}
void
-Timeline::paint (wxPaintEvent &)
+Timeline::paint ()
{
wxPaintDC dc (this);
if (test && test->track() == t) {
bool const no_overlap =
- (acv_content->start() < test_content->start() && acv_content->end() < test_content->start()) ||
- (acv_content->start() > test_content->end() && acv_content->end() > test_content->end());
+ (acv_content->position() < test_content->position() && acv_content->end() < test_content->position()) ||
+ (acv_content->position() > test_content->end() && acv_content->end() > test_content->end());
if (!no_overlap) {
/* we have an overlap on track `t' */
if (content_view) {
_down_view = content_view;
- _down_view_start = content_view->content()->start ();
+ _down_view_position = content_view->content()->position ();
}
for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) {
_down_view->content()->set_change_signals_frequent (false);
}
- set_start_from_event (ev);
+ set_position_from_event (ev);
}
void
return;
}
- set_start_from_event (ev);
+ set_position_from_event (ev);
}
void
cv->set_selected (true);
}
- _menu.popup (selected_content (), ev.GetPosition ());
+ _menu.popup (_film, selected_content (), ev.GetPosition ());
}
void
-Timeline::set_start_from_event (wxMouseEvent& ev)
+Timeline::set_position_from_event (wxMouseEvent& ev)
{
wxPoint const p = ev.GetPosition();
if (!_first_move) {
+ /* We haven't moved yet; in that case, we must move the mouse some reasonable distance
+ before the drag is considered to have started.
+ */
int const dist = sqrt (pow (p.x - _down_point.x, 2) + pow (p.y - _down_point.y, 2));
if (dist < 8) {
return;
_first_move = true;
}
- Time const time_diff = (p.x - _down_point.x) / _pixels_per_time_unit;
- if (_down_view) {
- _down_view->content()->set_start (max (static_cast<Time> (0), _down_view_start + time_diff));
-
- shared_ptr<Film> film = _film.lock ();
- assert (film);
- film->set_sequence_video (false);
+ if (!_down_view) {
+ return;
}
+
+ Time new_position = _down_view_position + (p.x - _down_point.x) / _pixels_per_time_unit;
+
+ if (_snap) {
+
+ bool first = true;
+ Time nearest_distance = TIME_MAX;
+ Time nearest_new_position = TIME_MAX;
+
+ /* Find the nearest content edge; this is inefficient */
+ for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) {
+ shared_ptr<ContentView> cv = dynamic_pointer_cast<ContentView> (*i);
+ if (!cv || cv == _down_view) {
+ continue;
+ }
+
+ {
+ /* Snap starts to ends */
+ Time const d = abs (cv->content()->end() - new_position);
+ if (first || d < nearest_distance) {
+ nearest_distance = d;
+ nearest_new_position = cv->content()->end();
+ }
+ }
+
+ {
+ /* Snap ends to starts */
+ Time const d = abs (cv->content()->position() - (new_position + _down_view->content()->length_after_trim()));
+ if (d < nearest_distance) {
+ nearest_distance = d;
+ nearest_new_position = cv->content()->position() - _down_view->content()->length_after_trim ();
+ }
+ }
+
+ first = false;
+ }
+
+ if (!first) {
+ /* Snap if it's close; `close' means within a proportion of the time on the timeline */
+ if (nearest_distance < (width() / pixels_per_time_unit()) / 32) {
+ new_position = nearest_new_position;
+ }
+ }
+ }
+
+ if (new_position < 0) {
+ new_position = 0;
+ }
+
+ _down_view->content()->set_position (new_position);
+
+ shared_ptr<Film> film = _film.lock ();
+ assert (film);
+ film->set_sequence_video (false);
}
void
}
void
-Timeline::resized (wxSizeEvent &)
+Timeline::resized ()
{
setup_pixels_per_time_unit ();
}
projects / dcpomatic.git / blobdiff