X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline_content_view.cc;h=6902a11d62633785e1f0d3dd910793e378a4a9ca;hb=a713e8258acc3f0e960c4e87ba8684902d29a591;hp=324790f8715a4ae3e4f9a3498f92bebee030aca0;hpb=965ef4eee76ffda616243ed94bd2314a71216570;p=dcpomatic.git diff --git a/src/wx/timeline_content_view.cc b/src/wx/timeline_content_view.cc index 324790f87..6902a11d6 100644 --- a/src/wx/timeline_content_view.cc +++ b/src/wx/timeline_content_view.cc @@ -1,19 +1,20 @@ /* - Copyright (C) 2013-2015 Carl Hetherington + 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,15 +23,18 @@ #include "wx_util.h" #include "lib/content.h" #include +#include +using std::list; using boost::shared_ptr; +using namespace dcpomatic; TimelineContentView::TimelineContentView (Timeline& tl, shared_ptr c) : TimelineView (tl) , _content (c) , _selected (false) { - _content_connection = c->Changed.connect (bind (&TimelineContentView::content_changed, this, _2, _3)); + _content_connection = c->Change.connect (bind (&TimelineContentView::content_change, this, _1, _3)); } dcpomatic::Rect @@ -45,10 +49,10 @@ TimelineContentView::bbox () const } return dcpomatic::Rect ( - time_x (content->position ()) - 8, - y_pos (_track.get()) - 8, - content->length_after_trim().seconds() * _timeline.pixels_per_second().get_value_or(0) + 16, - _timeline.track_height() + 16 + time_x (content->position ()), + y_pos (_track.get()), + content->length_after_trim(film).seconds() * _timeline.pixels_per_second().get_value_or(0), + _timeline.pixels_per_track() ); } @@ -90,7 +94,7 @@ TimelineContentView::track () const } void -TimelineContentView::do_paint (wxGraphicsContext* gc) +TimelineContentView::do_paint (wxGraphicsContext* gc, list > overlaps) { DCPOMATIC_ASSERT (_track); @@ -101,7 +105,7 @@ TimelineContentView::do_paint (wxGraphicsContext* gc) } 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); @@ -112,44 +116,66 @@ TimelineContentView::do_paint (wxGraphicsContext* gc) gc->SetBrush (*wxTheBrushList->FindOrCreateBrush (background_colour(), wxBRUSHSTYLE_SOLID)); } + /* Outline */ wxGraphicsPath path = gc->CreatePath (); - 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); + 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) + 2, y_pos (_track.get() + 1) - 4); + path.AddLineToPoint (time_x (position) + 2, y_pos (_track.get()) + 4); gc->StrokePath (path); gc->FillPath (path); - wxString name = wxString::Format (wxT ("%s [%s]"), std_to_wx (cont->summary()).data(), type().data()); - wxDouble name_width; - wxDouble name_height; - wxDouble name_descent; - wxDouble name_leading; + /* Reel split points */ + gc->SetPen (*wxThePenList->FindOrCreatePen (foreground_colour(), 1, wxPENSTYLE_DOT)); + BOOST_FOREACH (DCPTime 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 (list >::const_iterator i = overlaps.begin(); i != overlaps.end(); ++i) { + gc->DrawRectangle (i->x, i->y + 4, i->width, i->height - 8); + } + + /* Label text */ + wxString 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->GetTextExtent (lab, &lab_width, &lab_height, &lab_descent, &lab_leading); + 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->ResetClip (); } 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, bool frequent) +TimelineContentView::content_change (ChangeType type, int p) { + if (type != CHANGE_TYPE_DONE) { + return; + } + ensure_ui_thread (); if (p == ContentProperty::POSITION || p == ContentProperty::LENGTH) { force_redraw (); } +} - if (!frequent) { - _timeline.setup_pixels_per_second (); - _timeline.Refresh (); - } +wxString +TimelineContentView::label () const +{ + return std_to_wx(content()->summary()); }