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

Adding per curve default curve capabilities, used in the Color Toning tool as of now. See issue 2014

Browse Source
This commit is contained in:
Hombre
2014-07-15 22:07:11 +02:00
parent 918a922499
commit 1921141cb7
20 changed files with 247 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
rtgui/colortoning.h
View File

@@ -30,7 +30,7 @@ class ColorToning : public ToolParamBlock, public FoldableToolPanel, public rte
DiagonalCurveEditor* clshape;
DiagonalCurveEditor* cl2shape;
Gtk::HBox* ctbox;
Gtk::VBox* chanMixerBox;
MyComboBoxText* method;
sigc::connection methodconn;
@@ -52,30 +52,30 @@ class ColorToning : public ToolParamBlock, public FoldableToolPanel, public rte
ThresholdAdjuster* hlColSat;
Adjuster* satProtectionThreshold;
Adjuster* saturatedOpacity;
Adjuster* strengthprotection;
Gtk::Image* itot;
Gtk::Image* iby;
Gtk::Image* irg;
Adjuster* strengthprotection;
Gtk::Image* itot;
Gtk::Image* iby;
Gtk::Image* irg;
Gtk::Button* neutral;
Gtk::Button* neutralcur;
Gtk::Button* neutralCurves;
Gtk::HBox* neutrHBox;
Gtk::HBox* neutrcurHBox;
Gtk::HBox* neutralCurvesHBox;
Gtk::HBox* chromaHbox;
Gtk::Label* colLabel;
Gtk::Label* interLabel;
Gtk::Label* chroLabel;
int nextbw;
int nextsatth;
int nextsatpr;
Glib::ustring labchroma1;
Glib::ustring labchroma2;
Glib::ustring nextbalcolor;
Glib::ustring balcolor;
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, neutralcurconn;
sigc::connection neutralconn, twocconn, neutralcurvesconn;
bool lastautosat;
sigc::connection autosatConn;
@@ -86,29 +86,29 @@ class ColorToning : public ToolParamBlock, public FoldableToolPanel, public rte
public:
ColorToning ();
~ColorToning();
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited=NULL);
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited=NULL);
void setBatchMode (bool batchMode);
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited=NULL);
void trimValues (rtengine::procparams::ProcParams* pp);
void adjusterChanged (Adjuster* a, double newval);
void adjusterChanged (ThresholdAdjuster* a, double newBottom, double newTop);
void setAdjusterBehavior (bool splitAdd, bool satThresholdAdd, bool satOpacityAdd, bool strprotectAdd, bool balanceAdd);
void neutral_pressed ();
void neutralcur_pressed ();
void autoColorTonChanged (int bwct, int satthres, int satprot);
bool CTComp_ ();
void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited=NULL);
void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited=NULL);
void setBatchMode (bool batchMode);
void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited=NULL);
void trimValues (rtengine::procparams::ProcParams* pp);
void adjusterChanged (Adjuster* a, double newval);
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 autoColorTonChanged (int bwct, int satthres, int satprot);
bool CTComp_ ();
void enabledChanged ();
void curveChanged (CurveEditor* ce);
void autosatChanged ();
void autoOpenCurve ();
void methodChanged ();
void twocolorChanged (bool changedbymethod);
void twoColorChangedByGui();
void lumamodeChanged ();
void enabledChanged ();
void curveChanged (CurveEditor* ce);
void autosatChanged ();
void autoOpenCurve ();
void methodChanged ();
void twocolorChanged (bool changedbymethod);
void twoColorChangedByGui ();
void lumamodeChanged ();
void colorForValue (double valX, double valY, enum ColorCaller::ElemType elemType, int callerId, ColorCaller* caller);
void colorForValue (double valX, double valY, enum ColorCaller::ElemType elemType, int callerId, ColorCaller* caller);
};
#endif