Ciecam - added cam16 to cam02 (#6017)

* First change cat02 cat16

* Enable cat16 and cat02

* Clean comment code - change history msg

* Change some labels and tooltips with ciecam0216

* Change default settings

* Others default label and tooltip changes
This commit is contained in:
Desmis
2020-12-09 07:49:54 +01:00
committed by GitHub
parent 548f2103e2
commit 6f9da68883
12 changed files with 349 additions and 226 deletions

View File

@@ -78,6 +78,7 @@ public:
bool curveMode3Changed_ ();
void neutral_pressed ();
void complexmethodChanged();
void modelmethodChanged();
void convertParamToNormal();
void updateGUIToMode(int mode);
@@ -108,6 +109,7 @@ private:
rtengine::ProcEvent EvCATAutotempout;
rtengine::ProcEvent EvCATillum;
rtengine::ProcEvent EvCATcomplex;
rtengine::ProcEvent EvCATmodel;
bool bgTTipQuery (int x, int y, bool keyboard_tooltip, const Glib::RefPtr<Gtk::Tooltip>& tooltip);
bool srTTipQuery (int x, int y, bool keyboard_tooltip, const Glib::RefPtr<Gtk::Tooltip>& tooltip);
void foldAllButMe (GdkEventButton* event, MyExpander *expander);
@@ -144,6 +146,7 @@ private:
MyComboBoxText* toneCurveMode2;
MyComboBoxText* toneCurveMode3;
MyComboBoxText* complexmethod;
MyComboBoxText* modelmethod;
//Adjuster* edge;
Gtk::CheckButton* surrsource;
@@ -170,7 +173,7 @@ private:
sigc::connection surrconn;
sigc::connection gamutconn, datacieconn, tonecieconn /*,badpixconn , sharpcieconn*/;
sigc::connection tcmodeconn, tcmode2conn, tcmode3conn, neutralconn;
sigc::connection complexmethodconn;
sigc::connection complexmethodconn, modelmethodconn;
Gtk::HBox* alHBox;
Gtk::HBox* wbmHBox;
Gtk::HBox* illumHBox;