X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_plot.cc;h=90a4aa91df39b5a5cc468ba8a3850b0b5f4b2ba4;hb=ecc74ec418e060fa163d25d08a62a6e81eece114;hp=682abe4324c47918877f6cfd661c1f9cfb277292;hpb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;p=dcpomatic.git diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc index 682abe432..90a4aa91d 100644 --- a/src/wx/audio_plot.cc +++ b/src/wx/audio_plot.cc @@ -18,6 +18,7 @@ */ + #include "audio_plot.h" #include "wx_util.h" #include "film_viewer.h" @@ -29,6 +30,7 @@ #include #include + using std::cout; using std::vector; using std::list; @@ -44,10 +46,12 @@ 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) : wxPanel (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE) , _viewer (viewer) @@ -98,6 +102,7 @@ AudioPlot::AudioPlot (wxWindow* parent, weak_ptr viewer) SetMinSize (wxSize (640, 512)); } + void AudioPlot::set_analysis (shared_ptr a) { @@ -110,6 +115,7 @@ AudioPlot::set_analysis (shared_ptr a) Refresh (); } + void AudioPlot::set_channel_visible (int c, bool v) { @@ -117,6 +123,7 @@ AudioPlot::set_channel_visible (int c, bool v) Refresh (); } + void AudioPlot::set_type_visible (int t, bool v) { @@ -124,6 +131,7 @@ AudioPlot::set_type_visible (int t, bool v) Refresh (); } + void AudioPlot::set_message (wxString s) { @@ -131,6 +139,7 @@ AudioPlot::set_message (wxString s) Refresh (); } + struct Metrics { double db_label_width; @@ -140,16 +149,19 @@ 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->DrawText (_message, 32, 32); @@ -157,7 +169,7 @@ AudioPlot::paint () return; } - wxGraphicsPath h_grid = gc->CreatePath (); + auto h_grid = gc->CreatePath (); gc->SetFont (gc->CreateFont (*wxSMALL_FONT)); wxDouble db_label_height; wxDouble db_label_descent; @@ -186,7 +198,7 @@ AudioPlot::paint () /* 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(); @@ -195,7 +207,7 @@ AudioPlot::paint () 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; @@ -204,7 +216,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; @@ -225,11 +237,11 @@ AudioPlot::paint () 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); } @@ -237,17 +249,17 @@ 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); @@ -255,19 +267,18 @@ AudioPlot::paint () 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 { @@ -278,6 +289,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 { @@ -310,11 +322,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 { @@ -379,11 +392,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) { @@ -393,6 +407,7 @@ AudioPlot::set_smoothing (int s) Refresh (); } + void AudioPlot::set_gain_correction (double gain) { @@ -400,10 +415,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); } @@ -411,6 +427,7 @@ AudioPlot::get_point (int channel, int point) const return p; } + /** @param n Channel index. * @return Colour used by that channel in the plot. */ @@ -421,27 +438,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) { + if (auto fv = _viewer.lock()) { fv->seek (_cursor->time, true); } } @@ -454,10 +456,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; + } + } + } + } + }; + + 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 = optional (); + _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); @@ -469,10 +489,11 @@ AudioPlot::mouse_moved (wxMouseEvent& ev) } } + void AudioPlot::mouse_leave (wxMouseEvent &) { - _cursor = optional (); + _cursor = boost::none; Refresh (); Cursor (optional(), optional()); }