X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcolour_conversion_editor.cc;h=d82239b79f07e8477c9ceff6af85cac9c9be680c;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=3ea144e1de5acd784d5d56ba3283e5abe1214e01;hpb=769c71b5c3e050ccfc1c13771d24328fbf76a495;p=dcpomatic.git diff --git a/src/wx/colour_conversion_editor.cc b/src/wx/colour_conversion_editor.cc index 3ea144e1d..d82239b79 100644 --- a/src/wx/colour_conversion_editor.cc +++ b/src/wx/colour_conversion_editor.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2014 Carl Hetherington + Copyright (C) 2013-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -40,12 +40,14 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent) wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL); SetSizer (overall_sizer); - wxGridBagSizer* table = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); + wxGridBagSizer* 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; - _input_gamma_linearised = new wxCheckBox (this, wxID_ANY, _("Linearise input gamma curve for low values")); + subhead (table, this, _("Input gamma correction"), r); + + _input_gamma_linearised = new wxCheckBox (this, wxID_ANY, _("Linearise input gamma curve for small values")); table->Add (_input_gamma_linearised, wxGBPosition (r, 0), wxGBSpan (1, 2)); ++r; @@ -55,25 +57,23 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent) ++r; add_label_to_grid_bag_sizer (table, this, _("Input power"), true, wxGBPosition (r, 0)); - _input_power = new wxSpinCtrlDouble (this); - table->Add (_input_power, wxGBPosition (r, 1)); - ++r; - - add_label_to_grid_bag_sizer (table, this, _("Input threshold"), true, wxGBPosition (r, 0)); - _input_threshold = new wxTextCtrl (this, wxID_ANY, wxT ("")); - table->Add (_input_threshold, wxGBPosition (r, 1)); - ++r; - - add_label_to_grid_bag_sizer (table, this, _("Input A value"), true, wxGBPosition (r, 0)); - _input_A = new wxTextCtrl (this, wxID_ANY, wxT ("")); - table->Add (_input_A, wxGBPosition (r, 1)); + { + wxBoxSizer* 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); + _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); + _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); + _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)); + } ++r; - add_label_to_grid_bag_sizer (table, this, _("Input B value"), true, wxGBPosition (r, 0)); - _input_B = new wxTextCtrl (this, wxID_ANY, wxT ("")); - table->Add (_input_B, wxGBPosition (r, 1)); - ++r; - wxClientDC dc (parent); wxSize size = dc.GetTextExtent (wxT ("-0.12345678901")); size.SetHeight (-1); @@ -88,17 +88,99 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent) validator.SetIncludes (list); - add_label_to_grid_bag_sizer (table, this, _("Matrix"), true, wxGBPosition (r, 0)); - wxFlexGridSizer* matrix_sizer = new wxFlexGridSizer (3, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP); + + /* YUV to RGB conversion */ + + subhead (table, this, _("YUV to RGB conversion"), r); + + add_label_to_grid_bag_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")); + table->Add (_yuv_to_rgb, wxGBPosition (r, 1)); + ++r; + + /* RGB to XYZ conversion */ + + subhead (table, this, _("RGB to XYZ conversion"), r); + + add_label_to_grid_bag_sizer (table, this, _("x"), false, wxGBPosition (r, 1)); + add_label_to_grid_bag_sizer (table, this, _("y"), false, wxGBPosition (r, 2)); + add_label_to_grid_bag_sizer (table, this, _("Matrix"), false, wxGBPosition (r, 3)); + ++r; + + add_label_to_grid_bag_sizer (table, this, _("Red chromaticity"), true, wxGBPosition (r, 0)); + _red_x = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator); + table->Add (_red_x, wxGBPosition (r, 1)); + _red_y = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator); + table->Add (_red_y, wxGBPosition (r, 2)); + ++r; + + add_label_to_grid_bag_sizer (table, this, _("Green chromaticity"), true, wxGBPosition (r, 0)); + _green_x = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator); + table->Add (_green_x, wxGBPosition (r, 1)); + _green_y = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator); + table->Add (_green_y, wxGBPosition (r, 2)); + ++r; + + add_label_to_grid_bag_sizer (table, this, _("Blue chromaticity"), true, wxGBPosition (r, 0)); + _blue_x = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator); + table->Add (_blue_x, wxGBPosition (r, 1)); + _blue_y = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator); + table->Add (_blue_y, wxGBPosition (r, 2)); + ++r; + + add_label_to_grid_bag_sizer (table, this, _("White point"), true, wxGBPosition (r, 0)); + _white_x = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator); + table->Add (_white_x, wxGBPosition (r, 1)); + _white_y = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator); + table->Add (_white_y, wxGBPosition (r, 2)); + ++r; + + 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); for (int i = 0; i < 3; ++i) { for (int j = 0; j < 3; ++j) { - _matrix[i][j] = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator); - matrix_sizer->Add (_matrix[i][j]); + _rgb_to_xyz[i][j] = new wxStaticText (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0); + rgb_to_xyz_sizer->Add (_rgb_to_xyz[i][j]); } } - table->Add (matrix_sizer, wxGBPosition (r, 1)); + table->Add (rgb_to_xyz_sizer, wxGBPosition (r - 4, 3), wxGBSpan (4, 1)); + + /* White point adjustment */ + + size = dc.GetTextExtent (wxT ("-0.12345678901")); + size.SetHeight (-1); + + subhead (table, this, _("White point adjustment"), r); + + _adjust_white = new wxCheckBox (this, wxID_ANY, _("Adjust white point to")); + table->Add (_adjust_white, wxGBPosition (r, 0)); + _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); + table->Add (_adjusted_white_y, wxGBPosition (r, 2)); + ++r; + + add_label_to_grid_bag_sizer (table, this, wxT (""), false, wxGBPosition (r, 0)); ++r; + size = dc.GetTextExtent (wxT ("0.12345678")); + size.SetHeight (-1); + + wxFlexGridSizer* 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 wxStaticText (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0); + bradford_sizer->Add (_bradford[i][j]); + } + } + table->Add (bradford_sizer, wxGBPosition (r - 2, 3), wxGBSpan (2, 1)); + + subhead (table, this, _("Output gamma correction"), r); + add_label_to_grid_bag_sizer (table, this, _("Output gamma"), true, wxGBPosition (r, 0)); wxBoxSizer* output_sizer = new wxBoxSizer (wxHORIZONTAL); /// TRANSLATORS: this means the mathematical reciprocal operation, i.e. we are dividing 1 by the control that @@ -106,14 +188,14 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent) add_label_to_sizer (output_sizer, this, _("1 / "), false); _output_gamma = new wxSpinCtrlDouble (this); output_sizer->Add (_output_gamma); - table->Add (output_sizer, wxGBPosition (r, 1)); + table->Add (output_sizer, wxGBPosition (r, 1), wxGBSpan (1, 2)); ++r; _input_gamma->SetRange (0.1, 4.0); _input_gamma->SetDigits (2); _input_gamma->SetIncrement (0.1); _input_power->SetRange (0.1, 4.0); - _input_power->SetDigits (2); + _input_power->SetDigits (6); _input_power->SetIncrement (0.1); _output_gamma->SetRange (0.1, 4.0); _output_gamma->SetDigits (2); @@ -125,14 +207,30 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent) _input_threshold->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ColourConversionEditor::changed, this)); _input_A->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ColourConversionEditor::changed, this)); _input_B->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ColourConversionEditor::changed, this)); - for (int i = 0; i < 3; ++i) { - for (int j = 0; j < 3; ++j) { - _matrix[i][j]->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ColourConversionEditor::changed, this)); - } - } + _red_x->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ColourConversionEditor::chromaticity_changed, this)); + _red_y->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ColourConversionEditor::chromaticity_changed, this)); + _green_x->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ColourConversionEditor::chromaticity_changed, this)); + _green_y->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ColourConversionEditor::chromaticity_changed, this)); + _blue_x->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ColourConversionEditor::chromaticity_changed, this)); + _blue_y->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ColourConversionEditor::chromaticity_changed, this)); + _white_x->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ColourConversionEditor::chromaticity_changed, this)); + _white_y->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ColourConversionEditor::chromaticity_changed, this)); + _adjust_white->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&ColourConversionEditor::adjusted_white_changed, this)); + _adjusted_white_x->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ColourConversionEditor::adjusted_white_changed, this)); + _adjusted_white_y->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ColourConversionEditor::adjusted_white_changed, this)); + _yuv_to_rgb->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&ColourConversionEditor::changed, this)); _output_gamma->Bind (wxEVT_COMMAND_SPINCTRLDOUBLE_UPDATED, boost::bind (&ColourConversionEditor::changed, this, _output_gamma)); } +void +ColourConversionEditor::subhead (wxGridBagSizer* sizer, wxWindow* parent, wxString text, int& row) const +{ + wxStaticText* m = new wxStaticText (parent, wxID_ANY, wxT ("")); + m->SetLabelMarkup ("" + text + ""); + sizer->Add (m, wxGBPosition (row, 0), wxGBSpan (1, 3), wxALIGN_CENTER_VERTICAL | wxTOP, 12); + ++row; +} + void ColourConversionEditor::set (ColourConversion conversion) { @@ -142,7 +240,7 @@ ColourConversionEditor::set (ColourConversion conversion) set_spin_ctrl (_input_gamma, tf->gamma ()); } else if (dynamic_pointer_cast (conversion.in ())) { shared_ptr tf = dynamic_pointer_cast (conversion.in ()); - /* Arbitrary default */ + /* Arbitrary default; not used in this case (greyed out) */ _input_gamma->SetValue (2.2); _input_gamma_linearised->SetValue (true); set_spin_ctrl (_input_power, tf->power ()); @@ -151,13 +249,58 @@ ColourConversionEditor::set (ColourConversion conversion) set_text_ctrl (_input_B, tf->B ()); } - boost::numeric::ublas::matrix matrix = conversion.matrix (); - for (int i = 0; i < 3; ++i) { - for (int j = 0; j < 3; ++j) { - set_text_ctrl (_matrix[i][j], matrix(i, j)); - } + _yuv_to_rgb->SetSelection (conversion.yuv_to_rgb ()); + + SafeStringStream s; + s.setf (std::ios::fixed, std::ios::floatfield); + s.precision (6); + + s << conversion.red().x; + _red_x->SetValue (std_to_wx (s.str ())); + + s.str (""); + s << conversion.red().y; + _red_y->SetValue (std_to_wx (s.str ())); + + s.str (""); + s << conversion.green().x; + _green_x->SetValue (std_to_wx (s.str ())); + + s.str (""); + s << conversion.green().y; + _green_y->SetValue (std_to_wx (s.str ())); + + s.str (""); + s << conversion.blue().x; + _blue_x->SetValue (std_to_wx (s.str ())); + + s.str (""); + s << conversion.blue().y; + _blue_y->SetValue (std_to_wx (s.str ())); + + s.str (""); + s << conversion.white().x; + _white_x->SetValue (std_to_wx (s.str ())); + + s.str (""); + s << conversion.white().y; + _white_y->SetValue (std_to_wx (s.str ())); + + if (conversion.adjusted_white ()) { + _adjust_white->SetValue (true); + s.str (""); + s << conversion.adjusted_white().get().x; + _adjusted_white_x->SetValue (std_to_wx (s.str ())); + s.str (""); + s << conversion.adjusted_white().get().y; + _adjusted_white_y->SetValue (std_to_wx (s.str ())); + } else { + _adjust_white->SetValue (false); } - + + update_rgb_to_xyz (); + update_bradford (); + set_spin_ctrl (_output_gamma, dynamic_pointer_cast (conversion.out ())->gamma ()); } @@ -170,7 +313,6 @@ ColourConversionEditor::get () const conversion.set_in ( shared_ptr ( new dcp::ModifiedGammaTransferFunction ( - false, _input_power->GetValue (), raw_convert (wx_to_std (_input_threshold->GetValue ())), raw_convert (wx_to_std (_input_A->GetValue ())), @@ -180,30 +322,37 @@ ColourConversionEditor::get () const ); } else { conversion.set_in ( - shared_ptr ( - new dcp::GammaTransferFunction ( - false, - _input_gamma->GetValue () - ) - ) + shared_ptr (new dcp::GammaTransferFunction (_input_gamma->GetValue ())) ); } - boost::numeric::ublas::matrix matrix (3, 3); - for (int i = 0; i < 3; ++i) { - for (int j = 0; j < 3; ++j) { - string const v = wx_to_std (_matrix[i][j]->GetValue ()); - if (v.empty ()) { - matrix (i, j) = 0; - } else { - matrix (i, j) = raw_convert (v); - } - } + conversion.set_yuv_to_rgb (static_cast (_yuv_to_rgb->GetSelection ())); + + conversion.set_red ( + dcp::Chromaticity (raw_convert (wx_to_std (_red_x->GetValue ())), raw_convert (wx_to_std (_red_y->GetValue ()))) + ); + conversion.set_green ( + dcp::Chromaticity (raw_convert (wx_to_std (_green_x->GetValue ())), raw_convert (wx_to_std (_green_y->GetValue ()))) + ); + conversion.set_blue ( + dcp::Chromaticity (raw_convert (wx_to_std (_blue_x->GetValue ())), raw_convert (wx_to_std (_blue_y->GetValue ()))) + ); + conversion.set_white ( + dcp::Chromaticity (raw_convert (wx_to_std (_white_x->GetValue ())), raw_convert (wx_to_std (_white_y->GetValue ()))) + ); + + if (_adjust_white->GetValue ()) { + conversion.set_adjusted_white ( + dcp::Chromaticity ( + raw_convert (wx_to_std (_adjusted_white_x->GetValue ())), + raw_convert (wx_to_std (_adjusted_white_y->GetValue ())) + ) + ); + } else { + conversion.unset_adjusted_white (); } - conversion.set_matrix (matrix); - - conversion.set_out (shared_ptr (new dcp::GammaTransferFunction (true, _output_gamma->GetValue ()))); + conversion.set_out (shared_ptr (new dcp::GammaTransferFunction (_output_gamma->GetValue ()))); return conversion; } @@ -217,10 +366,57 @@ ColourConversionEditor::changed () _input_threshold->Enable (lin); _input_A->Enable (lin); _input_B->Enable (lin); - + Changed (); } +void +ColourConversionEditor::chromaticity_changed () +{ + update_rgb_to_xyz (); + changed (); +} + +void +ColourConversionEditor::adjusted_white_changed () +{ + update_bradford (); + 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 (); + for (int i = 0; i < 3; ++i) { + for (int j = 0; j < 3; ++j) { + SafeStringStream s; + s.setf (std::ios::fixed, std::ios::floatfield); + s.precision (7); + s << m (i, j); + _bradford[i][j]->SetLabel (std_to_wx (s.str ())); + } + } +} + +void +ColourConversionEditor::update_rgb_to_xyz () +{ + boost::numeric::ublas::matrix m = get().rgb_to_xyz (); + for (int i = 0; i < 3; ++i) { + for (int j = 0; j < 3; ++j) { + SafeStringStream s; + s.setf (std::ios::fixed, std::ios::floatfield); + s.precision (7); + s << m (i, j); + _rgb_to_xyz[i][j]->SetLabel (std_to_wx (s.str ())); + } + } +} + void ColourConversionEditor::changed (wxSpinCtrlDouble* sc) { @@ -231,7 +427,7 @@ ColourConversionEditor::changed (wxSpinCtrlDouble* sc) if (fabs (_last_spin_ctrl_value[sc] - sc->GetValue()) < 1e-3) { return; } - + Changed (); }