/*
- Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2016 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.
- 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 <http://www.gnu.org/licenses/>.
*/
#include <wx/wx.h>
#include <wx/graphics.h>
+using std::list;
+
TimelineTimeAxisView::TimelineTimeAxisView (Timeline& tl, int y)
: TimelineView (tl)
, _y (y)
dcpomatic::Rect<int>
TimelineTimeAxisView::bbox () const
{
- return dcpomatic::Rect<int> (0, _y - 4, _timeline.width(), 24);
+ return dcpomatic::Rect<int> (_timeline.tracks_position().x, _y - 4, _timeline.width(), 24);
}
void
}
void
-TimelineTimeAxisView::do_paint (wxGraphicsContext* gc)
+TimelineTimeAxisView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int> >)
{
if (!_timeline.pixels_per_second()) {
return;
double mark_interval = rint (128 / pps);
if (mark_interval > 5) {
- mark_interval -= int (rint (mark_interval)) % 5;
+ mark_interval -= lrint (mark_interval) % 5;
}
if (mark_interval > 10) {
- mark_interval -= int (rint (mark_interval)) % 10;
+ mark_interval -= lrint (mark_interval) % 10;
}
if (mark_interval > 60) {
- mark_interval -= int (rint (mark_interval)) % 60;
+ mark_interval -= lrint (mark_interval) % 60;
}
if (mark_interval > 3600) {
- mark_interval -= int (rint (mark_interval)) % 3600;
+ mark_interval -= lrint (mark_interval) % 3600;
}
if (mark_interval < 1) {
}
wxGraphicsPath path = gc->CreatePath ();
- path.MoveToPoint (_timeline.x_offset(), _y);
+ path.MoveToPoint (_timeline.tracks_position().x, _y);
path.AddLineToPoint (_timeline.width(), _y);
gc->StrokePath (path);
wxDouble str_leading;
gc->GetTextExtent (str, &str_width, &str_height, &str_descent, &str_leading);
- int const tx = _timeline.x_offset() + t.seconds() * pps;
+ int const tx = _timeline.tracks_position().x + t.seconds() * pps;
if ((tx + str_width) < _timeline.width()) {
gc->DrawText (str, time_x (t), _y + 16);
}