projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No-op; fix GPL address and use the explicit-program-name version.
[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 317171aa483129450c2d6f0539a0868f7389befa..34fcf2cb24fb3a1d2eeae7ea97b6c7764c223507 100644
(file)
--- a/
src/wx/colour_conversion_editor.h
+++ b/
src/wx/colour_conversion_editor.h
@@
-1,19
+1,20
@@
/*
Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2013-2014 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/>.
*/
*/
@@
-29,7
+30,7
@@
class ColourConversion;
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;
@@
-39,20
+40,38
@@
public:
private:
void changed ();
void changed (wxSpinCtrlDouble *);
private:
void changed ();
void changed (wxSpinCtrlDouble *);
+ void chromaticity_changed ();
+ void adjusted_white_changed ();
+ void update_rgb_to_xyz ();
+ void update_bradford ();
+ wxStaticText* subhead (wxGridBagSizer* sizer, wxWindow* parent, wxString text, int& row) const;
void set_text_ctrl (wxTextCtrl *, double);
void set_spin_ctrl (wxSpinCtrlDouble *, double);
std::map<wxSpinCtrlDouble*, double> _last_spin_ctrl_value;
void set_text_ctrl (wxTextCtrl *, double);
void set_spin_ctrl (wxSpinCtrlDouble *, double);
std::map<wxSpinCtrlDouble*, double> _last_spin_ctrl_value;
-
+ bool _ignore_chromaticity_changed;
+
wxSpinCtrlDouble* _input_gamma;
wxSpinCtrlDouble* _input_power;
wxTextCtrl* _input_threshold;
wxTextCtrl* _input_A;
wxTextCtrl* _input_B;
wxCheckBox* _input_gamma_linearised;
wxSpinCtrlDouble* _input_gamma;
wxSpinCtrlDouble* _input_power;
wxTextCtrl* _input_threshold;
wxTextCtrl* _input_A;
wxTextCtrl* _input_B;
wxCheckBox* _input_gamma_linearised;
- wxTextCtrl* _matrix[3][3];
- wxSpinCtrlDouble* _output_gamma;
+ wxChoice* _yuv_to_rgb;
+ wxTextCtrl* _red_x;
+ wxTextCtrl* _red_y;
+ wxTextCtrl* _green_x;
+ wxTextCtrl* _green_y;
+ wxTextCtrl* _blue_x;
+ wxTextCtrl* _blue_y;
+ wxTextCtrl* _white_x;
+ wxTextCtrl* _white_y;
+ wxCheckBox* _adjust_white;
+ wxTextCtrl* _adjusted_white_x;
+ wxTextCtrl* _adjusted_white_y;
+ wxStaticText* _rgb_to_xyz[3][3];
+ wxStaticText* _bradford[3][3];
};
#endif
};
#endif