X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline_content_view.cc;h=677b83bdde27a4dc7cd5176cb92cfcbf2fdc5fa9;hb=92933c13e9233149e4e80244d92da81b70072214;hp=ed7e1d3d04ac4c13abd145f881360b861dc55593;hpb=e1ec5b2c81ec2e15d4c1d97cce8252fa34c7116a;p=dcpomatic.git diff --git a/src/wx/timeline_content_view.cc b/src/wx/timeline_content_view.cc index ed7e1d3d0..677b83bdd 100644 --- a/src/wx/timeline_content_view.cc +++ b/src/wx/timeline_content_view.cc @@ -1,19 +1,20 @@ /* Copyright (C) 2013-2016 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic 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, + DCP-o-matic 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. + along with DCP-o-matic. If not, see . */ @@ -22,16 +23,19 @@ #include "wx_util.h" #include "lib/content.h" #include -#include -using boost::shared_ptr; +using std::list; +using std::shared_ptr; +using namespace dcpomatic; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif TimelineContentView::TimelineContentView (Timeline& tl, shared_ptr c) : TimelineView (tl) , _content (c) - , _selected (false) { - _content_connection = c->Changed.connect (bind (&TimelineContentView::content_changed, this, _2)); + _content_connection = c->Change.connect (bind (&TimelineContentView::content_change, this, _1, _3)); } dcpomatic::Rect @@ -39,17 +43,17 @@ TimelineContentView::bbox () const { DCPOMATIC_ASSERT (_track); - shared_ptr film = _timeline.film (); - shared_ptr content = _content.lock (); + auto film = _timeline.film (); + auto content = _content.lock (); if (!film || !content) { - return dcpomatic::Rect (); + return {}; } return dcpomatic::Rect ( time_x (content->position ()), y_pos (_track.get()), - content->length_after_trim().seconds() * _timeline.pixels_per_second().get_value_or(0), - _timeline.track_height() + content->length_after_trim(film).seconds() * _timeline.pixels_per_second().get_value_or(0), + _timeline.pixels_per_track() ); } @@ -81,7 +85,7 @@ TimelineContentView::set_track (int t) void TimelineContentView::unset_track () { - _track = boost::optional (); + _track = boost::optional(); } boost::optional @@ -91,18 +95,18 @@ TimelineContentView::track () const } void -TimelineContentView::do_paint (wxGraphicsContext* gc) +TimelineContentView::do_paint (wxGraphicsContext* gc, list > overlaps) { DCPOMATIC_ASSERT (_track); - shared_ptr film = _timeline.film (); - shared_ptr cont = content (); + auto film = _timeline.film (); + auto cont = content (); if (!film || !cont) { return; } DCPTime const position = cont->position (); - DCPTime const len = cont->length_after_trim (); + DCPTime const len = cont->length_after_trim (film); wxColour selected (background_colour().Red() / 2, background_colour().Green() / 2, background_colour().Blue() / 2); @@ -114,49 +118,66 @@ TimelineContentView::do_paint (wxGraphicsContext* gc) } /* Outline */ - wxGraphicsPath path = gc->CreatePath (); - path.MoveToPoint (time_x (position) + 1, y_pos (_track.get()) + 4); + auto path = gc->CreatePath (); + path.MoveToPoint (time_x (position) + 2, y_pos (_track.get()) + 4); path.AddLineToPoint (time_x (position + len) - 1, y_pos (_track.get()) + 4); path.AddLineToPoint (time_x (position + len) - 1, y_pos (_track.get() + 1) - 4); - path.AddLineToPoint (time_x (position) + 1, y_pos (_track.get() + 1) - 4); - path.AddLineToPoint (time_x (position) + 1, y_pos (_track.get()) + 4); + path.AddLineToPoint (time_x (position) + 2, y_pos (_track.get() + 1) - 4); + path.AddLineToPoint (time_x (position) + 2, y_pos (_track.get()) + 4); gc->StrokePath (path); gc->FillPath (path); /* Reel split points */ gc->SetPen (*wxThePenList->FindOrCreatePen (foreground_colour(), 1, wxPENSTYLE_DOT)); - BOOST_FOREACH (DCPTime i, cont->reel_split_points ()) { + for (auto i: cont->reel_split_points(film)) { path = gc->CreatePath (); path.MoveToPoint (time_x (i), y_pos (_track.get()) + 4); path.AddLineToPoint (time_x (i), y_pos (_track.get() + 1) - 4); gc->StrokePath (path); } + /* Overlaps */ + gc->SetBrush (*wxTheBrushList->FindOrCreateBrush (foreground_colour(), wxBRUSHSTYLE_CROSSDIAG_HATCH)); + for (auto const& i: overlaps) { + gc->DrawRectangle (i.x, i.y + 4, i.width, i.height - 8); + } + /* Label text */ - wxString name = std_to_wx (cont->summary()); - wxDouble name_width; - wxDouble name_height; - wxDouble name_descent; - wxDouble name_leading; + auto lab = label (); + wxDouble lab_width; + wxDouble lab_height; + wxDouble lab_descent; + wxDouble lab_leading; gc->SetFont (gc->CreateFont (*wxNORMAL_FONT, foreground_colour ())); - gc->GetTextExtent (name, &name_width, &name_height, &name_descent, &name_leading); - gc->Clip (wxRegion (time_x (position), y_pos (_track.get()), len.seconds() * _timeline.pixels_per_second().get_value_or(0), _timeline.track_height())); - gc->DrawText (name, time_x (position) + 12, y_pos (_track.get() + 1) - name_height - 4); - gc->ResetClip (); + gc->GetTextExtent (lab, &lab_width, &lab_height, &lab_descent, &lab_leading); + gc->PushState (); + gc->Clip (wxRegion (time_x (position), y_pos (_track.get()), len.seconds() * _timeline.pixels_per_second().get_value_or(0), _timeline.pixels_per_track())); + gc->DrawText (lab, time_x (position) + 12, y_pos (_track.get() + 1) - lab_height - 4); + gc->PopState (); } int TimelineContentView::y_pos (int t) const { - return _timeline.tracks_position().y + t * _timeline.track_height(); + return t * _timeline.pixels_per_track() + _timeline.tracks_y_offset(); } void -TimelineContentView::content_changed (int p) +TimelineContentView::content_change (ChangeType type, int p) { + if (type != ChangeType::DONE) { + return; + } + ensure_ui_thread (); if (p == ContentProperty::POSITION || p == ContentProperty::LENGTH) { force_redraw (); } } + +wxString +TimelineContentView::label () const +{ + return std_to_wx(content()->summary()); +}