From 7bc94f069f011a1a7e8554aa5cc88167e409c1f8 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 19 Oct 2015 22:30:55 +0100 Subject: [PATCH] Draw reels in the timeline. --- ChangeLog | 2 + src/wx/timeline.cc | 8 ++- src/wx/timeline.h | 2 + src/wx/timeline_reels_view.cc | 92 +++++++++++++++++++++++++++++++++++ src/wx/timeline_reels_view.h | 35 +++++++++++++ src/wx/timeline_view.cc | 3 +- src/wx/wscript | 1 + 7 files changed, 139 insertions(+), 4 deletions(-) create mode 100644 src/wx/timeline_reels_view.cc create mode 100644 src/wx/timeline_reels_view.h diff --git a/ChangeLog b/ChangeLog index 9c36429f8..316f4befa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2015-10-19 Carl Hetherington + * Draw reels in the timeline. + * Fix by-video-content reel split when there is stuff after the last piece of video content. diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc index f91d2937f..e2cc1a249 100644 --- a/src/wx/timeline.cc +++ b/src/wx/timeline.cc @@ -20,6 +20,7 @@ #include "film_editor.h" #include "timeline.h" #include "timeline_time_axis_view.h" +#include "timeline_reels_view.h" #include "timeline_video_content_view.h" #include "timeline_audio_content_view.h" #include "timeline_subtitle_content_view.h" @@ -49,7 +50,8 @@ Timeline::Timeline (wxWindow* parent, ContentPanel* cp, shared_ptr film) : wxPanel (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE) , _content_panel (cp) , _film (film) - , _time_axis_view (new TimelineTimeAxisView (*this, 32)) + , _time_axis_view (new TimelineTimeAxisView (*this, 64)) + , _reels_view (new TimelineReelsView (*this, 32)) , _tracks (0) , _left_down (false) , _down_view_position (0) @@ -112,6 +114,7 @@ Timeline::recreate_views () _views.clear (); _views.push_back (_time_axis_view); + _views.push_back (_reels_view); BOOST_FOREACH (shared_ptr i, film->content ()) { if (dynamic_pointer_cast (i)) { @@ -203,7 +206,8 @@ Timeline::assign_tracks () _tracks = max (_tracks, t + 1); } - _time_axis_view->set_y (tracks() * track_height() + 32); + _time_axis_view->set_y (tracks() * track_height() + 64); + _reels_view->set_y (tracks() * track_height() + 32); } int diff --git a/src/wx/timeline.h b/src/wx/timeline.h index 2afd0d194..e8becf906 100644 --- a/src/wx/timeline.h +++ b/src/wx/timeline.h @@ -31,6 +31,7 @@ class Film; class ContentPanel; class TimelineView; class TimelineTimeAxisView; +class TimelineReelsView; class Timeline : public wxPanel { @@ -96,6 +97,7 @@ private: boost::weak_ptr _film; TimelineViewList _views; boost::shared_ptr _time_axis_view; + boost::shared_ptr _reels_view; int _tracks; boost::optional _pixels_per_second; bool _left_down; diff --git a/src/wx/timeline_reels_view.cc b/src/wx/timeline_reels_view.cc new file mode 100644 index 000000000..6013c60a7 --- /dev/null +++ b/src/wx/timeline_reels_view.cc @@ -0,0 +1,92 @@ +/* + Copyright (C) 2015 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 + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +#include "timeline_reels_view.h" +#include "timeline.h" +#include +#include +#include + +using std::min; + +TimelineReelsView::TimelineReelsView (Timeline& tl, int y) + : TimelineView (tl) + , _y (y) +{ + +} + +dcpomatic::Rect +TimelineReelsView::bbox () const +{ + return dcpomatic::Rect (0, _y - 4, _timeline.width(), 24); +} + +void +TimelineReelsView::set_y (int y) +{ + _y = y; + force_redraw (); +} + +void +TimelineReelsView::do_paint (wxGraphicsContext* gc) +{ + if (!_timeline.pixels_per_second()) { + return; + } + + double const pps = _timeline.pixels_per_second().get (); + + gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (0, 0, 255), 1, wxPENSTYLE_SOLID)); + + wxGraphicsPath path = gc->CreatePath (); + path.MoveToPoint (time_x (DCPTime (0)), _y); + path.AddLineToPoint (time_x (_timeline.film()->length()), _y); + gc->StrokePath (path); + + gc->SetFont (gc->CreateFont (*wxNORMAL_FONT, wxColour (0, 0, 255))); + + int reel = 1; + BOOST_FOREACH (DCPTimePeriod i, _timeline.film()->reels()) { + int const size = min (8.0, i.duration().seconds() * pps / 2); + + wxGraphicsPath path = gc->CreatePath (); + path.MoveToPoint (time_x (i.from) + size, _y + size / 2); + path.AddLineToPoint (time_x (i.from), _y); + path.AddLineToPoint (time_x (i.from) + size, _y - size / 2); + gc->StrokePath (path); + + path = gc->CreatePath (); + path.MoveToPoint (time_x (i.to) - size, _y + size / 2); + path.AddLineToPoint (time_x (i.to), _y); + path.AddLineToPoint (time_x (i.to) - size, _y - size / 2); + gc->StrokePath (path); + + wxString str = wxString::Format (_("Reel %d"), reel++); + wxDouble str_width; + wxDouble str_height; + wxDouble str_descent; + wxDouble str_leading; + gc->GetTextExtent (str, &str_width, &str_height, &str_descent, &str_leading); + + int const tx = time_x (DCPTime((i.from.get() + i.to.get()) / 2)); + gc->DrawText (str, tx - str_width / 2, _y + 4); + } +} diff --git a/src/wx/timeline_reels_view.h b/src/wx/timeline_reels_view.h new file mode 100644 index 000000000..b357be23c --- /dev/null +++ b/src/wx/timeline_reels_view.h @@ -0,0 +1,35 @@ +/* + Copyright (C) 2015 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 + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +#include "timeline_view.h" + +class TimelineReelsView : public TimelineView +{ +public: + TimelineReelsView (Timeline& tl, int y); + + dcpomatic::Rect bbox () const; + void set_y (int y); + +private: + void do_paint (wxGraphicsContext* gc); + +private: + int _y; +}; diff --git a/src/wx/timeline_view.cc b/src/wx/timeline_view.cc index 0d2fca381..a1c5fb7ec 100644 --- a/src/wx/timeline_view.cc +++ b/src/wx/timeline_view.cc @@ -46,6 +46,5 @@ TimelineView::force_redraw () int TimelineView::time_x (DCPTime t) const { - return _timeline.tracks_position().x + t.seconds() * _timeline.pixels_per_second().get_value_or (0); + return _timeline.tracks_position().x + t.seconds() * _timeline.pixels_per_second().get_value_or (0); } - diff --git a/src/wx/wscript b/src/wx/wscript index 3657f5287..346d292c6 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -79,6 +79,7 @@ sources = """ timeline_dialog.cc timeline_audio_content_view.cc timeline_subtitle_content_view.cc + timeline_reels_view.cc timeline_time_axis_view.cc timeline_video_content_view.cc timeline_view.cc -- 2.30.2