projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Missing include.
[dcpomatic.git]
/
src
/
wx
/
timeline_view.cc
diff --git
a/src/wx/timeline_view.cc
b/src/wx/timeline_view.cc
index e8b3856adb45f8e3d22858cda9616e43fa178065..2897c98e35398a27d83c13c875d6d016b90cc3c3 100644
(file)
--- a/
src/wx/timeline_view.cc
+++ b/
src/wx/timeline_view.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2013-20
15
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,10
+18,14
@@
*/
*/
+
#include "timeline_view.h"
#include "timeline.h"
#include "timeline_view.h"
#include "timeline.h"
+
using std::list;
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).
/** @class TimelineView
* @brief Parent class for components of the timeline (e.g. a piece of content or an axis).
@@
-32,22
+36,34
@@
TimelineView::TimelineView (Timeline& t)
}
}
+
void
void
-TimelineView::paint (wxGraphicsContext* g, list<dcpomatic::Rect<int>
> overlaps)
+TimelineView::paint (wxGraphicsContext* g, list<dcpomatic::Rect<int>> overlaps)
{
_last_paint_bbox = bbox ();
do_paint (g, overlaps);
}
{
_last_paint_bbox = bbox ();
do_paint (g, overlaps);
}
+
void
TimelineView::force_redraw ()
{
void
TimelineView::force_redraw ()
{
- _timeline.force_redraw (_last_paint_bbox.extended
(4));
- _timeline.force_redraw (bbox().extended
(4));
+ _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);
}
}
+
+
+int
+TimelineView::y_pos(int t) const
+{
+ return t * _timeline.pixels_per_track() + _timeline.tracks_y_offset();
+}
+
+