/*
- Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
#include "wx_util.h"
+#include "static_text.h"
#include "colour_conversion_editor.h"
+#include "check_box.h"
#include "lib/colour_conversion.h"
#include <dcp/locale_convert.h>
#include <dcp/gamma_transfer_function.h>
using std::string;
using std::cout;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::dynamic_pointer_cast;
using boost::bind;
using dcp::locale_convert;
add_label_to_sizer (table, this, _("Input transfer function"), true, wxGBPosition (r, 0));
_input = new wxChoice (this, wxID_ANY);
- _input->Append (_("Gamma"));
- _input->Append (_("Gamma, linearised for small values"));
+ _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;
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));
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]);
}
}
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);
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]);
}
}
subhead (table, this, _("Output gamma correction"), r);
- _output = new wxCheckBox (this, wxID_ANY, _("Inverse 2.6 gamma correction on output"));
+ _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);
wxStaticText *
ColourConversionEditor::subhead (wxGridBagSizer* sizer, wxWindow* parent, wxString text, int& row) const
{
- wxStaticText* m = new wxStaticText (parent, wxID_ANY, text);
+ wxStaticText* m = new StaticText (parent, text);
wxFont font (*wxNORMAL_FONT);
font.SetWeight (wxFONTWEIGHT_BOLD);
m->SetFont (font);
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;