X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Faudio_mapping_view.cc;h=438b1e8569037ba557d192191f3f74792e28656f;hb=c04fec82d25127fafa73c3daff87bece9aa8c8e8;hp=1d9c085355f6a38f7ac27dfc1894256abb7381b6;hpb=03b9ef36942b2d3e0b2054f465bcbe8e029069b2;p=dcpomatic.git diff --git a/src/wx/audio_mapping_view.cc b/src/wx/audio_mapping_view.cc index 1d9c08535..438b1e856 100644 --- a/src/wx/audio_mapping_view.cc +++ b/src/wx/audio_mapping_view.cc @@ -27,12 +27,15 @@ #include "audio_gain_dialog.h" #include "lib/audio_mapping.h" #include "lib/util.h" +#include "lib/warnings.h" #include #include +DCPOMATIC_DISABLE_WARNINGS #include #include #include #include +DCPOMATIC_ENABLE_WARNINGS #include #include @@ -46,6 +49,9 @@ using std::pair; using std::make_pair; using boost::shared_ptr; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using dcp::locale_convert; #define INDICATOR_SIZE 20 @@ -159,9 +165,8 @@ AudioMappingView::scroll () } void -AudioMappingView::paint_static (wxDC& dc, wxGraphicsContext* gc) +AudioMappingView::paint_static (wxDC& dc) { - gc->SetAntialiasMode (wxANTIALIAS_DEFAULT); dc.SetFont (wxSWISS_FONT->Bold()); wxCoord label_width; wxCoord label_height; @@ -178,11 +183,10 @@ AudioMappingView::paint_static (wxDC& dc, wxGraphicsContext* gc) ); dc.SetFont (*wxSWISS_FONT); - gc->SetPen (*wxBLACK_PEN); } void -AudioMappingView::paint_column_labels (wxDC& dc, wxGraphicsContext* gc) +AudioMappingView::paint_column_labels (wxDC& dc) { wxCoord label_width; wxCoord label_height; @@ -193,33 +197,31 @@ AudioMappingView::paint_column_labels (wxDC& dc, wxGraphicsContext* gc) ++N; } - wxGraphicsPath lines = gc->CreatePath (); - lines.MoveToPoint (LEFT_WIDTH, GRID_SPACING); - lines.AddLineToPoint (LEFT_WIDTH + _output_channels.size() * GRID_SPACING, GRID_SPACING); - lines.MoveToPoint (LEFT_WIDTH, GRID_SPACING * 2); - lines.AddLineToPoint (LEFT_WIDTH + _output_channels.size() * GRID_SPACING, GRID_SPACING * 2); - gc->StrokePath (lines); + dc.DrawLine(wxPoint(LEFT_WIDTH, GRID_SPACING), wxPoint(LEFT_WIDTH + _output_channels.size() * GRID_SPACING, GRID_SPACING)); + dc.DrawLine(wxPoint(LEFT_WIDTH, GRID_SPACING * 2), wxPoint(LEFT_WIDTH + _output_channels.size() * GRID_SPACING, GRID_SPACING * 2)); } void -AudioMappingView::paint_column_lines (wxGraphicsContext* gc) +AudioMappingView::paint_column_lines (wxDC& dc) { - wxGraphicsPath lines = gc->CreatePath (); for (size_t i = 0; i < _output_channels.size(); ++i) { - lines.MoveToPoint (LEFT_WIDTH + GRID_SPACING * i, GRID_SPACING); - lines.AddLineToPoint (LEFT_WIDTH + GRID_SPACING * i, TOP_HEIGHT + _input_channels.size() * GRID_SPACING); + dc.DrawLine ( + wxPoint(LEFT_WIDTH + GRID_SPACING * i, GRID_SPACING), + wxPoint(LEFT_WIDTH + GRID_SPACING * i, TOP_HEIGHT + _input_channels.size() * GRID_SPACING) + ); } - lines.MoveToPoint (LEFT_WIDTH + GRID_SPACING * _output_channels.size(), GRID_SPACING); - lines.AddLineToPoint (LEFT_WIDTH + GRID_SPACING * _output_channels.size(), TOP_HEIGHT + _input_channels.size() * GRID_SPACING); - gc->StrokePath (lines); + + dc.DrawLine ( + wxPoint(LEFT_WIDTH + GRID_SPACING * _output_channels.size(), GRID_SPACING), + wxPoint(LEFT_WIDTH + GRID_SPACING * _output_channels.size(), TOP_HEIGHT + _input_channels.size() * GRID_SPACING) + ); } void -AudioMappingView::paint_row_labels (wxDC& dc, wxGraphicsContext* gc) +AudioMappingView::paint_row_labels (wxDC& dc) { wxCoord label_width; wxCoord label_height; - wxGraphicsPath lines = gc->CreatePath (); /* Row channel labels */ @@ -233,8 +235,10 @@ AudioMappingView::paint_row_labels (wxDC& dc, wxGraphicsContext* gc) /* Vertical lines on the left */ for (int i = 1; i < 3; ++i) { - lines.MoveToPoint (GRID_SPACING * i, TOP_HEIGHT); - lines.AddLineToPoint (GRID_SPACING * i, TOP_HEIGHT + _input_channels.size() * GRID_SPACING); + dc.DrawLine ( + wxPoint(GRID_SPACING * i, TOP_HEIGHT), + wxPoint(GRID_SPACING * i, TOP_HEIGHT + _input_channels.size() * GRID_SPACING) + ); } /* Group labels and lines */ @@ -253,44 +257,34 @@ AudioMappingView::paint_row_labels (wxDC& dc, wxGraphicsContext* gc) 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); + dc.DrawLine (wxPoint(GRID_SPACING, y), wxPoint(GRID_SPACING * 2, y)); y += height; } - lines.MoveToPoint (GRID_SPACING, y); - lines.AddLineToPoint (GRID_SPACING * 2, y); - - gc->StrokePath (lines); -} + dc.DrawLine (wxPoint(GRID_SPACING, y), wxPoint(GRID_SPACING * 2, y)); + } void -AudioMappingView::paint_row_lines (wxGraphicsContext* gc) +AudioMappingView::paint_row_lines (wxDC& dc) { - wxGraphicsPath lines = gc->CreatePath (); for (size_t i = 0; i < _input_channels.size(); ++i) { - lines.MoveToPoint (GRID_SPACING * 2, TOP_HEIGHT + GRID_SPACING * i); - lines.AddLineToPoint (LEFT_WIDTH + _output_channels.size() * GRID_SPACING, TOP_HEIGHT + GRID_SPACING * i); + dc.DrawLine ( + wxPoint(GRID_SPACING * 2, TOP_HEIGHT + GRID_SPACING * i), + wxPoint(LEFT_WIDTH + _output_channels.size() * GRID_SPACING, TOP_HEIGHT + GRID_SPACING * i) + ); } - lines.MoveToPoint (GRID_SPACING * 2, TOP_HEIGHT + GRID_SPACING * _input_channels.size()); - lines.AddLineToPoint (LEFT_WIDTH + _output_channels.size() * GRID_SPACING, TOP_HEIGHT + GRID_SPACING * _input_channels.size()); - gc->StrokePath (lines); + dc.DrawLine ( + wxPoint(GRID_SPACING * 2, TOP_HEIGHT + GRID_SPACING * _input_channels.size()), + wxPoint(LEFT_WIDTH + _output_channels.size() * GRID_SPACING, TOP_HEIGHT + GRID_SPACING * _input_channels.size()) + ); } void @@ -332,27 +326,22 @@ AudioMappingView::paint_indicators (wxDC& dc) } static -void clip (wxDC& dc, wxGraphicsContext* gc, int x, int y, int w, int h) +void clip (wxDC& dc, 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) +void translate (wxDC& dc, int x, int y) { - gc->PushState (); - gc->Translate (-x, -y); dc.SetLogicalOrigin (x, y); } static -void restore (wxDC& dc, wxGraphicsContext* gc) +void restore (wxDC& dc) { dc.SetLogicalOrigin (0, 0); - gc->PopState (); dc.DestroyClippingRegion (); - gc->ResetClip (); } void @@ -360,42 +349,65 @@ AudioMappingView::paint () { wxPaintDC dc (_body); - wxGraphicsContext* gc = wxGraphicsContext::Create (dc); - if (!gc) { - return; - } - int const hs = _horizontal_scroll->GetThumbPosition (); int const vs = _vertical_scroll->GetThumbPosition (); - paint_static (dc, gc); - - clip (dc, gc, LEFT_WIDTH, 0, GRID_SPACING * _output_channels.size(), GRID_SPACING * (2 + _input_channels.size())); - translate (dc, gc, hs, 0); - paint_column_labels (dc, gc); - restore (dc, gc); - - clip (dc, gc, 0, TOP_HEIGHT, GRID_SPACING * (3 + _output_channels.size()), GRID_SPACING * _input_channels.size() + 1); - translate (dc, gc, 0, vs); - paint_row_labels (dc, gc); - restore (dc, gc); - - clip (dc, gc, GRID_SPACING * 2, TOP_HEIGHT, GRID_SPACING * (1 + _output_channels.size()), GRID_SPACING * _input_channels.size() + 1); - translate (dc, gc, hs, vs); - paint_row_lines (gc); - restore (dc, gc); - - clip (dc, gc, LEFT_WIDTH, GRID_SPACING, GRID_SPACING * (1 + _output_channels.size()), GRID_SPACING * (1 + _input_channels.size())); - translate (dc, gc, hs, vs); - paint_column_lines (gc); - restore (dc, gc); - - clip (dc, gc, LEFT_WIDTH, TOP_HEIGHT, GRID_SPACING * _output_channels.size(), GRID_SPACING * _input_channels.size()); - translate (dc, gc, hs, vs); + paint_static (dc); + + clip ( + dc, + LEFT_WIDTH, + 0, + GRID_SPACING * _output_channels.size(), + GRID_SPACING * (2 + _input_channels.size()) + ); + translate (dc, hs, 0); + paint_column_labels (dc); + restore (dc); + + clip ( + dc, + 0, + TOP_HEIGHT, + GRID_SPACING * 3, + min(int(GRID_SPACING * _input_channels.size()), GetSize().GetHeight() - TOP_HEIGHT) + ); + translate (dc, 0, vs); + paint_row_labels (dc); + restore (dc); + + clip ( + dc, + GRID_SPACING * 2, + TOP_HEIGHT, + GRID_SPACING * (1 + _output_channels.size()), + min(int(GRID_SPACING * (2 + _input_channels.size())), GetSize().GetHeight() - TOP_HEIGHT) + ); + translate (dc, hs, vs); + paint_row_lines (dc); + restore (dc); + + clip ( + dc, + LEFT_WIDTH, + GRID_SPACING, + GRID_SPACING * (1 + _output_channels.size()), + min(int(GRID_SPACING * (1 + _input_channels.size())), GetSize().GetHeight() - GRID_SPACING) + ); + translate (dc, hs, vs); + paint_column_lines (dc); + restore (dc); + + clip ( + dc, + LEFT_WIDTH, + TOP_HEIGHT, + GRID_SPACING * _output_channels.size(), + min(int(GRID_SPACING * _input_channels.size()), GetSize().GetHeight() - TOP_HEIGHT) + ); + translate (dc, hs, vs); paint_indicators (dc); - restore (dc, gc); - - delete gc; + restore (dc); } optional >