X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcolour_conversion_editor.cc;h=b4c33f0bc337eeeeecbd726193cd132cc69e4b8f;hb=ecc74ec418e060fa163d25d08a62a6e81eece114;hp=d4a6bc20a208fec15ac8871b97c4b7288df399f7;hpb=566138f515a6d628bfbe28241422b2eadc9c790b;p=dcpomatic.git diff --git a/src/wx/colour_conversion_editor.cc b/src/wx/colour_conversion_editor.cc index d4a6bc20a..b4c33f0bc 100644 --- a/src/wx/colour_conversion_editor.cc +++ b/src/wx/colour_conversion_editor.cc @@ -1,41 +1,51 @@ /* - Copyright (C) 2013-2015 Carl Hetherington + Copyright (C) 2013-2018 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 . */ -#include "lib/colour_conversion.h" -#include "lib/safe_stringstream.h" -#include "lib/raw_convert.h" #include "wx_util.h" +#include "static_text.h" #include "colour_conversion_editor.h" +#include "check_box.h" +#include "lib/colour_conversion.h" +#include #include +#include +#include #include #include #include -#include +#include using std::string; using std::cout; -using boost::shared_ptr; -using boost::dynamic_pointer_cast; -using boost::lexical_cast; +using std::shared_ptr; +using std::dynamic_pointer_cast; +using boost::bind; +using dcp::locale_convert; -ColourConversionEditor::ColourConversionEditor (wxWindow* parent) +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); SetSizer (overall_sizer); @@ -47,27 +57,31 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent) 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)); + add_label_to_sizer (table, this, _("Input transfer function"), true, wxGBPosition (r, 0)); + _input = new wxChoice (this, wxID_ANY); + _input->Append (_("Simple gamma")); + _input->Append (_("Simple gamma, linearised for small values")); + _input->Append (_("S-Gamut3")); + table->Add (_input, wxGBPosition (r, 1), 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)); + 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); + 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)); @@ -91,46 +105,52 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent) /* YUV to RGB conversion */ - subhead (table, this, _("YUV to RGB conversion"), r); + wxStaticText* yuv_heading = 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_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); @@ -143,7 +163,7 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent) 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) { - _rgb_to_xyz[i][j] = new wxStaticText (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0); + _rgb_to_xyz[i][j] = new StaticText (this, wxT (""), wxDefaultPosition, size, 0); rgb_to_xyz_sizer->Add (_rgb_to_xyz[i][j]); } } @@ -156,15 +176,15 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent) 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)); + _adjust_white = new CheckBox (this, _("Adjust white point to")); + 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); 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")); @@ -173,11 +193,19 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent) 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[i][j] = new StaticText (this, wxT (""), wxDefaultPosition, size, 0); bradford_sizer->Add (_bradford[i][j]); } } table->Add (bradford_sizer, wxGBPosition (r - 2, 3), wxGBSpan (2, 1)); + ++r; + + /* Output transfer function */ + + subhead (table, this, _("Output gamma correction"), r); + + _output = new CheckBox (this, _("Inverse 2.6 gamma correction on output")); + table->Add (_output, wxGBPosition (r, 0), wxGBSpan (1, 2)); _input_gamma->SetRange (0.1, 4.0); _input_gamma->SetDigits (2); @@ -186,33 +214,37 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent) _input_power->SetDigits (6); _input_power->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)); - _input_power->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ColourConversionEditor::changed, this)); - _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)); - _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)); + _input->Bind (wxEVT_CHOICE, bind (&ColourConversionEditor::changed, this)); + _input_gamma->Bind (wxEVT_SPINCTRLDOUBLE, bind (&ColourConversionEditor::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)); + _input_B->Bind (wxEVT_TEXT, bind (&ColourConversionEditor::changed, this)); + _red_x->Bind (wxEVT_TEXT, bind (&ColourConversionEditor::chromaticity_changed, this)); + _red_y->Bind (wxEVT_TEXT, bind (&ColourConversionEditor::chromaticity_changed, this)); + _green_x->Bind (wxEVT_TEXT, bind (&ColourConversionEditor::chromaticity_changed, this)); + _green_y->Bind (wxEVT_TEXT, bind (&ColourConversionEditor::chromaticity_changed, this)); + _blue_x->Bind (wxEVT_TEXT, bind (&ColourConversionEditor::chromaticity_changed, this)); + _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)); + _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)); } -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 StaticText (parent, 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 @@ -220,70 +252,60 @@ ColourConversionEditor::set (ColourConversion conversion) { if (dynamic_pointer_cast (conversion.in ())) { shared_ptr tf = dynamic_pointer_cast (conversion.in ()); - _input_gamma_linearised->SetValue (false); + 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 ()); + checked_set (_input, 1); /* 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 ()); 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 ())) { + checked_set (_input, 2); } - _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 ())); + _yuv_to_rgb->SetSelection (static_cast(conversion.yuv_to_rgb())); + + _ignore_chromaticity_changed = true; + + char buffer[256]; + snprintf (buffer, sizeof (buffer), "%.6f", conversion.red().x); + _red_x->SetValue (std_to_wx (buffer)); + snprintf (buffer, sizeof (buffer), "%.6f", conversion.red().y); + _red_y->SetValue (std_to_wx (buffer)); + snprintf (buffer, sizeof (buffer), "%.6f", conversion.green().x); + _green_x->SetValue (std_to_wx (buffer)); + snprintf (buffer, sizeof (buffer), "%.6f", conversion.green().y); + _green_y->SetValue (std_to_wx (buffer)); + snprintf (buffer, sizeof (buffer), "%.6f", conversion.blue().x); + _blue_x->SetValue (std_to_wx (buffer)); + snprintf (buffer, sizeof (buffer), "%.6f", conversion.blue().y); + _blue_y->SetValue (std_to_wx (buffer)); + snprintf (buffer, sizeof (buffer), "%.6f", conversion.white().x); + _white_x->SetValue (std_to_wx (buffer)); + snprintf (buffer, sizeof (buffer), "%.6f", conversion.white().y); + _white_y->SetValue (std_to_wx (buffer)); + + _ignore_chromaticity_changed = false; 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 ())); + snprintf (buffer, sizeof (buffer), "%.6f", conversion.adjusted_white().get().x); + _adjusted_white_x->SetValue (std_to_wx (buffer)); + snprintf (buffer, sizeof (buffer), "%.6f", conversion.adjusted_white().get().y); + _adjusted_white_y->SetValue (std_to_wx (buffer)); } else { _adjust_white->SetValue (false); } + _output->SetValue (static_cast (dynamic_pointer_cast (conversion.out ()))); + update_rgb_to_xyz (); update_bradford (); + changed (); } ColourConversion @@ -291,50 +313,62 @@ ColourConversionEditor::get () const { ColourConversion conversion; - if (_input_gamma_linearised->GetValue ()) { + switch (_input->GetSelection ()) { + case INPUT_GAMMA: + conversion.set_in ( + shared_ptr (new dcp::GammaTransferFunction (_input_gamma->GetValue ())) + ); + break; + case INPUT_GAMMA_LINEARISED: + /* Linearised gamma */ conversion.set_in ( shared_ptr ( new dcp::ModifiedGammaTransferFunction ( _input_power->GetValue (), - raw_convert (wx_to_std (_input_threshold->GetValue ())), - raw_convert (wx_to_std (_input_A->GetValue ())), - raw_convert (wx_to_std (_input_B->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 ())) ) ) ); - } else { - conversion.set_in ( - shared_ptr (new dcp::GammaTransferFunction (_input_gamma->GetValue ())) - ); + break; + case INPUT_SGAMUT3: + /* SGamut3 */ + conversion.set_in (shared_ptr (new dcp::SGamut3TransferFunction ())); + break; } 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 ()))) + dcp::Chromaticity (locale_convert (wx_to_std (_red_x->GetValue ())), locale_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 ()))) + dcp::Chromaticity (locale_convert (wx_to_std (_green_x->GetValue ())), locale_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 ()))) + dcp::Chromaticity (locale_convert (wx_to_std (_blue_x->GetValue ())), locale_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 ()))) + 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 ( - raw_convert (wx_to_std (_adjusted_white_x->GetValue ())), - raw_convert (wx_to_std (_adjusted_white_y->GetValue ())) + locale_convert (wx_to_std (_adjusted_white_x->GetValue ())), + locale_convert (wx_to_std (_adjusted_white_y->GetValue ())) ) ); } else { conversion.unset_adjusted_white (); } - conversion.set_out (shared_ptr (new dcp::GammaTransferFunction (2.6))); + if (_output->GetValue ()) { + conversion.set_out (shared_ptr (new dcp::GammaTransferFunction (2.6))); + } else { + conversion.set_out (shared_ptr (new dcp::IdentityTransferFunction ())); + } return conversion; } @@ -342,12 +376,12 @@ ColourConversionEditor::get () const void ColourConversionEditor::changed () { - bool const lin = _input_gamma_linearised->GetValue (); - _input_gamma->Enable (!lin); - _input_power->Enable (lin); - _input_threshold->Enable (lin); - _input_A->Enable (lin); - _input_B->Enable (lin); + int const in = _input->GetSelection(); + _input_gamma->Enable (in == INPUT_GAMMA); + _input_power->Enable (in == INPUT_GAMMA_LINEARISED); + _input_threshold->Enable (in == INPUT_GAMMA_LINEARISED); + _input_A->Enable (in == INPUT_GAMMA_LINEARISED); + _input_B->Enable (in == INPUT_GAMMA_LINEARISED); Changed (); } @@ -355,6 +389,10 @@ ColourConversionEditor::changed () void ColourConversionEditor::chromaticity_changed () { + if (_ignore_chromaticity_changed) { + return; + } + update_rgb_to_xyz (); changed (); } @@ -375,11 +413,9 @@ ColourConversionEditor::update_bradford () 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 ())); + char buffer[256]; + snprintf (buffer, sizeof (buffer), "%.7f", m (i, j)); + _bradford[i][j]->SetLabel (std_to_wx (buffer)); } } } @@ -390,11 +426,9 @@ 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 ())); + char buffer[256]; + snprintf (buffer, sizeof (buffer), "%.7f", m (i, j)); + _rgb_to_xyz[i][j]->SetLabel (std_to_wx (buffer)); } } } @@ -423,8 +457,7 @@ ColourConversionEditor::set_spin_ctrl (wxSpinCtrlDouble* control, double value) void ColourConversionEditor::set_text_ctrl (wxTextCtrl* control, double value) { - SafeStringStream s; - s.precision (7); - s << value; - control->SetValue (std_to_wx (s.str ())); + char buffer[256]; + snprintf (buffer, sizeof (buffer), "%.7f", value); + control->SetValue (std_to_wx (buffer)); }