/*
- Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
*/
-#include <wx/statline.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 <wx/statline.h>
+#include <boost/foreach.hpp>
+#include <iostream>
using std::string;
using std::vector;
using std::cout;
using boost::optional;
-ContentColourConversionDialog::ContentColourConversionDialog (wxWindow* parent)
+ContentColourConversionDialog::ContentColourConversionDialog (wxWindow* parent, bool yuv)
: wxDialog (parent, wxID_ANY, _("Colour conversion"))
- , _editor (new ColourConversionEditor (this))
+ , _editor (new ColourConversionEditor (this, yuv))
, _setting (false)
{
wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
SetSizer (overall_sizer);
- wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+ wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_Y_GAP - 2, DCPOMATIC_SIZER_X_GAP);
_preset_check = new wxCheckBox (this, wxID_ANY, _("Use preset"));
table->Add (_preset_check, 0, wxALIGN_CENTER_VERTICAL);
_preset_choice = new wxChoice (this, wxID_ANY);
_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));
- _editor->Changed.connect (boost::bind (&ContentColourConversionDialog::check_for_preset, this));
+ _editor_connection = _editor->Changed.connect (boost::bind (&ContentColourConversionDialog::check_for_preset, this));
- vector<PresetColourConversion> presets = Config::instance()->colour_conversions ();
- for (vector<PresetColourConversion>::const_iterator i = presets.begin(); i != presets.end(); ++i) {
- _preset_choice->Append (std_to_wx (i->name));
+ BOOST_FOREACH (PresetColourConversion const &i, PresetColourConversion::all ()) {
+ _preset_choice->Append (std_to_wx (i.name));
}
}
_setting = true;
_editor->set (c);
_setting = false;
-
+
check_for_preset ();
}
if (_setting) {
return;
}
-
+
optional<size_t> preset = _editor->get().preset ();
- _preset_check->SetValue (preset);
- _preset_choice->Enable (preset);
- _preset_choice->SetSelection (preset.get_value_or (-1));
+ _preset_check->SetValue (static_cast<bool>(preset));
+ _preset_choice->Enable (static_cast<bool>(preset));
+ if (preset) {
+ _preset_choice->SetSelection (preset.get ());
+ } else {
+ _preset_choice->SetSelection (-1);
+ }
}
void
void
ContentColourConversionDialog::preset_choice_changed ()
{
- vector<PresetColourConversion> presets = Config::instance()->colour_conversions ();
- int const s = _preset_choice->GetSelection();
+ vector<PresetColourConversion> presets = PresetColourConversion::all ();
+ int const s = _preset_choice->GetCurrentSelection();
if (s != -1) {
set (presets[s].conversion);
}
}
-
-