X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcolour_conversion_editor.cc;h=686238c55df0e7984a1ad339a88319a0c82c21cb;hb=HEAD;hp=a615b666ada22ad01ebe5435feb59a6490ddd22b;hpb=28111007e2e6fd62f5810be780706ae1618bd33f;p=dcpomatic.git diff --git a/src/wx/colour_conversion_editor.cc b/src/wx/colour_conversion_editor.cc index a615b666a..686238c55 100644 --- a/src/wx/colour_conversion_editor.cc +++ b/src/wx/colour_conversion_editor.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2018 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,39 +18,45 @@ */ -#include "wx_util.h" -#include "static_text.h" -#include "colour_conversion_editor.h" + #include "check_box.h" +#include "colour_conversion_editor.h" +#include "static_text.h" +#include "wx_util.h" #include "lib/colour_conversion.h" -#include #include #include -#include +#include #include -#include +#include +#include +LIBDCP_DISABLE_WARNINGS #include -#include +#include +#include +LIBDCP_ENABLE_WARNINGS + -using std::string; -using std::cout; -using std::shared_ptr; using std::dynamic_pointer_cast; +using std::make_shared; +using std::string; using boost::bind; using dcp::locale_convert; + int const ColourConversionEditor::INPUT_GAMMA = 0; int const ColourConversionEditor::INPUT_GAMMA_LINEARISED = 1; int const ColourConversionEditor::INPUT_SGAMUT3 = 2; + ColourConversionEditor::ColourConversionEditor (wxWindow* parent, bool yuv) : wxPanel (parent, wxID_ANY) , _ignore_chromaticity_changed (false) { - wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL); + auto overall_sizer = new wxBoxSizer (wxVERTICAL); SetSizer (overall_sizer); - wxGridBagSizer* table = new wxGridBagSizer (DCPOMATIC_SIZER_Y_GAP - 3, DCPOMATIC_SIZER_X_GAP); + auto table = new wxGridBagSizer (DCPOMATIC_SIZER_Y_GAP - 3, DCPOMATIC_SIZER_X_GAP); overall_sizer->Add (table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER); int r = 0; @@ -72,16 +78,16 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent, bool yuv) add_label_to_sizer (table, this, _("Input power"), true, wxGBPosition (r, 0)); { - wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); + auto s = new wxBoxSizer (wxHORIZONTAL); _input_power = new wxSpinCtrlDouble (this); s->Add (_input_power, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP); - add_label_to_sizer (s, this, _("threshold"), true); + add_label_to_sizer (s, this, _("threshold"), true, 0, wxALIGN_CENTRE_VERTICAL | wxLEFT | wxRIGHT); _input_threshold = new wxTextCtrl (this, wxID_ANY, wxT ("")); s->Add (_input_threshold, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP); - add_label_to_sizer (s, this, _("A"), true); + add_label_to_sizer (s, this, _("A"), true, 0, wxALIGN_CENTRE_VERTICAL | wxLEFT | wxRIGHT); _input_A = new wxTextCtrl (this, wxID_ANY, wxT ("")); s->Add (_input_A, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP); - add_label_to_sizer (s, this, _("B"), true); + add_label_to_sizer (s, this, _("B"), true, 0, wxALIGN_CENTRE_VERTICAL | wxLEFT | wxRIGHT); _input_B = new wxTextCtrl (this, wxID_ANY, wxT ("")); s->Add (_input_B, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP); table->Add (s, wxGBPosition (r, 1), wxGBSpan (1, 3)); @@ -89,13 +95,14 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent, bool yuv) ++r; wxClientDC dc (parent); - wxSize size = dc.GetTextExtent (wxT ("-0.12345678901")); + auto size = dc.GetTextExtent(wxT("-0.12345678901")); size.SetHeight (-1); wxTextValidator validator (wxFILTER_INCLUDE_CHAR_LIST); wxArrayString list; - wxString n (wxT ("0123456789.-")); + wxString n (wxT("0123456789-")); + n.Append(wxNumberFormatter::GetDecimalSeparator()); for (size_t i = 0; i < n.Length(); ++i) { list.Add (n[i]); } @@ -105,12 +112,13 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent, bool yuv) /* YUV to RGB conversion */ - wxStaticText* yuv_heading = subhead (table, this, _("YUV to RGB conversion"), r); + auto yuv_heading = subhead (table, this, _("YUV to RGB conversion"), r); - wxStaticText* yuv_label = add_label_to_sizer (table, this, _("YUV to RGB matrix"), true, wxGBPosition (r, 0)); + auto yuv_label = add_label_to_sizer (table, this, _("YUV to RGB matrix"), true, wxGBPosition (r, 0)); _yuv_to_rgb = new wxChoice (this, wxID_ANY); _yuv_to_rgb->Append (_("Rec. 601")); _yuv_to_rgb->Append (_("Rec. 709")); + _yuv_to_rgb->Append (_("Rec. 2020")); table->Add (_yuv_to_rgb, wxGBPosition (r, 1)); ++r; @@ -160,7 +168,7 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent, bool yuv) size = dc.GetTextExtent (wxT ("0.12345678")); size.SetHeight (-1); - wxFlexGridSizer* rgb_to_xyz_sizer = new wxFlexGridSizer (3, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); + auto rgb_to_xyz_sizer = new wxFlexGridSizer (3, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); for (int i = 0; i < 3; ++i) { for (int j = 0; j < 3; ++j) { _rgb_to_xyz[i][j] = new StaticText (this, wxT (""), wxDefaultPosition, size, 0); @@ -177,7 +185,7 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent, bool yuv) subhead (table, this, _("White point adjustment"), r); _adjust_white = new CheckBox (this, _("Adjust white point to")); - table->Add (_adjust_white, wxGBPosition (r, 0)); + table->Add (_adjust_white, wxGBPosition (r, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL); _adjusted_white_x = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator); table->Add (_adjusted_white_x, wxGBPosition (r, 1)); _adjusted_white_y = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator); @@ -190,7 +198,7 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent, bool yuv) size = dc.GetTextExtent (wxT ("0.12345678")); size.SetHeight (-1); - wxFlexGridSizer* bradford_sizer = new wxFlexGridSizer (3, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); + auto bradford_sizer = new wxFlexGridSizer (3, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); for (int i = 0; i < 3; ++i) { for (int j = 0; j < 3; ++j) { _bradford[i][j] = new StaticText (this, wxT (""), wxDefaultPosition, size, 0); @@ -215,7 +223,7 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent, bool yuv) _input_power->SetIncrement (0.1); _input->Bind (wxEVT_CHOICE, bind (&ColourConversionEditor::changed, this)); - _input_gamma->Bind (wxEVT_SPINCTRLDOUBLE, bind (&ColourConversionEditor::changed, this, _input_gamma)); + _input_gamma->Bind(wxEVT_SPINCTRLDOUBLE, bind(&ColourConversionEditor::spin_ctrl_changed, this, _input_gamma)); _input_power->Bind (wxEVT_TEXT, bind (&ColourConversionEditor::changed, this)); _input_threshold->Bind (wxEVT_TEXT, bind (&ColourConversionEditor::changed, this)); _input_A->Bind (wxEVT_TEXT, bind (&ColourConversionEditor::changed, this)); @@ -228,17 +236,18 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent, bool yuv) _blue_y->Bind (wxEVT_TEXT, bind (&ColourConversionEditor::chromaticity_changed, this)); _white_x->Bind (wxEVT_TEXT, bind (&ColourConversionEditor::chromaticity_changed, this)); _white_y->Bind (wxEVT_TEXT, bind (&ColourConversionEditor::chromaticity_changed, this)); - _adjust_white->Bind (wxEVT_CHECKBOX, bind (&ColourConversionEditor::adjusted_white_changed, this)); + _adjust_white->bind(&ColourConversionEditor::adjusted_white_changed, this); _adjusted_white_x->Bind (wxEVT_TEXT, bind (&ColourConversionEditor::adjusted_white_changed, this)); _adjusted_white_y->Bind (wxEVT_TEXT, bind (&ColourConversionEditor::adjusted_white_changed, this)); _yuv_to_rgb->Bind (wxEVT_CHOICE, bind (&ColourConversionEditor::changed, this)); - _output->Bind (wxEVT_CHECKBOX, bind (&ColourConversionEditor::changed, this)); + _output->bind(&ColourConversionEditor::changed, this); } + wxStaticText * ColourConversionEditor::subhead (wxGridBagSizer* sizer, wxWindow* parent, wxString text, int& row) const { - wxStaticText* m = new StaticText (parent, text); + auto m = new StaticText (parent, text); wxFont font (*wxNORMAL_FONT); font.SetWeight (wxFONTWEIGHT_BOLD); m->SetFont (font); @@ -247,15 +256,16 @@ ColourConversionEditor::subhead (wxGridBagSizer* sizer, wxWindow* parent, wxStri return m; } + void ColourConversionEditor::set (ColourConversion conversion) { - if (dynamic_pointer_cast (conversion.in ())) { - shared_ptr tf = dynamic_pointer_cast (conversion.in ()); + if (dynamic_pointer_cast(conversion.in())) { + auto tf = dynamic_pointer_cast(conversion.in()); checked_set (_input, 0); set_spin_ctrl (_input_gamma, tf->gamma ()); } else if (dynamic_pointer_cast (conversion.in ())) { - shared_ptr tf = dynamic_pointer_cast (conversion.in ()); + auto tf = dynamic_pointer_cast(conversion.in()); checked_set (_input, 1); /* Arbitrary default; not used in this case (greyed out) */ _input_gamma->SetValue (2.2); @@ -263,7 +273,7 @@ ColourConversionEditor::set (ColourConversion conversion) set_text_ctrl (_input_threshold, tf->threshold ()); set_text_ctrl (_input_A, tf->A ()); set_text_ctrl (_input_B, tf->B ()); - } else if (dynamic_pointer_cast (conversion.in ())) { + } else if (dynamic_pointer_cast(conversion.in())) { checked_set (_input, 2); } @@ -301,13 +311,14 @@ ColourConversionEditor::set (ColourConversion conversion) _adjust_white->SetValue (false); } - _output->SetValue (static_cast (dynamic_pointer_cast (conversion.out ()))); + _output->SetValue (static_cast(dynamic_pointer_cast(conversion.out()))); update_rgb_to_xyz (); update_bradford (); changed (); } + ColourConversion ColourConversionEditor::get () const { @@ -316,48 +327,46 @@ ColourConversionEditor::get () const switch (_input->GetSelection ()) { case INPUT_GAMMA: conversion.set_in ( - shared_ptr (new dcp::GammaTransferFunction (_input_gamma->GetValue ())) + make_shared(_input_gamma->GetValue()) ); break; case INPUT_GAMMA_LINEARISED: /* Linearised gamma */ conversion.set_in ( - shared_ptr ( - new dcp::ModifiedGammaTransferFunction ( - _input_power->GetValue (), - locale_convert (wx_to_std (_input_threshold->GetValue ())), - locale_convert (wx_to_std (_input_A->GetValue ())), - locale_convert (wx_to_std (_input_B->GetValue ())) - ) + make_shared( + _input_power->GetValue (), + locale_convert(wx_to_std(_input_threshold->GetValue())), + locale_convert(wx_to_std(_input_A->GetValue())), + locale_convert(wx_to_std(_input_B->GetValue())) ) ); break; case INPUT_SGAMUT3: /* SGamut3 */ - conversion.set_in (shared_ptr (new dcp::SGamut3TransferFunction ())); + conversion.set_in (make_shared()); break; } - conversion.set_yuv_to_rgb (static_cast (_yuv_to_rgb->GetSelection ())); + conversion.set_yuv_to_rgb (static_cast(_yuv_to_rgb->GetSelection())); conversion.set_red ( - dcp::Chromaticity (locale_convert (wx_to_std (_red_x->GetValue ())), locale_convert (wx_to_std (_red_y->GetValue ()))) + dcp::Chromaticity(locale_convert(wx_to_std(_red_x->GetValue())), locale_convert(wx_to_std(_red_y->GetValue()))) ); conversion.set_green ( - dcp::Chromaticity (locale_convert (wx_to_std (_green_x->GetValue ())), locale_convert (wx_to_std (_green_y->GetValue ()))) + dcp::Chromaticity(locale_convert(wx_to_std(_green_x->GetValue())), locale_convert(wx_to_std(_green_y->GetValue()))) ); conversion.set_blue ( - dcp::Chromaticity (locale_convert (wx_to_std (_blue_x->GetValue ())), locale_convert (wx_to_std (_blue_y->GetValue ()))) + dcp::Chromaticity(locale_convert(wx_to_std(_blue_x->GetValue())), locale_convert(wx_to_std(_blue_y->GetValue()))) ); conversion.set_white ( - dcp::Chromaticity (locale_convert (wx_to_std (_white_x->GetValue ())), locale_convert (wx_to_std (_white_y->GetValue ()))) + dcp::Chromaticity(locale_convert(wx_to_std(_white_x->GetValue())), locale_convert(wx_to_std(_white_y->GetValue()))) ); - if (_adjust_white->GetValue ()) { - conversion.set_adjusted_white ( - dcp::Chromaticity ( - locale_convert (wx_to_std (_adjusted_white_x->GetValue ())), - locale_convert (wx_to_std (_adjusted_white_y->GetValue ())) + if (_adjust_white->GetValue()) { + conversion.set_adjusted_white( + dcp::Chromaticity( + locale_convert(wx_to_std(_adjusted_white_x->GetValue())), + locale_convert(wx_to_std(_adjusted_white_y->GetValue())) ) ); } else { @@ -365,14 +374,15 @@ ColourConversionEditor::get () const } if (_output->GetValue ()) { - conversion.set_out (shared_ptr (new dcp::GammaTransferFunction (2.6))); + conversion.set_out (make_shared(2.6)); } else { - conversion.set_out (shared_ptr (new dcp::IdentityTransferFunction ())); + conversion.set_out (make_shared()); } return conversion; } + void ColourConversionEditor::changed () { @@ -386,6 +396,7 @@ ColourConversionEditor::changed () Changed (); } + void ColourConversionEditor::chromaticity_changed () { @@ -397,6 +408,7 @@ ColourConversionEditor::chromaticity_changed () changed (); } + void ColourConversionEditor::adjusted_white_changed () { @@ -404,13 +416,14 @@ ColourConversionEditor::adjusted_white_changed () changed (); } + void ColourConversionEditor::update_bradford () { _adjusted_white_x->Enable (_adjust_white->GetValue ()); _adjusted_white_y->Enable (_adjust_white->GetValue ()); - boost::numeric::ublas::matrix m = get().bradford (); + auto m = get().bradford(); for (int i = 0; i < 3; ++i) { for (int j = 0; j < 3; ++j) { char buffer[256]; @@ -420,10 +433,11 @@ ColourConversionEditor::update_bradford () } } + void ColourConversionEditor::update_rgb_to_xyz () { - boost::numeric::ublas::matrix m = get().rgb_to_xyz (); + auto m = get().rgb_to_xyz(); for (int i = 0; i < 3; ++i) { for (int j = 0; j < 3; ++j) { char buffer[256]; @@ -433,20 +447,22 @@ ColourConversionEditor::update_rgb_to_xyz () } } + void -ColourConversionEditor::changed (wxSpinCtrlDouble* sc) +ColourConversionEditor::spin_ctrl_changed(wxSpinCtrlDouble* sc) { /* On OS X, it seems that in some cases when a wxSpinCtrlDouble loses focus it emits an erroneous changed signal, which messes things up. Check for that here. */ - if (fabs (_last_spin_ctrl_value[sc] - sc->GetValue()) < 1e-3) { + if (fabs(_last_spin_ctrl_value[sc] - sc->GetValue()) < 1e-3) { return; } Changed (); } + void ColourConversionEditor::set_spin_ctrl (wxSpinCtrlDouble* control, double value) { @@ -454,6 +470,7 @@ ColourConversionEditor::set_spin_ctrl (wxSpinCtrlDouble* control, double value) control->SetValue (value); } + void ColourConversionEditor::set_text_ctrl (wxTextCtrl* control, double value) {