X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcolour_conversion_editor.cc;h=01b1ca056c1ed4739229f52c97fad917314bfd31;hb=a8a0dfd1b21de6c0facf965ab119833ff6f790bf;hp=482e403095ab94879660e89c8415b3c327cf0b1a;hpb=1cdedd1c19bd34f1c41043f9bbeae39cb54a0ed8;p=dcpomatic.git diff --git a/src/wx/colour_conversion_editor.cc b/src/wx/colour_conversion_editor.cc index 482e40309..01b1ca056 100644 --- a/src/wx/colour_conversion_editor.cc +++ b/src/wx/colour_conversion_editor.cc @@ -1,19 +1,20 @@ /* - Copyright (C) 2013-2014 Carl Hetherington + Copyright (C) 2013-2015 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ @@ -26,56 +27,54 @@ #include #include #include -#include +#include using std::string; using std::cout; using boost::shared_ptr; using boost::dynamic_pointer_cast; -using boost::lexical_cast; -ColourConversionEditor::ColourConversionEditor (wxWindow* parent) +ColourConversionEditor::ColourConversionEditor (wxWindow* parent, bool yuv) : wxPanel (parent, wxID_ANY) + , _ignore_chromaticity_changed (false) { 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; subhead (table, this, _("Input gamma correction"), r); - _input_gamma_linearised = new wxCheckBox (this, wxID_ANY, _("Linearise input gamma curve for low values")); + _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; - add_label_to_grid_bag_sizer (table, this, _("Input gamma"), true, wxGBPosition (r, 0)); + add_label_to_sizer (table, this, _("Input gamma"), true, wxGBPosition (r, 0)); _input_gamma = new wxSpinCtrlDouble (this); table->Add (_input_gamma, wxGBPosition (r, 1)); ++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)); + add_label_to_sizer (table, this, _("Input power"), true, wxGBPosition (r, 0)); + { + 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); @@ -93,46 +92,52 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent) /* 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)); + wxStaticText* 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)); _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; + if (!yuv) { + yuv_heading->Enable (false); + yuv_label->Enable (false); + _yuv_to_rgb->Enable (false); + } + /* 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)); + add_label_to_sizer (table, this, _("x"), false, wxGBPosition (r, 1)); + add_label_to_sizer (table, this, _("y"), false, wxGBPosition (r, 2)); + add_label_to_sizer (table, this, _("Matrix"), false, wxGBPosition (r, 3)); ++r; - add_label_to_grid_bag_sizer (table, this, _("Red chromaticity"), true, wxGBPosition (r, 0)); + add_label_to_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)); + add_label_to_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)); + add_label_to_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)); + add_label_to_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); @@ -141,7 +146,7 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent) 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) { @@ -166,12 +171,12 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent) table->Add (_adjusted_white_y, wxGBPosition (r, 2)); ++r; - add_label_to_grid_bag_sizer (table, this, wxT (""), false, wxGBPosition (r, 0)); + add_label_to_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) { @@ -181,27 +186,12 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent) } 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 - /// comes after it. - 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), 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); - _output_gamma->SetIncrement (0.1); _input_gamma->Bind (wxEVT_COMMAND_SPINCTRLDOUBLE_UPDATED, boost::bind (&ColourConversionEditor::changed, this, _input_gamma)); _input_gamma_linearised->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&ColourConversionEditor::changed, this)); @@ -221,16 +211,18 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent) _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 +wxStaticText * ColourConversionEditor::subhead (wxGridBagSizer* sizer, wxWindow* parent, wxString text, int& row) const { - wxStaticText* m = new wxStaticText (parent, wxID_ANY, wxT ("")); - m->SetLabelMarkup ("" + text + ""); + wxStaticText* m = new wxStaticText (parent, wxID_ANY, text); + wxFont font (*wxNORMAL_FONT); + font.SetWeight (wxFONTWEIGHT_BOLD); + m->SetFont (font); sizer->Add (m, wxGBPosition (row, 0), wxGBSpan (1, 3), wxALIGN_CENTER_VERTICAL | wxTOP, 12); ++row; + return m; } void @@ -253,6 +245,8 @@ ColourConversionEditor::set (ColourConversion conversion) _yuv_to_rgb->SetSelection (conversion.yuv_to_rgb ()); + _ignore_chromaticity_changed = true; + SafeStringStream s; s.setf (std::ios::fixed, std::ios::floatfield); s.precision (6); @@ -288,6 +282,8 @@ ColourConversionEditor::set (ColourConversion conversion) s << conversion.white().y; _white_y->SetValue (std_to_wx (s.str ())); + _ignore_chromaticity_changed = false; + if (conversion.adjusted_white ()) { _adjust_white->SetValue (true); s.str (""); @@ -302,8 +298,7 @@ ColourConversionEditor::set (ColourConversion conversion) update_rgb_to_xyz (); update_bradford (); - - set_spin_ctrl (_output_gamma, dynamic_pointer_cast (conversion.out ())->gamma ()); + changed (); } ColourConversion @@ -354,7 +349,7 @@ ColourConversionEditor::get () const conversion.unset_adjusted_white (); } - conversion.set_out (shared_ptr (new dcp::GammaTransferFunction (_output_gamma->GetValue ()))); + conversion.set_out (shared_ptr (new dcp::GammaTransferFunction (2.6))); return conversion; } @@ -368,13 +363,17 @@ ColourConversionEditor::changed () _input_threshold->Enable (lin); _input_A->Enable (lin); _input_B->Enable (lin); - + Changed (); } void ColourConversionEditor::chromaticity_changed () { + if (_ignore_chromaticity_changed) { + return; + } + update_rgb_to_xyz (); changed (); } @@ -391,7 +390,7 @@ 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) { @@ -429,7 +428,7 @@ ColourConversionEditor::changed (wxSpinCtrlDouble* sc) if (fabs (_last_spin_ctrl_value[sc] - sc->GetValue()) < 1e-3) { return; } - + Changed (); }