X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ftimeline_time_axis_view.cc;h=d055bda7d54bfb310e338f1fcd2b2112cc64ad51;hp=7882c1231d2041e0023e8d645013a6fb70f501fb;hb=28c36cd838edf5ae81d2f340c157576aa2b57e42;hpb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26

diff --git a/src/wx/timeline_time_axis_view.cc b/src/wx/timeline_time_axis_view.cc
index 7882c1231..d055bda7d 100644
--- a/src/wx/timeline_time_axis_view.cc
+++ b/src/wx/timeline_time_axis_view.cc
@@ -1,26 +1,38 @@
 /*
-    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 "timeline_time_axis_view.h"
+
 #include "timeline.h"
-#include <wx/wx.h>
+#include "timeline_time_axis_view.h"
+#include "wx_util.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/graphics.h>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
+
+
+using std::cout;
+using std::list;
+using namespace dcpomatic;
+
 
 TimelineTimeAxisView::TimelineTimeAxisView (Timeline& tl, int y)
 	: TimelineView (tl)
@@ -29,12 +41,15 @@ TimelineTimeAxisView::TimelineTimeAxisView (Timeline& tl, int y)
 
 }
 
+
 dcpomatic::Rect<int>
 TimelineTimeAxisView::bbox () const
 {
-	return dcpomatic::Rect<int> (0, _y - 4, _timeline.width(), 24);
+	return dcpomatic::Rect<int>(0, y_pos(_y), _timeline.width(), 48);
 }
 
+
+/** @param y y position in tracks (not pixels) */
 void
 TimelineTimeAxisView::set_y (int y)
 {
@@ -42,8 +57,9 @@ TimelineTimeAxisView::set_y (int y)
 	force_redraw ();
 }
 
+
 void
-TimelineTimeAxisView::do_paint (wxGraphicsContext* gc)
+TimelineTimeAxisView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int> >)
 {
 	if (!_timeline.pixels_per_second()) {
 		return;
@@ -51,39 +67,26 @@ TimelineTimeAxisView::do_paint (wxGraphicsContext* gc)
 
 	double const pps = _timeline.pixels_per_second().get ();
 
-	gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (0, 0, 0), 1, wxPENSTYLE_SOLID));
+	wxColour const colour = gui_is_dark() ? *wxWHITE : *wxBLACK;
+	gc->SetPen(*wxThePenList->FindOrCreatePen(colour, 1, wxPENSTYLE_SOLID));
 
-	double mark_interval = rint (128 / pps);
-	if (mark_interval > 5) {
-		mark_interval -= int (rint (mark_interval)) % 5;
-	}
-	if (mark_interval > 10) {
-		mark_interval -= int (rint (mark_interval)) % 10;
-	}
-	if (mark_interval > 60) {
-		mark_interval -= int (rint (mark_interval)) % 60;
-	}
-	if (mark_interval > 3600) {
-		mark_interval -= int (rint (mark_interval)) % 3600;
-	}
+	double const mark_interval = calculate_mark_interval (rint (128 / pps));
 
-	if (mark_interval < 1) {
-		mark_interval = 1;
-	}
+	int y = _y * _timeline.pixels_per_track() + 32;
 
 	wxGraphicsPath path = gc->CreatePath ();
-	path.MoveToPoint (_timeline.x_offset(), _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->SetFont(gc->CreateFont(*wxNORMAL_FONT, colour));
 
 	/* Time in seconds */
 	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 ();
@@ -100,9 +103,9 @@ TimelineTimeAxisView::do_paint (wxGraphicsContext* gc)
 		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 = t.seconds() * pps;
 		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);