X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Fcolour_conversion_editor.cc;h=d21d45fd2b21f41e2e940ee6c84e0bf934ad9bae;hb=175ec3510439b2184026ee7e8dc75668448f4e21;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..d21d45fd2 100644 --- a/src/wx/colour_conversion_editor.cc +++ b/src/wx/colour_conversion_editor.cc @@ -1,41 +1,42 @@ /* 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 . */ -#include "lib/colour_conversion.h" -#include "lib/safe_stringstream.h" -#include "lib/raw_convert.h" #include "wx_util.h" #include "colour_conversion_editor.h" +#include "lib/colour_conversion.h" +#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 dcp::locale_convert; -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); @@ -51,12 +52,12 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent) 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)); + add_label_to_sizer (table, this, _("Input power"), true, wxGBPosition (r, 0)); { wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL); _input_power = new wxSpinCtrlDouble (this); @@ -91,46 +92,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); @@ -164,7 +171,7 @@ 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")); @@ -206,13 +213,16 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent) _yuv_to_rgb->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::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 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 @@ -235,55 +245,41 @@ ColourConversionEditor::set (ColourConversion conversion) _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 ())); + _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); } update_rgb_to_xyz (); update_bradford (); + changed (); } ColourConversion @@ -296,9 +292,9 @@ ColourConversionEditor::get () const 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 ())) ) ) ); @@ -311,23 +307,23 @@ ColourConversionEditor::get () const 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 { @@ -355,6 +351,10 @@ ColourConversionEditor::changed () void ColourConversionEditor::chromaticity_changed () { + if (_ignore_chromaticity_changed) { + return; + } + update_rgb_to_xyz (); changed (); } @@ -375,11 +375,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 +388,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 +419,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)); }