/*
- 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 "check_box.h"
+#include "colour_conversion_editor.h"
+#include "content_colour_conversion_dialog.h"
+#include "wx_util.h"
#include "lib/colour_conversion.h"
#include "lib/config.h"
#include "lib/util.h"
-#include "wx_util.h"
-#include "content_colour_conversion_dialog.h"
-#include "colour_conversion_editor.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/statline.h>
-#include <boost/foreach.hpp>
-#include <iostream>
+LIBDCP_ENABLE_WARNINGS
+
using std::string;
using std::vector;
-using std::cout;
using boost::optional;
+
ContentColourConversionDialog::ContentColourConversionDialog (wxWindow* parent, bool yuv)
: wxDialog (parent, wxID_ANY, _("Colour conversion"))
- , _editor (new ColourConversionEditor (this, yuv))
+ , _editor (new ColourConversionEditor(this, yuv))
, _setting (false)
{
- wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
+ auto overall_sizer = new wxBoxSizer (wxVERTICAL);
SetSizer (overall_sizer);
- wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_Y_GAP - 2, DCPOMATIC_SIZER_X_GAP);
- _preset_check = new wxCheckBox (this, wxID_ANY, _("Use preset"));
+ auto table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_Y_GAP - 2, DCPOMATIC_SIZER_X_GAP);
+ _preset_check = new CheckBox (this, _("Use preset"));
table->Add (_preset_check, 0, wxALIGN_CENTER_VERTICAL);
_preset_choice = new wxChoice (this, wxID_ANY);
table->Add (_preset_choice);
overall_sizer->Add (new wxStaticLine (this, wxID_ANY), 0, wxEXPAND);
overall_sizer->Add (_editor);
- wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
+ auto buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
if (buttons) {
overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
}
overall_sizer->Layout ();
overall_sizer->SetSizeHints (this);
- _preset_check->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&ContentColourConversionDialog::preset_check_clicked, this));
- _preset_choice->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&ContentColourConversionDialog::preset_choice_changed, this));
+ _preset_check->Bind (wxEVT_CHECKBOX, boost::bind (&ContentColourConversionDialog::preset_check_clicked, this));
+ _preset_choice->Bind (wxEVT_CHOICE, boost::bind (&ContentColourConversionDialog::preset_choice_changed, this));
_editor_connection = _editor->Changed.connect (boost::bind (&ContentColourConversionDialog::check_for_preset, this));
- BOOST_FOREACH (PresetColourConversion const &i, PresetColourConversion::all ()) {
+ for (auto const& i: PresetColourConversion::all ()) {
_preset_choice->Append (std_to_wx (i.name));
}
}
+
ColourConversion
ContentColourConversionDialog::get () const
{
return _editor->get ();
}
+
void
ContentColourConversionDialog::set (ColourConversion c)
{
check_for_preset ();
}
+
void
ContentColourConversionDialog::check_for_preset ()
{
return;
}
- optional<size_t> preset = _editor->get().preset ();
+ auto preset = _editor->get().preset ();
_preset_check->SetValue (static_cast<bool>(preset));
_preset_choice->Enable (static_cast<bool>(preset));
}
}
+
void
ContentColourConversionDialog::preset_check_clicked ()
{
}
}
+
void
ContentColourConversionDialog::preset_choice_changed ()
{
- vector<PresetColourConversion> presets = PresetColourConversion::all ();
+ auto presets = PresetColourConversion::all ();
int const s = _preset_choice->GetCurrentSelection();
if (s != -1) {
set (presets[s].conversion);