X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimeline_time_axis_view.cc;h=7882c1231d2041e0023e8d645013a6fb70f501fb;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=88236c64ff18cf41840186ea114d24f366e53d0f;hpb=341f0a81591ab83b96069d6e6bb70cbf8e6cf878;p=dcpomatic.git diff --git a/src/wx/timeline_time_axis_view.cc b/src/wx/timeline_time_axis_view.cc index 88236c64f..7882c1231 100644 --- a/src/wx/timeline_time_axis_view.cc +++ b/src/wx/timeline_time_axis_view.cc @@ -28,7 +28,7 @@ TimelineTimeAxisView::TimelineTimeAxisView (Timeline& tl, int y) { } - + dcpomatic::Rect TimelineTimeAxisView::bbox () const { @@ -48,11 +48,11 @@ TimelineTimeAxisView::do_paint (wxGraphicsContext* gc) if (!_timeline.pixels_per_second()) { return; } - + double const pps = _timeline.pixels_per_second().get (); - + gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (0, 0, 0), 1, wxPENSTYLE_SOLID)); - + double mark_interval = rint (128 / pps); if (mark_interval > 5) { mark_interval -= int (rint (mark_interval)) % 5; @@ -66,18 +66,18 @@ TimelineTimeAxisView::do_paint (wxGraphicsContext* gc) if (mark_interval > 3600) { mark_interval -= int (rint (mark_interval)) % 3600; } - + if (mark_interval < 1) { mark_interval = 1; } - + wxGraphicsPath path = gc->CreatePath (); path.MoveToPoint (_timeline.x_offset(), _y); path.AddLineToPoint (_timeline.width(), _y); gc->StrokePath (path); - + gc->SetFont (gc->CreateFont (*wxNORMAL_FONT)); - + /* Time in seconds */ DCPTime t; while ((t.seconds() * pps) < _timeline.width()) { @@ -85,26 +85,26 @@ TimelineTimeAxisView::do_paint (wxGraphicsContext* gc) path.MoveToPoint (time_x (t), _y - 4); path.AddLineToPoint (time_x (t), _y + 4); gc->StrokePath (path); - + double tc = t.seconds (); int const h = tc / 3600; tc -= h * 3600; int const m = tc / 60; tc -= m * 60; int const s = tc; - + wxString str = wxString::Format (wxT ("%02d:%02d:%02d"), h, m, s); wxDouble str_width; wxDouble str_height; wxDouble str_descent; wxDouble str_leading; gc->GetTextExtent (str, &str_width, &str_height, &str_descent, &str_leading); - + int const tx = _timeline.x_offset() + t.seconds() * pps; if ((tx + str_width) < _timeline.width()) { gc->DrawText (str, time_x (t), _y + 16); } - + t += DCPTime::from_seconds (mark_interval); } }