projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
C++11 tidying.
[dcpomatic.git]
/
src
/
wx
/
timeline_view.cc
diff --git
a/src/wx/timeline_view.cc
b/src/wx/timeline_view.cc
index dbcbe025911bb902dc00d1edc87bdae833fd7cfa..10d6dc5beb9d1e4f4d9cf9e1d584ca5c629ce7e5 100644
(file)
--- a/
src/wx/timeline_view.cc
+++ b/
src/wx/timeline_view.cc
@@
-1,51
+1,60
@@
/*
/*
- Copyright (C) 2013-20
15
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-20
21
Carl Hetherington <cth@carlh.net>
- 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.
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
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 <http://www.gnu.org/licenses/>.
*/
*/
+
#include "timeline_view.h"
#include "timeline.h"
#include "timeline_view.h"
#include "timeline.h"
+
+using std::list;
+using namespace dcpomatic;
+
+
/** @class TimelineView
* @brief Parent class for components of the timeline (e.g. a piece of content or an axis).
*/
TimelineView::TimelineView (Timeline& t)
: _timeline (t)
{
/** @class TimelineView
* @brief Parent class for components of the timeline (e.g. a piece of content or an axis).
*/
TimelineView::TimelineView (Timeline& t)
: _timeline (t)
{
-
+
}
}
+
void
void
-TimelineView::paint (wxGraphicsContext* g)
+TimelineView::paint (wxGraphicsContext* g
, list<dcpomatic::Rect<int>> overlaps
)
{
_last_paint_bbox = bbox ();
{
_last_paint_bbox = bbox ();
- do_paint (g);
+ do_paint (g
, overlaps
);
}
}
+
void
TimelineView::force_redraw ()
{
void
TimelineView::force_redraw ()
{
- _timeline.force_redraw (_last_paint_bbox);
- _timeline.force_redraw (bbox
(
));
+ _timeline.force_redraw (_last_paint_bbox
.extended(4)
);
+ _timeline.force_redraw (bbox
().extended(4
));
}
}
+
int
TimelineView::time_x (DCPTime t) const
{
int
TimelineView::time_x (DCPTime t) const
{
-
return _timeline.tracks_position().x + t.seconds() * _timeline.pixels_per_second().get_value_or
(0);
+
return t.seconds() * _timeline.pixels_per_second().get_value_or
(0);
}
}
-