/*
- Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
-#include "lib/colour_conversion.h"
-#include "lib/raw_convert.h"
-#include "wx_util.h"
+
+#include "check_box.h"
#include "colour_conversion_editor.h"
+#include "static_text.h"
+#include "wx_util.h"
+#include "lib/colour_conversion.h"
+#include <dcp/locale_convert.h>
#include <dcp/gamma_transfer_function.h>
+#include <dcp/identity_transfer_function.h>
+#include <dcp/s_gamut3_transfer_function.h>
#include <dcp/modified_gamma_transfer_function.h>
#include <wx/spinctrl.h>
#include <wx/gbsizer.h>
#include <iostream>
-using std::string;
+
using std::cout;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
+using std::make_shared;
+using std::shared_ptr;
+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;
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_sizer (table, this, _("Input gamma"), true, wxGBPosition (r, 0));
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));
++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);
/* 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"));
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 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]);
}
}
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);
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 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);
_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));
}
+
wxStaticText *
ColourConversionEditor::subhead (wxGridBagSizer* sizer, wxWindow* parent, wxString text, int& row) const
{
- wxStaticText* m = new wxStaticText (parent, wxID_ANY, text);
+ auto m = new StaticText (parent, text);
wxFont font (*wxNORMAL_FONT);
font.SetWeight (wxFONTWEIGHT_BOLD);
m->SetFont (font);
return m;
}
+
void
ColourConversionEditor::set (ColourConversion conversion)
{
- if (dynamic_pointer_cast<const dcp::GammaTransferFunction> (conversion.in ())) {
- shared_ptr<const dcp::GammaTransferFunction> tf = dynamic_pointer_cast<const dcp::GammaTransferFunction> (conversion.in ());
- _input_gamma_linearised->SetValue (false);
+ if (dynamic_pointer_cast<const dcp::GammaTransferFunction>(conversion.in())) {
+ auto tf = dynamic_pointer_cast<const dcp::GammaTransferFunction>(conversion.in());
+ checked_set (_input, 0);
set_spin_ctrl (_input_gamma, tf->gamma ());
} else if (dynamic_pointer_cast<const dcp::ModifiedGammaTransferFunction> (conversion.in ())) {
- shared_ptr<const dcp::ModifiedGammaTransferFunction> tf = dynamic_pointer_cast<const dcp::ModifiedGammaTransferFunction> (conversion.in ());
+ auto tf = dynamic_pointer_cast<const dcp::ModifiedGammaTransferFunction>(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<const dcp::SGamut3TransferFunction>(conversion.in())) {
+ checked_set (_input, 2);
}
- _yuv_to_rgb->SetSelection (conversion.yuv_to_rgb ());
+ _yuv_to_rgb->SetSelection (static_cast<int>(conversion.yuv_to_rgb()));
_ignore_chromaticity_changed = true;
_adjust_white->SetValue (false);
}
+ _output->SetValue (static_cast<bool>(dynamic_pointer_cast<const dcp::GammaTransferFunction>(conversion.out())));
+
update_rgb_to_xyz ();
update_bradford ();
changed ();
}
+
ColourConversion
ColourConversionEditor::get () const
{
ColourConversion conversion;
- if (_input_gamma_linearised->GetValue ()) {
+ switch (_input->GetSelection ()) {
+ case INPUT_GAMMA:
conversion.set_in (
- shared_ptr<dcp::ModifiedGammaTransferFunction> (
- new dcp::ModifiedGammaTransferFunction (
- _input_power->GetValue (),
- raw_convert<double> (wx_to_std (_input_threshold->GetValue ())),
- raw_convert<double> (wx_to_std (_input_A->GetValue ())),
- raw_convert<double> (wx_to_std (_input_B->GetValue ()))
- )
- )
+ make_shared<dcp::GammaTransferFunction>(_input_gamma->GetValue())
);
- } else {
+ break;
+ case INPUT_GAMMA_LINEARISED:
+ /* Linearised gamma */
conversion.set_in (
- shared_ptr<dcp::GammaTransferFunction> (new dcp::GammaTransferFunction (_input_gamma->GetValue ()))
+ make_shared<dcp::ModifiedGammaTransferFunction>(
+ _input_power->GetValue (),
+ locale_convert<double>(wx_to_std(_input_threshold->GetValue())),
+ locale_convert<double>(wx_to_std(_input_A->GetValue())),
+ locale_convert<double>(wx_to_std(_input_B->GetValue()))
+ )
);
+ break;
+ case INPUT_SGAMUT3:
+ /* SGamut3 */
+ conversion.set_in (make_shared<dcp::SGamut3TransferFunction>());
+ break;
}
- conversion.set_yuv_to_rgb (static_cast<dcp::YUVToRGB> (_yuv_to_rgb->GetSelection ()));
+ conversion.set_yuv_to_rgb (static_cast<dcp::YUVToRGB>(_yuv_to_rgb->GetSelection()));
conversion.set_red (
- dcp::Chromaticity (raw_convert<double> (wx_to_std (_red_x->GetValue ())), raw_convert<double> (wx_to_std (_red_y->GetValue ())))
+ dcp::Chromaticity(locale_convert<double>(wx_to_std(_red_x->GetValue())), locale_convert<double>(wx_to_std(_red_y->GetValue())))
);
conversion.set_green (
- dcp::Chromaticity (raw_convert<double> (wx_to_std (_green_x->GetValue ())), raw_convert<double> (wx_to_std (_green_y->GetValue ())))
+ dcp::Chromaticity(locale_convert<double>(wx_to_std(_green_x->GetValue())), locale_convert<double>(wx_to_std(_green_y->GetValue())))
);
conversion.set_blue (
- dcp::Chromaticity (raw_convert<double> (wx_to_std (_blue_x->GetValue ())), raw_convert<double> (wx_to_std (_blue_y->GetValue ())))
+ dcp::Chromaticity(locale_convert<double>(wx_to_std(_blue_x->GetValue())), locale_convert<double>(wx_to_std(_blue_y->GetValue())))
);
conversion.set_white (
- dcp::Chromaticity (raw_convert<double> (wx_to_std (_white_x->GetValue ())), raw_convert<double> (wx_to_std (_white_y->GetValue ())))
+ dcp::Chromaticity(locale_convert<double>(wx_to_std(_white_x->GetValue())), locale_convert<double>(wx_to_std(_white_y->GetValue())))
);
- if (_adjust_white->GetValue ()) {
- conversion.set_adjusted_white (
- dcp::Chromaticity (
- raw_convert<double> (wx_to_std (_adjusted_white_x->GetValue ())),
- raw_convert<double> (wx_to_std (_adjusted_white_y->GetValue ()))
+ if (_adjust_white->GetValue()) {
+ conversion.set_adjusted_white(
+ dcp::Chromaticity(
+ locale_convert<double>(wx_to_std(_adjusted_white_x->GetValue())),
+ locale_convert<double>(wx_to_std(_adjusted_white_y->GetValue()))
)
);
} else {
conversion.unset_adjusted_white ();
}
- conversion.set_out (shared_ptr<dcp::GammaTransferFunction> (new dcp::GammaTransferFunction (2.6)));
+ if (_output->GetValue ()) {
+ conversion.set_out (make_shared<dcp::GammaTransferFunction>(2.6));
+ } else {
+ conversion.set_out (make_shared<dcp::IdentityTransferFunction>());
+ }
return conversion;
}
+
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 ();
}
+
void
ColourConversionEditor::chromaticity_changed ()
{
changed ();
}
+
void
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<double> m = get().bradford ();
+ auto m = get().bradford();
for (int i = 0; i < 3; ++i) {
for (int j = 0; j < 3; ++j) {
char buffer[256];
}
}
+
void
ColourConversionEditor::update_rgb_to_xyz ()
{
- boost::numeric::ublas::matrix<double> 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];
}
}
+
void
ColourConversionEditor::changed (wxSpinCtrlDouble* sc)
{
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)
{
control->SetValue (value);
}
+
void
ColourConversionEditor::set_text_ctrl (wxTextCtrl* control, double value)
{
projects / dcpomatic.git / blobdiff