X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_plot.cc;h=abd538037e5f6e53ff996443dfa283d883406aff;hb=HEAD;hp=629de77672864eaf056b34310d665845dbdac267;hpb=9f940fe8533526b10eb9cf22a8772e122760c368;p=dcpomatic.git diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc index 629de7767..abd538037 100644 --- a/src/wx/audio_plot.cc +++ b/src/wx/audio_plot.cc @@ -18,34 +18,44 @@ */ + #include "audio_plot.h" -#include "wx_util.h" #include "film_viewer.h" +#include "wx_util.h" #include "lib/audio_decoder.h" #include "lib/audio_analysis.h" #include "lib/compose.hpp" +#include "lib/constants.h" +#include "lib/maths_util.h" +#include +LIBDCP_DISABLE_WARNINGS #include -#include -#include +LIBDCP_ENABLE_WARNINGS +#include #include -using std::cout; -using std::vector; + using std::list; +using std::map; using std::max; using std::min; -using std::map; +using std::shared_ptr; +using std::vector; +using std::weak_ptr; using boost::bind; using boost::optional; -using boost::shared_ptr; -using boost::weak_ptr; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using namespace dcpomatic; + int const AudioPlot::_minimum = -70; int const AudioPlot::_cursor_size = 8; int const AudioPlot::max_smoothing = 128; -AudioPlot::AudioPlot (wxWindow* parent, weak_ptr viewer) + +AudioPlot::AudioPlot(wxWindow* parent, FilmViewer& viewer) : wxPanel (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE) , _viewer (viewer) , _smoothing (max_smoothing / 2) @@ -63,7 +73,11 @@ AudioPlot::AudioPlot (wxWindow* parent, weak_ptr viewer) _type_visible[i] = false; } - _colours.push_back (wxColour ( 0, 0, 0)); + if (gui_is_dark()) { + _colours.push_back(wxColour(255, 255, 255)); + } else { + _colours.push_back(wxColour(0, 0, 0)); + } _colours.push_back (wxColour (255, 0, 0)); _colours.push_back (wxColour ( 0, 255, 0)); _colours.push_back (wxColour (139, 0, 204)); @@ -95,6 +109,7 @@ AudioPlot::AudioPlot (wxWindow* parent, weak_ptr viewer) SetMinSize (wxSize (640, 512)); } + void AudioPlot::set_analysis (shared_ptr a) { @@ -107,6 +122,7 @@ AudioPlot::set_analysis (shared_ptr a) Refresh (); } + void AudioPlot::set_channel_visible (int c, bool v) { @@ -114,6 +130,7 @@ AudioPlot::set_channel_visible (int c, bool v) Refresh (); } + void AudioPlot::set_type_visible (int t, bool v) { @@ -121,6 +138,7 @@ AudioPlot::set_type_visible (int t, bool v) Refresh (); } + void AudioPlot::set_message (wxString s) { @@ -128,6 +146,7 @@ AudioPlot::set_message (wxString s) Refresh (); } + struct Metrics { double db_label_width; @@ -137,24 +156,28 @@ struct Metrics float y_scale; }; + void AudioPlot::paint () { wxPaintDC dc (this); - wxGraphicsContext* gc = wxGraphicsContext::Create (dc); + auto gc = wxGraphicsContext::Create (dc); if (!gc) { return; } + gc->SetAntialiasMode (wxANTIALIAS_DEFAULT); + if (!_analysis || _analysis->channels() == 0) { - gc->SetFont (gc->CreateFont (*wxNORMAL_FONT)); + gc->SetFont(gc->CreateFont(*wxNORMAL_FONT, gui_is_dark() ? *wxWHITE : *wxBLACK)); gc->DrawText (_message, 32, 32); + delete gc; return; } - wxGraphicsPath h_grid = gc->CreatePath (); - gc->SetFont (gc->CreateFont (*wxSMALL_FONT)); + auto h_grid = gc->CreatePath (); + gc->SetFont(gc->CreateFont(*wxSMALL_FONT, gui_is_dark() ? *wxWHITE : *wxBLACK)); wxDouble db_label_height; wxDouble db_label_descent; wxDouble db_label_leading; @@ -177,21 +200,21 @@ AudioPlot::paint () gc->DrawText (std_to_wx (String::compose ("%1dB", i)), 0, y - (db_label_height / 2)); } - gc->SetPen (wxPen (wxColour (200, 200, 200))); + wxColour const grid_colour = gui_is_dark() ? wxColour(80, 80, 80) : wxColour(200, 200, 200); + + gc->SetPen(wxPen(grid_colour)); gc->StrokePath (h_grid); /* Draw an x axis with marks */ - wxGraphicsPath v_grid = gc->CreatePath (); + auto v_grid = gc->CreatePath (); DCPOMATIC_ASSERT (_analysis->samples_per_point() != 0.0); double const pps = _analysis->sample_rate() * metrics.x_scale / _analysis->samples_per_point(); - gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (0, 0, 0), 1, wxPENSTYLE_SOLID)); - double const mark_interval = calculate_mark_interval (rint (128 / pps)); - DCPTime t = DCPTime::from_seconds (mark_interval); + auto t = DCPTime::from_seconds (mark_interval); while ((t.seconds() * pps) < data_width) { double tc = t.seconds (); int const h = tc / 3600; @@ -200,7 +223,7 @@ AudioPlot::paint () tc -= m * 60; int const s = tc; - wxString str = wxString::Format (wxT ("%02d:%02d:%02d"), h, m, s); + auto str = wxString::Format (wxT ("%02d:%02d:%02d"), h, m, s); wxDouble str_width; wxDouble str_height; wxDouble str_descent; @@ -216,16 +239,16 @@ AudioPlot::paint () t += DCPTime::from_seconds (mark_interval); } - gc->SetPen (wxPen (wxColour (200, 200, 200))); + gc->SetPen(wxPen(grid_colour)); gc->StrokePath (v_grid); if (_type_visible[AudioPoint::PEAK]) { for (int c = 0; c < MAX_DCP_AUDIO_CHANNELS; ++c) { - wxGraphicsPath p = gc->CreatePath (); + auto p = gc->CreatePath (); if (_channel_visible[c] && c < _analysis->channels()) { plot_peak (p, c, metrics); } - wxColour const col = _colours[c]; + auto const col = _colours[c]; gc->SetPen (wxPen (wxColour (col.Red(), col.Green(), col.Blue(), col.Alpha() / 2), 1, wxPENSTYLE_SOLID)); gc->StrokePath (p); } @@ -233,37 +256,36 @@ AudioPlot::paint () if (_type_visible[AudioPoint::RMS]) { for (int c = 0; c < MAX_DCP_AUDIO_CHANNELS; ++c) { - wxGraphicsPath p = gc->CreatePath (); + auto p = gc->CreatePath (); if (_channel_visible[c] && c < _analysis->channels()) { plot_rms (p, c, metrics); } - wxColour const col = _colours[c]; + auto const col = _colours[c]; gc->SetPen (wxPen (col, 1, wxPENSTYLE_SOLID)); gc->StrokePath (p); } } - wxGraphicsPath axes = gc->CreatePath (); + auto axes = gc->CreatePath (); axes.MoveToPoint (metrics.db_label_width, 0); axes.AddLineToPoint (metrics.db_label_width, metrics.height - metrics.y_origin); axes.AddLineToPoint (metrics.db_label_width + data_width, metrics.height - metrics.y_origin); - gc->SetPen (wxPen (wxColour (0, 0, 0))); + gc->SetPen(wxPen(grid_colour)); gc->StrokePath (axes); if (_cursor) { - wxGraphicsPath cursor = gc->CreatePath (); + auto cursor = gc->CreatePath (); cursor.MoveToPoint (_cursor->draw.x - _cursor_size / 2, _cursor->draw.y - _cursor_size / 2); cursor.AddLineToPoint (_cursor->draw.x + _cursor_size / 2, _cursor->draw.y + _cursor_size / 2); cursor.MoveToPoint (_cursor->draw.x + _cursor_size / 2, _cursor->draw.y - _cursor_size / 2); cursor.AddLineToPoint (_cursor->draw.x - _cursor_size / 2, _cursor->draw.y + _cursor_size / 2); gc->StrokePath (cursor); - - } delete gc; } + float AudioPlot::y_for_linear (float p, Metrics const & metrics) const { @@ -274,6 +296,7 @@ AudioPlot::y_for_linear (float p, Metrics const & metrics) const return metrics.height - (linear_to_db(p) - _minimum) * metrics.y_scale - metrics.y_origin; } + void AudioPlot::plot_peak (wxGraphicsPath& path, int channel, Metrics const & metrics) const { @@ -306,11 +329,12 @@ AudioPlot::plot_peak (wxGraphicsPath& path, int channel, Metrics const & metrics DCPOMATIC_ASSERT (_peak.find(channel) != _peak.end()); path.MoveToPoint (_peak[channel][0].draw); - BOOST_FOREACH (Point const & i, _peak[channel]) { + for (auto const& i: _peak[channel]) { path.AddLineToPoint (i.draw); } } + void AudioPlot::plot_rms (wxGraphicsPath& path, int channel, Metrics const & metrics) const { @@ -375,11 +399,12 @@ AudioPlot::plot_rms (wxGraphicsPath& path, int channel, Metrics const & metrics) DCPOMATIC_ASSERT (_rms.find(channel) != _rms.end()); path.MoveToPoint (_rms[channel][0].draw); - BOOST_FOREACH (Point const & i, _rms[channel]) { + for (auto const& i: _rms[channel]) { path.AddLineToPoint (i.draw); } } + void AudioPlot::set_smoothing (int s) { @@ -389,6 +414,7 @@ AudioPlot::set_smoothing (int s) Refresh (); } + void AudioPlot::set_gain_correction (double gain) { @@ -396,10 +422,11 @@ AudioPlot::set_gain_correction (double gain) Refresh (); } + AudioPoint AudioPlot::get_point (int channel, int point) const { - AudioPoint p = _analysis->get_point (channel, point); + auto p = _analysis->get_point (channel, point); for (int i = 0; i < AudioPoint::COUNT; ++i) { p[i] *= db_to_linear(_gain_correction); } @@ -407,6 +434,7 @@ AudioPlot::get_point (int channel, int point) const return p; } + /** @param n Channel index. * @return Colour used by that channel in the plot. */ @@ -417,29 +445,12 @@ AudioPlot::colour (int n) const return _colours[n]; } -void -AudioPlot::search (map const & search, wxMouseEvent const & ev, double& min_dist, Point& min_point) const -{ - for (map::const_iterator i = search.begin(); i != search.end(); ++i) { - BOOST_FOREACH (Point const & j, i->second) { - double const dist = pow(ev.GetX() - j.draw.x, 2) + pow(ev.GetY() - j.draw.y, 2); - if (dist < min_dist) { - min_dist = dist; - min_point = j; - } - } - } -} - void AudioPlot::left_down () { if (_cursor) { - shared_ptr fv = _viewer.lock (); - if (fv) { - fv->seek (_cursor->time, true); - } + _viewer.seek(_cursor->time, true); } } @@ -450,10 +461,28 @@ AudioPlot::mouse_moved (wxMouseEvent& ev) double min_dist = DBL_MAX; Point min_point; - search (_rms, ev, min_dist, min_point); - search (_peak, ev, min_dist, min_point); + auto search = [this](map const & search, wxMouseEvent const & ev, double& min_dist, Point& min_point) { + for (auto const& i: search) { + if (_channel_visible[i.first]) { + for (auto const& j: i.second) { + double const dist = pow(ev.GetX() - j.draw.x, 2) + pow(ev.GetY() - j.draw.y, 2); + if (dist < min_dist) { + min_dist = dist; + min_point = j; + } + } + } + } + }; - _cursor = optional (); + if (_type_visible[AudioPoint::RMS]) { + search (_rms, ev, min_dist, min_point); + } + if (_type_visible[AudioPoint::PEAK]) { + search (_peak, ev, min_dist, min_point); + } + + _cursor = boost::none; if (min_dist < DBL_MAX) { wxRect before (min_point.draw.x - _cursor_size / 2, min_point.draw.y - _cursor_size / 2, _cursor_size, _cursor_size); @@ -465,10 +494,11 @@ AudioPlot::mouse_moved (wxMouseEvent& ev) } } + void AudioPlot::mouse_leave (wxMouseEvent &) { - _cursor = optional (); + _cursor = boost::none; Refresh (); Cursor (optional(), optional()); }