liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Color Toning fixed some bug -auto saturation - Labels - issue2454 issue2014

Browse Source
This commit is contained in:
jdc
2014-09-10 10:54:55 +02:00
parent ee7bb48aac
commit 7f09a19446
20 changed files with 395 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rtgui/colortoning.h
View File

@@ -30,6 +30,7 @@ class ColorToning : public ToolParamBlock, public FoldableToolPanel, public rte
DiagonalCurveEditor* clshape;
DiagonalCurveEditor* cl2shape;
Gtk::HBox* ctbox;
Gtk::Frame *p1Frame;
Gtk::VBox* chanMixerBox;
MyComboBoxText* method;
@@ -45,22 +46,19 @@ class ColorToning : public ToolParamBlock, public FoldableToolPanel, public rte
Adjuster* greenhigh;
Adjuster* bluehigh;
Adjuster* balance;
//Adjuster* satlow;
//Adjuster* sathigh;
Gtk::CheckButton* autosat;
ThresholdAdjuster* shadowsColSat;
ThresholdAdjuster* hlColSat;
Adjuster* satProtectionThreshold;
Adjuster* saturatedOpacity;
Adjuster* strengthprotection;
Adjuster* strength;
Gtk::Image* itot;
Gtk::Image* iby;
Gtk::Image* irg;
Gtk::Button* neutral;
Gtk::Button* neutralCurves;
//Gtk::Button* neutralCurves;
Gtk::HBox* neutrHBox;
Gtk::HBox* neutralCurvesHBox;
Gtk::HBox* chromaHbox;
Gtk::Label* colLabel;
Gtk::Label* interLabel;
@@ -68,14 +66,12 @@ class ColorToning : public ToolParamBlock, public FoldableToolPanel, public rte
int nextbw;
int nextsatth;
int nextsatpr;
Glib::ustring labchroma1;
Glib::ustring labchroma2;
Glib::ustring nextbalcolor;
Glib::ustring balcolor;
bool lastEnabled;
sigc::connection enaConn;
bool lasttwocolor;
sigc::connection neutralconn, twocconn, neutralcurvesconn;
sigc::connection neutralconn, twocconn; //, neutralcurvesconn;
bool lastautosat;
sigc::connection autosatConn;
@@ -95,7 +91,7 @@ class ColorToning : public ToolParamBlock, public FoldableToolPanel, public rte
void adjusterChanged (ThresholdAdjuster* a, double newBottom, double newTop);
void setAdjusterBehavior (bool splitAdd, bool satThresholdAdd, bool satOpacityAdd, bool strprotectAdd, bool balanceAdd);
void neutral_pressed ();
void neutralCurves_pressed ();
//void neutralCurves_pressed ();
void autoColorTonChanged (int bwct, int satthres, int satprot);
bool CTComp_ ();