X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Fcolour_conversion_editor.h;h=b7467a70a1341ba7f66dd11047abfae68396bfec;hb=258da8a37c21a87ba5a7aa1c3e6243280d5c8d10;hp=8567cac22250a9a85d83e9ea1b903be7aaa81563;hpb=2499c41097f8410cb3016e095a85d68979485a7b;p=dcpomatic.git

diff --git a/src/wx/colour_conversion_editor.h b/src/wx/colour_conversion_editor.h
index 8567cac22..b7467a70a 100644
--- a/src/wx/colour_conversion_editor.h
+++ b/src/wx/colour_conversion_editor.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 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
     it under the terms of the GNU General Public License as published by
@@ -38,10 +38,38 @@ public:
 
 private:
 	void changed ();
+	void changed (wxSpinCtrlDouble *);
+	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;
+
+	void set_text_ctrl (wxTextCtrl *, double);
+	void set_spin_ctrl (wxSpinCtrlDouble *, double);
+
+	std::map<wxSpinCtrlDouble*, double> _last_spin_ctrl_value;
 	
 	wxSpinCtrlDouble* _input_gamma;
+	wxSpinCtrlDouble* _input_power;
+	wxTextCtrl* _input_threshold;
+	wxTextCtrl* _input_A;
+	wxTextCtrl* _input_B;
 	wxCheckBox* _input_gamma_linearised;
-	wxTextCtrl* _matrix[3][3];
+	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];
 	wxSpinCtrlDouble* _output_gamma;
 };