X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Faudio_plot.cc;h=0b7b29923f45272bfb4676cff47fbd45adcce6fd;hp=493d99f5e7d2e5ebdc95e6e25cf777849247888f;hb=bcc4e2f7dc4cd5658e199ddacb7202b00ec72cf1;hpb=f0192490565c72aa9838f40cbab56c4c0c60e522 diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc index 493d99f5e..0b7b29923 100644 --- a/src/wx/audio_plot.cc +++ b/src/wx/audio_plot.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2015 Carl Hetherington + Copyright (C) 2013-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -26,16 +26,21 @@ #include #include #include +#include using std::cout; using std::vector; using std::list; using std::max; using std::min; +using std::map; using boost::bind; +using boost::optional; using boost::shared_ptr; +using namespace dcpomatic; int const AudioPlot::_minimum = -70; +int const AudioPlot::_cursor_size = 8; int const AudioPlot::max_smoothing = 128; AudioPlot::AudioPlot (wxWindow* parent) @@ -80,6 +85,8 @@ AudioPlot::AudioPlot (wxWindow* parent) #endif Bind (wxEVT_PAINT, boost::bind (&AudioPlot::paint, this)); + Bind (wxEVT_MOTION, boost::bind (&AudioPlot::mouse_moved, this, _1)); + Bind (wxEVT_LEAVE_WINDOW, boost::bind (&AudioPlot::mouse_leave, this, _1)); SetMinSize (wxSize (640, 512)); } @@ -169,52 +176,45 @@ AudioPlot::paint () gc->SetPen (wxPen (wxColour (200, 200, 200))); gc->StrokePath (h_grid); - if (_analysis->samples_per_point() && _analysis->sample_rate()) { + /* Draw an x axis with marks */ - /* Draw an x axis with marks */ + wxGraphicsPath v_grid = gc->CreatePath (); - wxGraphicsPath 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(); - DCPOMATIC_ASSERT (_analysis->samples_per_point().get() != 0.0); - double const pps = _analysis->sample_rate().get() * metrics.x_scale / _analysis->samples_per_point().get(); + gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (0, 0, 0), 1, wxPENSTYLE_SOLID)); - gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (0, 0, 0), 1, wxPENSTYLE_SOLID)); + double const mark_interval = calculate_mark_interval (rint (128 / pps)); - double const mark_interval = calculate_mark_interval (rint (128 / pps)); + DCPTime t = DCPTime::from_seconds (mark_interval); + while ((t.seconds() * pps) < data_width) { + double tc = t.seconds (); + int const h = tc / 3600; + tc -= h * 3600; + int const m = tc / 60; + tc -= m * 60; + int const s = tc; - DCPTime t = DCPTime::from_seconds (mark_interval); - while ((t.seconds() * pps) < data_width) { - 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); - 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 = llrintf (metrics.db_label_width + t.seconds() * pps); + gc->DrawText (str, tx - str_width / 2, metrics.height - metrics.y_origin + db_label_height); - int const tx = llrintf (metrics.db_label_width + t.seconds() * pps); - gc->DrawText (str, tx - str_width / 2, metrics.height - metrics.y_origin + db_label_height); + v_grid.MoveToPoint (tx, metrics.height - metrics.y_origin + 4); + v_grid.AddLineToPoint (tx, metrics.y_origin); - v_grid.MoveToPoint (tx, metrics.height - metrics.y_origin + 4); - v_grid.AddLineToPoint (tx, metrics.y_origin); - - t += DCPTime::from_seconds (mark_interval); - } - - gc->SetPen (wxPen (wxColour (200, 200, 200))); - gc->StrokePath (v_grid); - - } else { - /* This is an old analysis without samples_per_point information */ - gc->DrawText (_("Time"), data_width, metrics.height - metrics.y_origin + db_label_height / 2); + t += DCPTime::from_seconds (mark_interval); } + gc->SetPen (wxPen (wxColour (200, 200, 200))); + gc->StrokePath (v_grid); + if (_type_visible[AudioPoint::PEAK]) { for (int c = 0; c < MAX_DCP_AUDIO_CHANNELS; ++c) { wxGraphicsPath p = gc->CreatePath (); @@ -246,6 +246,17 @@ AudioPlot::paint () gc->SetPen (wxPen (wxColour (0, 0, 0))); gc->StrokePath (axes); + if (_cursor) { + wxGraphicsPath 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; } @@ -256,7 +267,7 @@ AudioPlot::y_for_linear (float p, Metrics const & metrics) const p = 1e-4; } - return metrics.height - (20 * log10(p) - _minimum) * metrics.y_scale - metrics.y_origin; + return metrics.height - (linear_to_db(p) - _minimum) * metrics.y_scale - metrics.y_origin; } void @@ -266,7 +277,7 @@ AudioPlot::plot_peak (wxGraphicsPath& path, int channel, Metrics const & metrics return; } - path.MoveToPoint (metrics.db_label_width, y_for_linear (get_point(channel, 0)[AudioPoint::PEAK], metrics)); + _peak[channel] = PointList (); float peak = 0; int const N = _analysis->points(channel); @@ -279,7 +290,20 @@ AudioPlot::plot_peak (wxGraphicsPath& path, int channel, Metrics const & metrics peak = 0; } - path.AddLineToPoint (metrics.db_label_width + i * metrics.x_scale, y_for_linear (peak, metrics)); + _peak[channel].push_back ( + Point ( + wxPoint (metrics.db_label_width + i * metrics.x_scale, y_for_linear (peak, metrics)), + DCPTime::from_frames (i * _analysis->samples_per_point(), _analysis->sample_rate()), + linear_to_db(peak) + ) + ); + } + + DCPOMATIC_ASSERT (_peak.find(channel) != _peak.end()); + + path.MoveToPoint (_peak[channel][0].draw); + BOOST_FOREACH (Point const & i, _peak[channel]) { + path.AddLineToPoint (i.draw); } } @@ -290,7 +314,7 @@ AudioPlot::plot_rms (wxGraphicsPath& path, int channel, Metrics const & metrics) return; } - path.MoveToPoint (metrics.db_label_width, y_for_linear (get_point(channel, 0)[AudioPoint::RMS], metrics)); + _rms[channel] = PointList(); list smoothing; @@ -335,7 +359,20 @@ AudioPlot::plot_rms (wxGraphicsPath& path, int channel, Metrics const & metrics) p = sqrt (p / smoothing.size ()); } - path.AddLineToPoint (metrics.db_label_width + i * metrics.x_scale, y_for_linear (p, metrics)); + _rms[channel].push_back ( + Point ( + wxPoint (metrics.db_label_width + i * metrics.x_scale, y_for_linear (p, metrics)), + DCPTime::from_frames (i * _analysis->samples_per_point(), _analysis->sample_rate()), + linear_to_db(p) + ) + ); + } + + DCPOMATIC_ASSERT (_rms.find(channel) != _rms.end()); + + path.MoveToPoint (_rms[channel][0].draw); + BOOST_FOREACH (Point const & i, _rms[channel]) { + path.AddLineToPoint (i.draw); } } @@ -343,6 +380,8 @@ void AudioPlot::set_smoothing (int s) { _smoothing = s; + _rms.clear (); + _peak.clear (); Refresh (); } @@ -358,7 +397,7 @@ AudioPlot::get_point (int channel, int point) const { AudioPoint p = _analysis->get_point (channel, point); for (int i = 0; i < AudioPoint::COUNT; ++i) { - p[i] *= pow (10, _gain_correction / 20); + p[i] *= db_to_linear(_gain_correction); } return p; @@ -373,3 +412,46 @@ AudioPlot::colour (int n) const DCPOMATIC_ASSERT (n < int(_colours.size())); 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::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); + + _cursor = optional (); + + 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); + GetParent()->Refresh (true, &before); + _cursor = min_point; + wxRect after (min_point.draw.x - _cursor_size / 2, min_point.draw.y - _cursor_size / 2, _cursor_size, _cursor_size); + GetParent()->Refresh (true, &after); + Cursor (min_point.time, min_point.db); + } +} + +void +AudioPlot::mouse_leave (wxMouseEvent &) +{ + _cursor = optional (); + Refresh (); + Cursor (optional(), optional()); +}