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

Suppress 'addset_locallab' meaningless

Browse Source
This commit is contained in:
Desmis
2017-03-17 11:11:19 +01:00
parent 9a3f2d0d8a
commit 0464babf36
7 changed files with 106 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
rtgui/partialpastedlg.cc
View File

@@ -55,7 +55,7 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring &title, Gtk::Window* paren
pcvignette = Gtk::manage (new Gtk::CheckButton (M ("PARTIALPASTE_PCVIGNETTE")));
gradient = Gtk::manage (new Gtk::CheckButton (M ("PARTIALPASTE_GRADIENT")));
labcurve = Gtk::manage (new Gtk::CheckButton (M ("PARTIALPASTE_LABCURVE")));
locallab = Gtk::manage (new Gtk::CheckButton (M ("PARTIALPASTE_LOCALLAB")));
// locallab = Gtk::manage (new Gtk::CheckButton (M ("PARTIALPASTE_LOCALLAB")));
colorappearance = Gtk::manage (new Gtk::CheckButton (M ("PARTIALPASTE_COLORAPP")));
// options in detail:
@@ -147,7 +147,7 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring &title, Gtk::Window* paren
vboxes[0]->pack_start (*pcvignette, Gtk::PACK_SHRINK, 2);
vboxes[0]->pack_start (*gradient, Gtk::PACK_SHRINK, 2);
vboxes[0]->pack_start (*labcurve, Gtk::PACK_SHRINK, 2);
vboxes[0]->pack_start (*locallab, Gtk::PACK_SHRINK, 2);
// vboxes[0]->pack_start (*locallab, Gtk::PACK_SHRINK, 2);
vboxes[0]->pack_start (*colorappearance, Gtk::PACK_SHRINK, 2);
//DETAIL
@@ -302,7 +302,7 @@ PartialPasteDlg::PartialPasteDlg (const Glib::ustring &title, Gtk::Window* paren
pcvignetteConn = pcvignette->signal_toggled().connect (sigc::bind (sigc::mem_fun (*basic, &Gtk::CheckButton::set_inconsistent), true));
gradientConn = gradient->signal_toggled().connect (sigc::bind (sigc::mem_fun (*basic, &Gtk::CheckButton::set_inconsistent), true));
labcurveConn = labcurve->signal_toggled().connect (sigc::bind (sigc::mem_fun (*basic, &Gtk::CheckButton::set_inconsistent), true));
locallabConn = locallab->signal_toggled().connect (sigc::bind (sigc::mem_fun (*basic, &Gtk::CheckButton::set_inconsistent), true));
// locallabConn = locallab->signal_toggled().connect (sigc::bind (sigc::mem_fun (*basic, &Gtk::CheckButton::set_inconsistent), true));
colorappearanceConn = colorappearance->signal_toggled().connect (sigc::bind (sigc::mem_fun (*basic, &Gtk::CheckButton::set_inconsistent), true));
sharpenConn = sharpen->signal_toggled().connect (sigc::bind (sigc::mem_fun (*detail, &Gtk::CheckButton::set_inconsistent), true));
@@ -506,7 +506,7 @@ void PartialPasteDlg::basicToggled ()
gradientConn.block (true);
labcurveConn.block (true);
colorappearanceConn.block (true);
locallabConn.block (true);
// locallabConn.block (true);
retinexConn.block (true);
basic->set_inconsistent (false);
@@ -520,7 +520,7 @@ void PartialPasteDlg::basicToggled ()
retinex->set_active (basic->get_active ());
labcurve->set_active (basic->get_active ());
colorappearance->set_active (basic->get_active ());
locallab->set_active (basic->get_active ());
// locallab->set_active (basic->get_active ());
wbConn.block (false);
exposureConn.block (false);
@@ -531,7 +531,7 @@ void PartialPasteDlg::basicToggled ()
retinexConn.block (false);
labcurveConn.block (false);
locallabConn.block (false);
// locallabConn.block (false);
colorappearanceConn.block (false);
}
@@ -724,10 +724,11 @@ void PartialPasteDlg::applyPaste (rtengine::procparams::ProcParams* dstPP, Param
filterPE.gradient = falsePE.gradient;
}
if (!locallab->get_active ()) {
filterPE.locallab = falsePE.locallab;
}
/*
if (!locallab->get_active ()) {
filterPE.locallab = falsePE.locallab;
}
*/
if (!labcurve->get_active ()) {
filterPE.labCurve = falsePE.labCurve;
}