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

Fixing unfortunate placement of saturation limiter slider in previous commit.

Browse Source
This commit is contained in:
Emil Martinec 2011-02-13 14:54:42 -06:00
parent d2eb8bd48a
commit cd77350c8c
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
rtgui/labcurve.cc
View File

@ -36,7 +36,10 @@ LCurve::LCurve () : Gtk::VBox(), FoldableToolPanel(this), brAdd(false), contrAdd
pack_start (*saturation); pack_start (*saturation);
saturation->show (); saturation->show ();
brightness->setAdjusterListener (this);
contrast->setAdjusterListener (this);
saturation->setAdjusterListener (this);
//%%%%%%%%%%%%%%%%%% //%%%%%%%%%%%%%%%%%%
pack_start (*Gtk::manage (new Gtk::HSeparator())); pack_start (*Gtk::manage (new Gtk::HSeparator()));
@ -50,6 +53,7 @@ LCurve::LCurve () : Gtk::VBox(), FoldableToolPanel(this), brAdd(false), contrAdd
pack_start (*enablelimiter); pack_start (*enablelimiter);
saturationlimiter = new Adjuster (M("TP_LABCURVE_SATLIMIT"), 0, 100, 0.1, 40); saturationlimiter = new Adjuster (M("TP_LABCURVE_SATLIMIT"), 0, 100, 0.1, 40);
pack_start (*saturationlimiter);
saturationlimiter->show (); saturationlimiter->show ();
saturationlimiter->reference (); saturationlimiter->reference ();
@ -74,12 +78,7 @@ LCurve::LCurve () : Gtk::VBox(), FoldableToolPanel(this), brAdd(false), contrAdd
curveEditorG->curveListComplete(); curveEditorG->curveListComplete();
pack_start (*curveEditorG, Gtk::PACK_SHRINK, 4); pack_start (*curveEditorG, Gtk::PACK_SHRINK, 4);
brightness->setAdjusterListener (this);
contrast->setAdjusterListener (this);
saturation->setAdjusterListener (this);
} }
LCurve::~LCurve () { LCurve::~LCurve () {
@ -120,9 +119,9 @@ void LCurve::read (const ProcParams* pp, const ParamsEdited* pedited) {
enablelimiter->set_active (pp->labCurve.enable_saturationlimiter); enablelimiter->set_active (pp->labCurve.enable_saturationlimiter);
elconn.block (false); elconn.block (false);
removeIfThere (this, saturationlimiter, false); //removeIfThere (this, saturationlimiter, false);
if (enablelimiter->get_active () || enablelimiter->get_inconsistent()) // if (enablelimiter->get_active () || enablelimiter->get_inconsistent())
pack_start (*saturationlimiter); // pack_start (*saturationlimiter);
lastACVal = pp->labCurve.avoidclip; lastACVal = pp->labCurve.avoidclip;
lastELVal = pp->labCurve.enable_saturationlimiter; lastELVal = pp->labCurve.enable_saturationlimiter;
@ -231,9 +230,9 @@ void LCurve::enablelimiter_toggled () {
lastELVal = enablelimiter->get_active (); lastELVal = enablelimiter->get_active ();
} }
removeIfThere (this, saturationlimiter, false); //removeIfThere (this, saturationlimiter, false);
if (enablelimiter->get_active () || enablelimiter->get_inconsistent()) //if (enablelimiter->get_active () || enablelimiter->get_inconsistent())
pack_start (*saturationlimiter); // pack_start (*saturationlimiter);
if (listener) { if (listener) {
if (enablelimiter->get_active ()) if (enablelimiter->get_active ())