projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move add_files_override_path to film_util
[dcpomatic.git]
/
src
/
wx
/
colour_conversion_editor.h
diff --git
a/src/wx/colour_conversion_editor.h
b/src/wx/colour_conversion_editor.h
index ab45104e9fc19fac122cbb935a899142414ff98b..de5ffb794febeb1c35217c6a15680d03fdcc36da 100644
(file)
--- a/
src/wx/colour_conversion_editor.h
+++ b/
src/wx/colour_conversion_editor.h
@@
-1,35
+1,44
@@
/*
/*
- Copyright (C) 2013-20
14
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-20
21
Carl Hetherington <cth@carlh.net>
- 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.
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
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 <http://www.gnu.org/licenses/>.
*/
*/
+
#ifndef DCPOMATIC_COLOUR_CONVERSION_EDITOR_H
#define DCPOMATIC_COLOUR_CONVERSION_EDITOR_H
#ifndef DCPOMATIC_COLOUR_CONVERSION_EDITOR_H
#define DCPOMATIC_COLOUR_CONVERSION_EDITOR_H
-#include <boost/signals2.hpp>
+
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
+#include <boost/signals2.hpp>
+
-class wxSpinCtrlDouble;
class ColourConversion;
class ColourConversion;
+class wxGridBagSizer;
+class wxSpinCtrlDouble;
+
class ColourConversionEditor : public wxPanel
{
public:
class ColourConversionEditor : public wxPanel
{
public:
- ColourConversionEditor (wxWindow *);
+ ColourConversionEditor (wxWindow *
, bool yuv
);
void set (ColourConversion);
ColourConversion get () const;
void set (ColourConversion);
ColourConversion get () const;
@@
-38,24
+47,29
@@
public:
private:
void changed ();
private:
void changed ();
- void
changed
(wxSpinCtrlDouble *);
+ void
spin_ctrl_changed
(wxSpinCtrlDouble *);
void chromaticity_changed ();
void adjusted_white_changed ();
void update_rgb_to_xyz ();
void update_bradford ();
void chromaticity_changed ();
void adjusted_white_changed ();
void update_rgb_to_xyz ();
void update_bradford ();
-
void
subhead (wxGridBagSizer* sizer, wxWindow* parent, wxString text, int& row) const;
+
wxStaticText*
subhead (wxGridBagSizer* sizer, wxWindow* parent, wxString text, int& row) const;
void set_text_ctrl (wxTextCtrl *, double);
void set_spin_ctrl (wxSpinCtrlDouble *, double);
void set_text_ctrl (wxTextCtrl *, double);
void set_spin_ctrl (wxSpinCtrlDouble *, double);
+ static int const INPUT_GAMMA;
+ static int const INPUT_GAMMA_LINEARISED;
+ static int const INPUT_SGAMUT3;
+
std::map<wxSpinCtrlDouble*, double> _last_spin_ctrl_value;
std::map<wxSpinCtrlDouble*, double> _last_spin_ctrl_value;
+ bool _ignore_chromaticity_changed;
+ wxChoice* _input;
wxSpinCtrlDouble* _input_gamma;
wxSpinCtrlDouble* _input_power;
wxTextCtrl* _input_threshold;
wxTextCtrl* _input_A;
wxTextCtrl* _input_B;
wxSpinCtrlDouble* _input_gamma;
wxSpinCtrlDouble* _input_power;
wxTextCtrl* _input_threshold;
wxTextCtrl* _input_A;
wxTextCtrl* _input_B;
- wxCheckBox* _input_gamma_linearised;
wxChoice* _yuv_to_rgb;
wxTextCtrl* _red_x;
wxTextCtrl* _red_y;
wxChoice* _yuv_to_rgb;
wxTextCtrl* _red_x;
wxTextCtrl* _red_y;
@@
-65,12
+79,14
@@
private:
wxTextCtrl* _blue_y;
wxTextCtrl* _white_x;
wxTextCtrl* _white_y;
wxTextCtrl* _blue_y;
wxTextCtrl* _white_x;
wxTextCtrl* _white_y;
-
wx
CheckBox* _adjust_white;
+ CheckBox* _adjust_white;
wxTextCtrl* _adjusted_white_x;
wxTextCtrl* _adjusted_white_y;
wxTextCtrl* _adjusted_white_x;
wxTextCtrl* _adjusted_white_y;
+ CheckBox* _output;
wxStaticText* _rgb_to_xyz[3][3];
wxStaticText* _bradford[3][3];
wxStaticText* _rgb_to_xyz[3][3];
wxStaticText* _bradford[3][3];
- wxSpinCtrlDouble* _output_gamma;
};
};
+
#endif
#endif
+