X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline.cc;h=eba12c47faff1421269b2f42067ec09ce90c8d6a;hb=3c7e1840081639ea5dc537c94baa13972a1987fd;hp=0ac9a1d4bb6d513e6fa3bedbfe96eeae66441777;hpb=a0c0e609f7fbff8513135428378cc16684bae937;p=dcpomatic.git diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index 0ac9a1d4b..eba12c47f 100644 --- a/src/wx/timeline.cc +++ b/src/wx/timeline.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2014 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -66,7 +66,7 @@ protected: int time_x (Time t) const { - return _timeline.tracks_position().x + t * _timeline.pixels_per_time_unit(); + return _timeline.tracks_position().x + t * _timeline.pixels_per_time_unit().get_value_or (0); } Timeline& _timeline; @@ -83,7 +83,6 @@ public: ContentView (Timeline& tl, shared_ptr c) : View (tl) , _content (c) - , _track (0) , _selected (false) { _content_connection = c->Changed.connect (bind (&ContentView::content_changed, this, _2, _3)); @@ -91,6 +90,8 @@ public: dcpomatic::Rect bbox () const { + assert (_track); + shared_ptr film = _timeline.film (); shared_ptr content = _content.lock (); if (!film || !content) { @@ -99,8 +100,8 @@ public: return dcpomatic::Rect ( time_x (content->position ()) - 8, - y_pos (_track) - 8, - content->length_after_trim () * _timeline.pixels_per_time_unit() + 16, + y_pos (_track.get()) - 8, + content->length_after_trim () * _timeline.pixels_per_time_unit().get_value_or(0) + 16, _timeline.track_height() + 16 ); } @@ -122,7 +123,11 @@ public: _track = t; } - int track () const { + void unset_track () { + _track = boost::optional (); + } + + optional track () const { return _track; } @@ -133,6 +138,8 @@ private: void do_paint (wxGraphicsContext* gc) { + assert (_track); + shared_ptr film = _timeline.film (); shared_ptr cont = content (); if (!film || !cont) { @@ -154,11 +161,11 @@ private: } wxGraphicsPath path = gc->CreatePath (); - 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); + path.MoveToPoint (time_x (position), y_pos (_track.get()) + 4); + path.AddLineToPoint (time_x (position + len), y_pos (_track.get()) + 4); + path.AddLineToPoint (time_x (position + len), y_pos (_track.get() + 1) - 4); + path.AddLineToPoint (time_x (position), y_pos (_track.get() + 1) - 4); + path.AddLineToPoint (time_x (position), y_pos (_track.get()) + 4); gc->StrokePath (path); gc->FillPath (path); @@ -169,8 +176,8 @@ private: wxDouble name_leading; gc->GetTextExtent (name, &name_width, &name_height, &name_descent, &name_leading); - 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->Clip (wxRegion (time_x (position), y_pos (_track.get()), len * _timeline.pixels_per_time_unit().get_value_or(0), _timeline.track_height())); + gc->DrawText (name, time_x (position) + 12, y_pos (_track.get() + 1) - name_height - 4); gc->ResetClip (); } @@ -194,7 +201,7 @@ private: } boost::weak_ptr _content; - int _track; + optional _track; bool _selected; boost::signals2::scoped_connection _content_connection; @@ -266,9 +273,15 @@ private: void do_paint (wxGraphicsContext* gc) { + if (!_timeline.pixels_per_time_unit()) { + return; + } + + double const pptu = _timeline.pixels_per_time_unit().get (); + gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (0, 0, 0), 1, wxPENSTYLE_SOLID)); - int mark_interval = rint (128 / (TIME_HZ * _timeline.pixels_per_time_unit ())); + int mark_interval = rint (128 / (TIME_HZ * pptu)); if (mark_interval > 5) { mark_interval -= mark_interval % 5; } @@ -292,7 +305,7 @@ private: gc->StrokePath (path); Time t = 0; - while ((t * _timeline.pixels_per_time_unit()) < _timeline.width()) { + while ((t * pptu) < _timeline.width()) { wxGraphicsPath path = gc->CreatePath (); path.MoveToPoint (time_x (t), _y - 4); path.AddLineToPoint (time_x (t), _y + 4); @@ -312,7 +325,7 @@ private: wxDouble str_leading; gc->GetTextExtent (str, &str_width, &str_height, &str_descent, &str_leading); - int const tx = _timeline.x_offset() + t * _timeline.pixels_per_time_unit(); + int const tx = _timeline.x_offset() + t * pptu; if ((tx + str_width) < _timeline.width()) { gc->DrawText (str, time_x (t), _y + 16); } @@ -332,11 +345,10 @@ Timeline::Timeline (wxWindow* parent, FilmEditor* ed, shared_ptr film) , _film (film) , _time_axis_view (new TimeAxisView (*this, 32)) , _tracks (0) - , _pixels_per_time_unit (0) , _left_down (false) , _down_view_position (0) , _first_move (false) - , _menu (film, this) + , _menu (this) , _snap (true) { #ifndef __WXOSX__ @@ -354,7 +366,8 @@ Timeline::Timeline (wxWindow* parent, FilmEditor* ed, shared_ptr film) SetMinSize (wxSize (640, tracks() * track_height() + 96)); - _playlist_connection = film->playlist()->Changed.connect (bind (&Timeline::playlist_changed, this)); + _playlist_changed_connection = film->playlist()->Changed.connect (bind (&Timeline::playlist_changed, this)); + _playlist_content_changed_connection = film->playlist()->ContentChanged.connect (bind (&Timeline::playlist_content_changed, this, _2)); } void @@ -405,30 +418,41 @@ Timeline::playlist_changed () Refresh (); } +void +Timeline::playlist_content_changed (int property) +{ + ensure_ui_thread (); + + if (property == ContentProperty::POSITION) { + assign_tracks (); + setup_pixels_per_time_unit (); + Refresh (); + } +} + void Timeline::assign_tracks () { for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) { - shared_ptr cv = dynamic_pointer_cast (*i); - if (cv) { - cv->set_track (0); - _tracks = 1; + shared_ptr c = dynamic_pointer_cast (*i); + if (c) { + c->unset_track (); } } for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) { - shared_ptr acv = dynamic_pointer_cast (*i); - if (!acv) { + shared_ptr cv = dynamic_pointer_cast (*i); + if (!cv) { continue; } - - shared_ptr acv_content = acv->content(); - int t = 1; - while (1) { + shared_ptr content = cv->content(); + + int t = 0; + while (true) { ViewList::iterator j = _views.begin(); while (j != _views.end()) { - shared_ptr test = dynamic_pointer_cast (*j); + shared_ptr test = dynamic_pointer_cast (*j); if (!test) { ++j; continue; @@ -436,10 +460,10 @@ Timeline::assign_tracks () shared_ptr test_content = test->content(); - if (test && test->track() == t) { + if (test && test->track() && test->track().get() == t) { bool const no_overlap = - (acv_content->position() < test_content->position() && acv_content->end() < test_content->position()) || - (acv_content->position() > test_content->end() && acv_content->end() > test_content->end()); + (content->position() < test_content->position() && content->end() < test_content->position()) || + (content->position() > test_content->end() && content->end() > test_content->end()); if (!no_overlap) { /* we have an overlap on track `t' */ @@ -457,7 +481,7 @@ Timeline::assign_tracks () } } - acv->set_track (t); + cv->set_track (t); _tracks = max (_tracks, t + 1); } @@ -474,7 +498,7 @@ void Timeline::setup_pixels_per_time_unit () { shared_ptr film = _film.lock (); - if (!film) { + if (!film || film->length() == 0) { return; } @@ -574,12 +598,18 @@ Timeline::right_down (wxMouseEvent& ev) cv->set_selected (true); } - _menu.popup (selected_content (), ev.GetPosition ()); + _menu.popup (_film, selected_content (), ev.GetPosition ()); } void Timeline::set_position_from_event (wxMouseEvent& ev) { + if (!_pixels_per_time_unit) { + return; + } + + double const pptu = _pixels_per_time_unit.get (); + wxPoint const p = ev.GetPosition(); if (!_first_move) { @@ -597,7 +627,7 @@ Timeline::set_position_from_event (wxMouseEvent& ev) return; } - Time new_position = _down_view_position + (p.x - _down_point.x) / _pixels_per_time_unit; + Time new_position = _down_view_position + (p.x - _down_point.x) / pptu; if (_snap) { @@ -635,7 +665,7 @@ Timeline::set_position_from_event (wxMouseEvent& ev) 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) { + if (nearest_distance < (width() / pptu) / 32) { new_position = nearest_new_position; } } @@ -644,7 +674,7 @@ Timeline::set_position_from_event (wxMouseEvent& ev) if (new_position < 0) { new_position = 0; } - + _down_view->content()->set_position (new_position); shared_ptr film = _film.lock ();