projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
C++11 and general tidying.
[dcpomatic.git]
/
src
/
wx
/
timeline_time_axis_view.cc
diff --git
a/src/wx/timeline_time_axis_view.cc
b/src/wx/timeline_time_axis_view.cc
index 1947faa0bfcb4c694a8a5720a606458eb33939e3..cd0b97d193fdc21c1d8e8b2c35dc2d43221559a6 100644
(file)
--- a/
src/wx/timeline_time_axis_view.cc
+++ b/
src/wx/timeline_time_axis_view.cc
@@
-25,6
+25,8
@@
#include <wx/graphics.h>
using std::list;
#include <wx/graphics.h>
using std::list;
+using std::cout;
+using namespace dcpomatic;
TimelineTimeAxisView::TimelineTimeAxisView (Timeline& tl, int y)
: TimelineView (tl)
TimelineTimeAxisView::TimelineTimeAxisView (Timeline& tl, int y)
: TimelineView (tl)
@@
-36,9
+38,10
@@
TimelineTimeAxisView::TimelineTimeAxisView (Timeline& tl, int y)
dcpomatic::Rect<int>
TimelineTimeAxisView::bbox () const
{
dcpomatic::Rect<int>
TimelineTimeAxisView::bbox () const
{
- return dcpomatic::Rect<int> (
_timeline.tracks_position().x
, _y - 4, _timeline.width(), 24);
+ return dcpomatic::Rect<int> (
0
, _y - 4, _timeline.width(), 24);
}
}
+/** @param y y position in tracks (not pixels) */
void
TimelineTimeAxisView::set_y (int y)
{
void
TimelineTimeAxisView::set_y (int y)
{
@@
-47,7
+50,7
@@
TimelineTimeAxisView::set_y (int y)
}
void
}
void
-TimelineTimeAxisView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int>
>)
+TimelineTimeAxisView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int>>)
{
if (!_timeline.pixels_per_second()) {
return;
{
if (!_timeline.pixels_per_second()) {
return;
@@
-59,9
+62,11
@@
TimelineTimeAxisView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int>
double const mark_interval = calculate_mark_interval (rint (128 / pps));
double const mark_interval = calculate_mark_interval (rint (128 / pps));
+ int y = _y * _timeline.pixels_per_track() + 32;
+
wxGraphicsPath path = gc->CreatePath ();
wxGraphicsPath path = gc->CreatePath ();
- path.MoveToPoint (
_timeline.tracks_position().x, _
y);
- path.AddLineToPoint (_timeline.width(),
_
y);
+ path.MoveToPoint (
0,
y);
+ path.AddLineToPoint (_timeline.width(), y);
gc->StrokePath (path);
gc->SetFont (gc->CreateFont (*wxNORMAL_FONT));
gc->StrokePath (path);
gc->SetFont (gc->CreateFont (*wxNORMAL_FONT));
@@
-70,8
+75,8
@@
TimelineTimeAxisView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int>
DCPTime t;
while ((t.seconds() * pps) < _timeline.width()) {
wxGraphicsPath path = gc->CreatePath ();
DCPTime t;
while ((t.seconds() * pps) < _timeline.width()) {
wxGraphicsPath path = gc->CreatePath ();
- path.MoveToPoint (time_x (t),
_
y - 4);
- path.AddLineToPoint (time_x (t),
_
y + 4);
+ path.MoveToPoint (time_x (t), y - 4);
+ path.AddLineToPoint (time_x (t), y + 4);
gc->StrokePath (path);
double tc = t.seconds ();
gc->StrokePath (path);
double tc = t.seconds ();
@@
-88,9
+93,9
@@
TimelineTimeAxisView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int>
wxDouble str_leading;
gc->GetTextExtent (str, &str_width, &str_height, &str_descent, &str_leading);
wxDouble str_leading;
gc->GetTextExtent (str, &str_width, &str_height, &str_descent, &str_leading);
- int const tx =
_timeline.tracks_position().x +
t.seconds() * pps;
+ int const tx = t.seconds() * pps;
if ((tx + str_width) < _timeline.width()) {
if ((tx + str_width) < _timeline.width()) {
- gc->DrawText (str, time_x (t),
_
y + 16);
+ gc->DrawText (str, time_x (t), y + 16);
}
t += DCPTime::from_seconds (mark_interval);
}
t += DCPTime::from_seconds (mark_interval);