X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_mapping_view.cc;h=6f4a39b1edac3af60e6f6df6d1b642192077570c;hb=e87f943433216d294b22853411eca5c582be1066;hp=2413502b8353fa1a0ee70ef70525ac428b3697e4;hpb=f1d8d450e31a72dea58a21df8da533456f18911b;p=dcpomatic.git diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc index 2413502b8..6f4a39b1e 100644 --- a/src/wx/audio_mapping_view.cc +++ b/src/wx/audio_mapping_view.cc @@ -18,48 +18,49 @@ */ + /** @file src/wx/audio_mapping_view.cc * @brief AudioMappingView class and helpers. */ + +#include "audio_gain_dialog.h" #include "audio_mapping_view.h" #include "wx_util.h" -#include "audio_gain_dialog.h" #include "lib/audio_mapping.h" -#include "lib/util.h" -#include "lib/warnings.h" +#include "lib/maths_util.h" #include #include -DCPOMATIC_DISABLE_WARNINGS -#include -#include -#include +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS -#include +#include +#include +#include +LIBDCP_ENABLE_WARNINGS + -using std::cout; using std::list; -using std::string; -using std::min; +using std::make_pair; using std::max; -using std::vector; +using std::min; using std::pair; -using std::make_pair; using std::shared_ptr; +using std::string; +using std::vector; using boost::optional; #if BOOST_VERSION >= 106100 using namespace boost::placeholders; #endif using dcp::locale_convert; + static constexpr auto INDICATOR_SIZE = 20; static constexpr auto ROW_HEIGHT = 32; static constexpr auto MINIMUM_COLUMN_WIDTH = 32; -static constexpr auto LEFT_WIDTH = MINIMUM_COLUMN_WIDTH * 3; static constexpr auto TOP_HEIGHT = ROW_HEIGHT * 2; static constexpr auto COLUMN_PADDING = 16; -static constexpr auto HORIZONTAL_PAGE_SIZE = 32; + enum { ID_off = 1, @@ -69,6 +70,7 @@ enum { ID_edit = 5 }; + AudioMappingView::AudioMappingView (wxWindow* parent, wxString left_label, wxString from, wxString top_label, wxString to) : wxPanel (parent, wxID_ANY) , _menu_input (0) @@ -85,73 +87,25 @@ AudioMappingView::AudioMappingView (wxWindow* parent, wxString left_label, wxStr _menu->Append (ID_plus3dB, _("+3dB")); _menu->Append (ID_edit, _("Edit...")); - _body = new wxPanel (this, wxID_ANY); - _vertical_scroll = new wxScrollBar (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxSB_VERTICAL); - _horizontal_scroll = new wxScrollBar (this, wxID_ANY); - #ifndef __WXOSX__ SetDoubleBuffered (true); #endif - Bind (wxEVT_SIZE, boost::bind(&AudioMappingView::size, this, _1)); Bind (wxEVT_MENU, boost::bind(&AudioMappingView::set_gain_from_menu, this, 0), ID_off); Bind (wxEVT_MENU, boost::bind(&AudioMappingView::set_gain_from_menu, this, db_to_linear(-6)), ID_minus6dB); Bind (wxEVT_MENU, boost::bind(&AudioMappingView::set_gain_from_menu, this, 1), ID_0dB); Bind (wxEVT_MENU, boost::bind(&AudioMappingView::set_gain_from_menu, this, db_to_linear(3)), ID_plus3dB); Bind (wxEVT_MENU, boost::bind(&AudioMappingView::edit, this), ID_edit); - Bind (wxEVT_MOUSEWHEEL, boost::bind(&AudioMappingView::mouse_wheel, this, _1)); - _body->Bind (wxEVT_PAINT, boost::bind(&AudioMappingView::paint, this)); - _body->Bind (wxEVT_LEFT_DOWN, boost::bind(&AudioMappingView::left_down, this, _1)); - _body->Bind (wxEVT_RIGHT_DOWN, boost::bind(&AudioMappingView::right_down, this, _1)); - _body->Bind (wxEVT_MOTION, boost::bind(&AudioMappingView::motion, this, _1)); - _vertical_scroll->Bind (wxEVT_SCROLL_TOP, boost::bind(&AudioMappingView::scroll, this)); - _vertical_scroll->Bind (wxEVT_SCROLL_BOTTOM, boost::bind(&AudioMappingView::scroll, this)); - _vertical_scroll->Bind (wxEVT_SCROLL_LINEUP, boost::bind(&AudioMappingView::scroll, this)); - _vertical_scroll->Bind (wxEVT_SCROLL_LINEDOWN, boost::bind(&AudioMappingView::scroll, this)); - _vertical_scroll->Bind (wxEVT_SCROLL_PAGEUP, boost::bind(&AudioMappingView::scroll, this)); - _vertical_scroll->Bind (wxEVT_SCROLL_PAGEDOWN, boost::bind(&AudioMappingView::scroll, this)); - _vertical_scroll->Bind (wxEVT_SCROLL_THUMBTRACK, boost::bind(&AudioMappingView::scroll, this)); - _vertical_scroll->Bind (wxEVT_SCROLL_THUMBRELEASE, boost::bind(&AudioMappingView::scroll, this)); - _horizontal_scroll->Bind (wxEVT_SCROLL_TOP, boost::bind(&AudioMappingView::scroll, this)); - _horizontal_scroll->Bind (wxEVT_SCROLL_BOTTOM, boost::bind(&AudioMappingView::scroll, this)); - _horizontal_scroll->Bind (wxEVT_SCROLL_LINEUP, boost::bind(&AudioMappingView::scroll, this)); - _horizontal_scroll->Bind (wxEVT_SCROLL_LINEDOWN, boost::bind(&AudioMappingView::scroll, this)); - _horizontal_scroll->Bind (wxEVT_SCROLL_PAGEUP, boost::bind(&AudioMappingView::scroll, this)); - _horizontal_scroll->Bind (wxEVT_SCROLL_PAGEDOWN, boost::bind(&AudioMappingView::scroll, this)); - _horizontal_scroll->Bind (wxEVT_SCROLL_THUMBTRACK, boost::bind(&AudioMappingView::scroll, this)); - _horizontal_scroll->Bind (wxEVT_SCROLL_THUMBRELEASE, boost::bind(&AudioMappingView::scroll, this)); + Bind (wxEVT_PAINT, boost::bind(&AudioMappingView::paint, this)); + Bind (wxEVT_LEFT_DOWN, boost::bind(&AudioMappingView::left_down, this, _1)); + Bind (wxEVT_RIGHT_DOWN, boost::bind(&AudioMappingView::right_down, this, _1)); + Bind (wxEVT_MOTION, boost::bind(&AudioMappingView::motion, this, _1)); } -void -AudioMappingView::size (wxSizeEvent& ev) -{ - setup (); - ev.Skip (); -} void AudioMappingView::setup () { - auto const s = GetSize(); - int const w = _vertical_scroll->GetSize().GetWidth(); - int const h = _horizontal_scroll->GetSize().GetHeight(); - - _vertical_scroll->SetPosition (wxPoint(s.GetWidth() - w, 0)); - _vertical_scroll->SetSize (wxSize(w, max(0, s.GetHeight() - h))); - - _body->SetSize (wxSize(max(0, s.GetWidth() - w), max(0, s.GetHeight() - h))); - - _horizontal_scroll->SetPosition (wxPoint(0, s.GetHeight() - h)); - _horizontal_scroll->SetSize (wxSize(max(0, s.GetWidth() - w), h)); - - _vertical_scroll->SetScrollbar ( - _vertical_scroll->GetThumbPosition(), - s.GetHeight() - h - 8, - ROW_HEIGHT * (2 + _input_channels.size()), - ROW_HEIGHT, - true - ); - wxClientDC dc (GetParent()); dc.SetFont (wxSWISS_FONT->Bold()); @@ -168,19 +122,9 @@ AudioMappingView::setup () _column_widths_total += this_width; } - _horizontal_scroll->SetScrollbar ( - _horizontal_scroll->GetThumbPosition(), - s.GetWidth() - w - 8, - LEFT_WIDTH + _column_widths_total, - HORIZONTAL_PAGE_SIZE, - true); + SetMinSize({8 + left_width() + _column_widths_total, static_cast(8 + TOP_HEIGHT + ROW_HEIGHT * _input_channels.size())}); } -void -AudioMappingView::scroll () -{ - Refresh (); -} void AudioMappingView::paint_static (wxDC& dc) @@ -190,7 +134,7 @@ AudioMappingView::paint_static (wxDC& dc) wxCoord label_height; dc.GetTextExtent (_top_label, &label_width, &label_height); - dc.DrawText (_top_label, LEFT_WIDTH + (_column_widths_total - label_width) / 2, (ROW_HEIGHT - label_height) / 2); + dc.DrawText (_top_label, left_width() + (_column_widths_total - label_width) / 2, (ROW_HEIGHT - label_height) / 2); dc.GetTextExtent (_left_label, &label_width, &label_height); dc.DrawRotatedText ( @@ -203,12 +147,13 @@ AudioMappingView::paint_static (wxDC& dc) dc.SetFont (*wxSWISS_FONT); } + void AudioMappingView::paint_column_labels (wxDC& dc) { wxCoord label_width; wxCoord label_height; - int x = LEFT_WIDTH; + int x = left_width(); for (auto i = 0U; i < _output_channels.size(); ++i) { auto const name = std_to_wx(_output_channels[i].name); dc.GetTextExtent (name, &label_width, &label_height); @@ -216,14 +161,15 @@ AudioMappingView::paint_column_labels (wxDC& dc) x += _column_widths[i]; } - dc.DrawLine(wxPoint(LEFT_WIDTH, ROW_HEIGHT), wxPoint(LEFT_WIDTH + _column_widths_total, ROW_HEIGHT)); - dc.DrawLine(wxPoint(LEFT_WIDTH, ROW_HEIGHT * 2), wxPoint(LEFT_WIDTH + _column_widths_total, ROW_HEIGHT * 2)); + dc.DrawLine(wxPoint(left_width(), ROW_HEIGHT), wxPoint(left_width() + _column_widths_total, ROW_HEIGHT)); + dc.DrawLine(wxPoint(left_width(), ROW_HEIGHT * 2), wxPoint(left_width() + _column_widths_total, ROW_HEIGHT * 2)); } + void AudioMappingView::paint_column_lines (wxDC& dc) { - int x = LEFT_WIDTH; + int x = left_width(); for (size_t i = 0; i < _output_channels.size(); ++i) { dc.DrawLine ( wxPoint(x, ROW_HEIGHT), @@ -233,11 +179,12 @@ AudioMappingView::paint_column_lines (wxDC& dc) } dc.DrawLine ( - wxPoint(LEFT_WIDTH + _column_widths_total, ROW_HEIGHT), - wxPoint(LEFT_WIDTH + _column_widths_total, TOP_HEIGHT + _input_channels.size() * ROW_HEIGHT) + wxPoint(left_width() + _column_widths_total, ROW_HEIGHT), + wxPoint(left_width() + _column_widths_total, TOP_HEIGHT + _input_channels.size() * ROW_HEIGHT) ); } + void AudioMappingView::paint_row_labels (wxDC& dc) { @@ -249,7 +196,7 @@ AudioMappingView::paint_row_labels (wxDC& dc) for (auto i = 0U; i < _input_channels.size(); ++i) { auto const name = std_to_wx(_input_channels[i].name); dc.GetTextExtent (name, &label_width, &label_height); - dc.DrawText (name, LEFT_WIDTH - MINIMUM_COLUMN_WIDTH + (MINIMUM_COLUMN_WIDTH - label_width) / 2, TOP_HEIGHT + ROW_HEIGHT * i + (ROW_HEIGHT - label_height) / 2); + dc.DrawText (name, left_width() - MINIMUM_COLUMN_WIDTH + (MINIMUM_COLUMN_WIDTH - label_width) / 2, TOP_HEIGHT + ROW_HEIGHT * i + (ROW_HEIGHT - label_height) / 2); } /* Vertical lines on the left */ @@ -261,10 +208,23 @@ AudioMappingView::paint_row_labels (wxDC& dc) ); } - /* Group labels and lines */ - int y = TOP_HEIGHT; - for (auto i: _input_groups) { + for (auto const& i: _input_groups) { + dc.DrawLine (wxPoint(MINIMUM_COLUMN_WIDTH, y), wxPoint(MINIMUM_COLUMN_WIDTH * 2, y)); + y += (i.to - i.from + 1) * ROW_HEIGHT; + } + dc.DrawLine (wxPoint(MINIMUM_COLUMN_WIDTH, y), wxPoint(MINIMUM_COLUMN_WIDTH * 2, y)); + + if (_input_groups.empty()) { + auto const bottom = TOP_HEIGHT + _input_channels.size() * ROW_HEIGHT; + dc.DrawLine(wxPoint(MINIMUM_COLUMN_WIDTH, bottom), wxPoint(MINIMUM_COLUMN_WIDTH * 2, bottom)); + } + + /* Group labels and lines; be careful here as wxDCClipper does not restore the old + * clipping rectangle after it is destroyed + */ + y = TOP_HEIGHT; + for (auto const& i: _input_groups) { int const height = (i.to - i.from + 1) * ROW_HEIGHT; dc.GetTextExtent (std_to_wx(i.name), &label_width, &label_height); if (label_width > height) { @@ -286,28 +246,23 @@ AudioMappingView::paint_row_labels (wxDC& dc) ); } - dc.DrawLine (wxPoint(MINIMUM_COLUMN_WIDTH, y), wxPoint(MINIMUM_COLUMN_WIDTH * 2, y)); y += height; } - - dc.DrawLine (wxPoint(MINIMUM_COLUMN_WIDTH, y), wxPoint(MINIMUM_COLUMN_WIDTH * 2, y)); } + void AudioMappingView::paint_row_lines (wxDC& dc) { - for (size_t i = 0; i < _input_channels.size(); ++i) { + for (size_t i = 0; i < _input_channels.size() + 1; ++i) { dc.DrawLine ( wxPoint(MINIMUM_COLUMN_WIDTH * 2, TOP_HEIGHT + ROW_HEIGHT * i), - wxPoint(LEFT_WIDTH + _column_widths_total, TOP_HEIGHT + ROW_HEIGHT * i) + wxPoint(left_width() + _column_widths_total, TOP_HEIGHT + ROW_HEIGHT * i) ); } - dc.DrawLine ( - wxPoint(MINIMUM_COLUMN_WIDTH * 2, TOP_HEIGHT + ROW_HEIGHT * _input_channels.size()), - wxPoint(LEFT_WIDTH + _column_widths_total, TOP_HEIGHT + ROW_HEIGHT * _input_channels.size()) - ); } + void AudioMappingView::paint_indicators (wxDC& dc) { @@ -315,7 +270,7 @@ AudioMappingView::paint_indicators (wxDC& dc) size_t const output = min(_output_channels.size(), size_t(_map.output_channels())); size_t const input = min(_input_channels.size(), size_t(_map.input_channels())); - int xp = LEFT_WIDTH; + int xp = left_width(); for (size_t x = 0; x < output; ++x) { for (size_t y = 0; y < input; ++y) { dc.SetBrush (*wxWHITE_BRUSH); @@ -349,17 +304,6 @@ AudioMappingView::paint_indicators (wxDC& dc) } } -static -void clip (wxDC& dc, int x, int y, int w, int h) -{ - dc.SetClippingRegion (x, y, w, h); -} - -static -void translate (wxDC& dc, int x, int y) -{ - dc.SetLogicalOrigin (x, y); -} static void restore (wxDC& dc) @@ -368,85 +312,74 @@ void restore (wxDC& dc) dc.DestroyClippingRegion (); } + void AudioMappingView::paint () { - wxPaintDC dc (_body); - - int const hs = _horizontal_scroll->GetThumbPosition (); - int const vs = _vertical_scroll->GetThumbPosition (); + wxPaintDC dc(this); paint_static (dc); - clip ( - dc, - LEFT_WIDTH, + dc.SetClippingRegion ( + left_width(), 0, _column_widths_total, ROW_HEIGHT * (2 + _input_channels.size()) - ); - translate (dc, hs, 0); + ); paint_column_labels (dc); restore (dc); - clip ( - dc, + dc.SetClippingRegion( 0, TOP_HEIGHT, - LEFT_WIDTH, - min(int(ROW_HEIGHT * _input_channels.size()), GetSize().GetHeight() - TOP_HEIGHT) + left_width(), + min(int(ROW_HEIGHT * _input_channels.size()), GetSize().GetHeight() - TOP_HEIGHT) + 1 ); - translate (dc, 0, vs); paint_row_labels (dc); restore (dc); - clip ( - dc, + dc.SetClippingRegion( MINIMUM_COLUMN_WIDTH * 2, TOP_HEIGHT, MINIMUM_COLUMN_WIDTH + _column_widths_total, min(int(ROW_HEIGHT * (2 + _input_channels.size())), GetSize().GetHeight() - TOP_HEIGHT) ); - translate (dc, hs, vs); paint_row_lines (dc); restore (dc); - clip ( - dc, - LEFT_WIDTH, + dc.SetClippingRegion( + left_width(), MINIMUM_COLUMN_WIDTH, MINIMUM_COLUMN_WIDTH + _column_widths_total, min(int(ROW_HEIGHT * (1 + _input_channels.size())), GetSize().GetHeight() - ROW_HEIGHT) ); - translate (dc, hs, vs); paint_column_lines (dc); restore (dc); - clip ( - dc, - LEFT_WIDTH, + dc.SetClippingRegion ( + left_width(), TOP_HEIGHT, _column_widths_total, min(int(ROW_HEIGHT * _input_channels.size()), GetSize().GetHeight() - TOP_HEIGHT) ); - translate (dc, hs, vs); paint_indicators (dc); restore (dc); } + optional> AudioMappingView::mouse_event_to_channels (wxMouseEvent& ev) const { - int x = ev.GetX() + _horizontal_scroll->GetThumbPosition(); - int const y = ev.GetY() + _vertical_scroll->GetThumbPosition(); + int x = ev.GetX(); + int const y = ev.GetY(); - if (x <= LEFT_WIDTH || y < TOP_HEIGHT) { + if (x <= left_width() || y < TOP_HEIGHT) { return {}; } int const input = (y - TOP_HEIGHT) / ROW_HEIGHT; - x -= LEFT_WIDTH; + x -= left_width(); int output = 0; for (auto const i: _column_widths) { x -= i; @@ -466,12 +399,12 @@ AudioMappingView::mouse_event_to_channels (wxMouseEvent& ev) const optional AudioMappingView::mouse_event_to_input_group_name (wxMouseEvent& ev) const { - int const x = ev.GetX() + _horizontal_scroll->GetThumbPosition(); + int const x = ev.GetX(); if (x < MINIMUM_COLUMN_WIDTH || x > (2 * MINIMUM_COLUMN_WIDTH)) { return {}; } - int const y = (ev.GetY() + _vertical_scroll->GetThumbPosition() - TOP_HEIGHT) / ROW_HEIGHT; + int const y = (ev.GetY() - TOP_HEIGHT) / ROW_HEIGHT; for (auto i: _input_groups) { if (i.from <= y && y <= i.to) { return i.name; @@ -511,21 +444,6 @@ AudioMappingView::right_down (wxMouseEvent& ev) PopupMenu (_menu, ev.GetPosition()); } -void -AudioMappingView::mouse_wheel (wxMouseEvent& ev) -{ - if (ev.ShiftDown()) { - _horizontal_scroll->SetThumbPosition ( - _horizontal_scroll->GetThumbPosition() + (ev.GetWheelRotation() > 0 ? -HORIZONTAL_PAGE_SIZE : HORIZONTAL_PAGE_SIZE) - ); - - } else { - _vertical_scroll->SetThumbPosition ( - _vertical_scroll->GetThumbPosition() + (ev.GetWheelRotation() > 0 ? -ROW_HEIGHT : ROW_HEIGHT) - ); - } - Refresh (); -} /** Called when any gain value has changed */ void @@ -546,13 +464,11 @@ AudioMappingView::set_gain_from_menu (double linear) void AudioMappingView::edit () { - auto dialog = new AudioGainDialog (this, _menu_input, _menu_output, _map.get(_menu_input, _menu_output)); + auto dialog = make_wx(this, _menu_input, _menu_output, _map.get(_menu_input, _menu_output)); if (dialog->ShowModal() == wxID_OK) { _map.set (_menu_input, _menu_output, dialog->value ()); map_values_changed (); } - - dialog->Destroy (); } void @@ -653,3 +569,12 @@ AudioMappingView::set_input_groups (vector const & groups) { _input_groups = groups; } + + +int +AudioMappingView::left_width() const +{ + return _input_groups.empty() ? (MINIMUM_COLUMN_WIDTH * 2) : (MINIMUM_COLUMN_WIDTH * 3); +} + +