X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_mapping_view.cc;h=98430da3bddf0cc0123d4bfd627b42113636cfd1;hb=fb66531502fda94d50c7b1399178ff08f6c6eaac;hp=9d776b63d7184a4e5a0f2a8fa5a9759e39f1a721;hpb=faa42e385ec2e36e75347ba5da1e4e0f69b6d6f3;p=dcpomatic.git diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc index 9d776b63d..98430da3b 100644 --- a/src/wx/audio_mapping_view.cc +++ b/src/wx/audio_mapping_view.cc @@ -75,6 +75,10 @@ AudioMappingView::AudioMappingView (wxWindow* parent) _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::off, this), ID_off); Bind (wxEVT_MENU, boost::bind(&AudioMappingView::full, this), ID_full); @@ -207,30 +211,6 @@ AudioMappingView::paint_column_lines (wxGraphicsContext* gc) gc->StrokePath (lines); } -static -void clip (wxDC& dc, wxGraphicsContext* gc, int x, int y, int w, int h) -{ - dc.SetClippingRegion (x, y, w, h); - gc->Clip (x, y, w, h); -} - -static -void translate (wxDC& dc, wxGraphicsContext* gc, int x, int y) -{ - gc->PushState (); - gc->Translate (-x, -y); - dc.SetLogicalOrigin (x, y); -} - -static -void restore (wxDC& dc, wxGraphicsContext* gc) -{ - dc.SetLogicalOrigin (0, 0); - gc->PopState (); - dc.DestroyClippingRegion (); - gc->ResetClip (); -} - void AudioMappingView::paint_row_labels (wxDC& dc, wxGraphicsContext* gc) { @@ -263,14 +243,29 @@ AudioMappingView::paint_row_labels (wxDC& dc, wxGraphicsContext* gc) if (label_width > height) { label_width = height - 8; } - clip (dc, gc, GRID_SPACING, y + 4, GRID_SPACING, height - 4); - dc.DrawRotatedText ( - std_to_wx(i.name), - GRID_SPACING + (GRID_SPACING - label_height) / 2, - y + (height + label_width) / 2, - 90 - ); - restore (dc, gc); + + { + int yp = y; + if ((yp - 2 * GRID_SPACING) < dc.GetLogicalOrigin().y) { + yp += dc.GetLogicalOrigin().y; + } + + wxCoord old_x, old_y, old_width, old_height; + dc.GetClippingBox (&old_x, &old_y, &old_width, &old_height); + dc.DestroyClippingRegion (); + dc.SetClippingRegion (GRID_SPACING, yp + 4, GRID_SPACING, height - 8); + + dc.DrawRotatedText ( + std_to_wx(i.name), + GRID_SPACING + (GRID_SPACING - label_height) / 2, + y + (height + label_width) / 2, + 90 + ); + + dc.DestroyClippingRegion (); + dc.SetClippingRegion (old_x, old_y, old_width, old_height); + } + lines.MoveToPoint (GRID_SPACING, y); lines.AddLineToPoint (GRID_SPACING * 2, y); y += height; @@ -332,6 +327,30 @@ AudioMappingView::paint_indicators (wxDC& dc) } } +static +void clip (wxDC& dc, wxGraphicsContext* gc, int x, int y, int w, int h) +{ + dc.SetClippingRegion (x, y, w, h); + gc->Clip (x, y, w, h); +} + +static +void translate (wxDC& dc, wxGraphicsContext* gc, int x, int y) +{ + gc->PushState (); + gc->Translate (-x, -y); + dc.SetLogicalOrigin (x, y); +} + +static +void restore (wxDC& dc, wxGraphicsContext* gc) +{ + dc.SetLogicalOrigin (0, 0); + gc->PopState (); + dc.DestroyClippingRegion (); + gc->ResetClip (); +} + void AudioMappingView::paint () { @@ -395,6 +414,24 @@ AudioMappingView::mouse_event_to_channels (wxMouseEvent& ev) const return make_pair (input, output); } +optional +AudioMappingView::mouse_event_to_input_group_name (wxMouseEvent& ev) const +{ + int const x = ev.GetX() + _horizontal_scroll->GetThumbPosition(); + if (x < GRID_SPACING || x > (2 * GRID_SPACING)) { + return optional(); + } + + int y = (ev.GetY() + _vertical_scroll->GetThumbPosition() - (GRID_SPACING * 2)) / GRID_SPACING; + BOOST_FOREACH (Group i, _input_groups) { + if (i.from <= y && y <= i.to) { + return i.name; + } + } + + return optional(); +} + void AudioMappingView::left_down (wxMouseEvent& ev) { @@ -474,11 +511,9 @@ AudioMappingView::minus6dB () void AudioMappingView::edit () { - int const d = _menu_output - 1; - - AudioGainDialog* dialog = new AudioGainDialog (this, _menu_input, _menu_output - 1, _map.get(_menu_input, d)); + AudioGainDialog* dialog = new AudioGainDialog (this, _menu_input, _menu_output, _map.get(_menu_input, _menu_output)); if (dialog->ShowModal() == wxID_OK) { - _map.set (_menu_input, d, dialog->value ()); + _map.set (_menu_input, _menu_output, dialog->value ()); map_values_changed (); } @@ -508,32 +543,79 @@ AudioMappingView::set_output_channels (vector const & names) Refresh (); } +wxString +AudioMappingView::safe_input_channel_name (int n) const +{ + if (n >= int(_input_channels.size())) { + return wxString::Format ("%d", n + 1); + } + + optional group; + BOOST_FOREACH (Group i, _input_groups) { + if (i.from <= n && n <= i.to) { + group = std_to_wx (i.name); + } + } + + if (group) { + return wxString::Format ("%s/%s", group->data(), std_to_wx(_input_channels[n]).data()); + } + + return std_to_wx(_input_channels[n]); +} + +wxString +AudioMappingView::safe_output_channel_name (int n) const +{ + if (n >= int(_output_channels.size())) { + return wxString::Format ("%d", n + 1); + } + + return std_to_wx(_output_channels[n]); +} + void AudioMappingView::motion (wxMouseEvent& ev) { optional > channels = mouse_event_to_channels (ev); - if (!channels) { - SetToolTip (""); - _last_tooltip_channels = channels; - return; - } + if (channels) { + if (channels != _last_tooltip_channels) { + wxString s; + float const gain = _map.get(channels->first, channels->second); + if (gain == 0) { + s = wxString::Format ( + _("No audio will be passed from content channel '%s' to DCP channel '%s'."), + safe_input_channel_name(channels->first), + safe_output_channel_name(channels->second) + ); + } else if (gain == 1) { + s = wxString::Format ( + _("Audio will be passed from content channel %s to DCP channel %s unaltered."), + safe_input_channel_name(channels->first), + safe_output_channel_name(channels->second) + ); + } else { + float const dB = 20 * log10 (gain); + s = wxString::Format ( + _("Audio will be passed from content channel %s to DCP channel %s with gain %.1fdB."), + safe_input_channel_name(channels->first), + safe_output_channel_name(channels->second), + dB + ); + } - if (channels != _last_tooltip_channels) { - wxString s; - float const gain = _map.get(channels->first, channels->second); - if (gain == 0) { - s = wxString::Format (_("No audio will be passed from content channel %d to DCP channel %d."), channels->first + 1, channels->second + 1); - } else if (gain == 1) { - s = wxString::Format (_("Audio will be passed from content channel %d to DCP channel %d unaltered."), channels->first + 1, channels->second + 1); + SetToolTip (s + " " + _("Right click to change gain.")); + } + } else { + optional group = mouse_event_to_input_group_name (ev); + if (group) { + SetToolTip (std_to_wx(*group)); } else { - float const dB = 20 * log10 (gain); - s = wxString::Format (_("Audio will be passed from content channel %d to DCP channel %d with gain %.1fdB."), channels->first + 1, channels->second + 1, dB); + SetToolTip (""); } - - SetToolTip (s + " " + _("Right click to change gain.")); - _last_tooltip_channels = channels; } + _last_tooltip_channels = channels; ev.Skip (); }